From patchwork Mon Dec 20 18:42:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 12696869 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EF7B4C4332F for ; Mon, 20 Dec 2021 18:44:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=tCUIB4523A+P5rhQWYOwFoDK/O6VTjoXMu42MIIkJG4=; b=kTPbTbuOAwCVHA 3TJaeSkgWoEDuaHtIa3aXzu7QdxYbkxnHsIWqSV4p2dN0EzSxISnC/p3u4KNkKrNSqxXM6WTbMTun GrdM2i87fLQqfoRY3runt9MZN81DJboG8mi0HTt4tZ7oRdxRLmyzfJ9FVaROzqXHNFA8TcmenVY2K Unn8SFcwd6iWm+sFdyzjMk1NvACZ3G+c+bL4PmU/Czp6yIoaHXWfgFsHFeQ16qdViGkko3tUkw0zn 9Vcc3gV8AfzGlecMdV0Upf/AYuzw+hduSzj4IX4RPYn+dXkR1ZUZJunPiSEvh8i2OCFf/MpIcy+5P FJldQ8/KCgkZ8sLnkVMw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mzNca-003rAS-Dt; Mon, 20 Dec 2021 18:42:52 +0000 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mzNcP-003r6F-AS for linux-arm-kernel@lists.infradead.org; Mon, 20 Dec 2021 18:42:43 +0000 Received: by mail-lf1-x133.google.com with SMTP id bu9so2218373lfb.7 for ; Mon, 20 Dec 2021 10:42:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/B6DvIqPMwlSVR6jVcqcmHQyA/k1m4TC+f89S6pXSVg=; b=M205RQy7JwG8A5YBZYhvvTYxxsMlsX7puP2isVqnUuSrXgQSLkVJe55lz566iIcYxd kk1+Y+QyjmM1ZSUB75X+GOIMjJGYn6GuNpn8dEH7EPAhix00XT8QuxKdAEyARshiIp9l 8C1hT3KMI9k/ofqdoEpVAiUoeIHOJs8YSOin39gaw88TLjghmJTHTiOUhsQ67+jDp/zz t641xe+BaXAz/9Vf9W1LjQXpO9mcOoAJ3eodh7sPM/awqNO5fKMuKeDNu02DQaeExqQG JOjCqGn2QbeiY2SnPMGusgbINGXbJouae9/CGH+bRK57Rm14cFKPl1EqPJEjUQLNWy2c HeBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/B6DvIqPMwlSVR6jVcqcmHQyA/k1m4TC+f89S6pXSVg=; b=dCc+lAvhiJkpZx/++iOXxml5L2rlcS1/tQ8jIzuHkvt9lMj49Fvt2rfrdQ3A96897f DHgRP0GXbZWKfPtIomGY73OfJPAEb3uwQXhr5txqgWFavIZQhvSfbOvHFo0iJuU9YcbX jJojXXDzyFgWen96I6IR12de2c8kqob3h1YQPwTcQvDX9LYepiIwOWI7GAIkN1PgwFQC 4y3M9zGT5GgTpf9kJdfnU9PGwB/AJAVzGbGMUmAzxRR7x7wdXLWta+Yqo4LNydYkKgA+ AH+HSGsfWqX2javA0j0owi20CDXvgwkqMfEM9VmWMe8KBJHBcyF6OmBXmMy50W3LrHON Tx2w== X-Gm-Message-State: AOAM5327UG18zVkEZ1tE1RyVxBAZX9gzLKpm0Gfpop2IHB2RPuIN1rDc 9FaTX6ShFwE5D8usn0N7sLNeWCMDvdY= X-Google-Smtp-Source: ABdhPJxrO0tXLkd6P533o5FnLjfiM6+dBkruUiqDKwbuhxKPifPAWiWVn3hrHme2uLXhyhPYUFbXgA== X-Received: by 2002:a05:6512:3995:: with SMTP id j21mr990465lfu.360.1640025758797; Mon, 20 Dec 2021 10:42:38 -0800 (PST) Received: from localhost.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id s10sm239682lfr.45.2021.12.20.10.42.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Dec 2021 10:42:38 -0800 (PST) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: Srinivas Kandagatla Cc: linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Subject: [PATCH] nvmem: brcm_nvram: parse NVRAM content into NVMEM cells Date: Mon, 20 Dec 2021 19:42:25 +0100 Message-Id: <20211220184226.6485-1-zajec5@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211220_104241_403441_81CD2AB4 X-CRM114-Status: GOOD ( 17.25 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Rafał Miłecki NVRAM consist of header and NUL separated key-value pairs. Parse it and create NVMEM cell for every key-value entry. Signed-off-by: Rafał Miłecki --- drivers/nvmem/brcm_nvram.c | 93 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/drivers/nvmem/brcm_nvram.c b/drivers/nvmem/brcm_nvram.c index bd2ecaaf4585..01ad96c52809 100644 --- a/drivers/nvmem/brcm_nvram.c +++ b/drivers/nvmem/brcm_nvram.c @@ -6,12 +6,26 @@ #include #include #include +#include #include #include +#include + +#define NVRAM_MAGIC "FLSH" struct brcm_nvram { struct device *dev; void __iomem *base; + struct nvmem_cell_info *cells; + int ncells; +}; + +struct brcm_nvram_header { + char magic[4]; + __le32 len; + __le32 crc_ver_init; /* 0:7 crc, 8:15 ver, 16:31 sdram_init */ + __le32 config_refresh; /* 0:15 sdram_config, 16:31 sdram_refresh */ + __le32 config_ncdl; /* ncdl values for memc */ }; static int brcm_nvram_read(void *context, unsigned int offset, void *val, @@ -26,6 +40,78 @@ static int brcm_nvram_read(void *context, unsigned int offset, void *val, return 0; } +static int brcm_nvram_add_cells(struct brcm_nvram *priv, uint8_t *data, + size_t len) +{ + struct device *dev = priv->dev; + char *var, *value, *eq; + int idx; + + priv->ncells = 0; + for (var = data + sizeof(struct brcm_nvram_header); + var < (char *)data + len && *var; + var += strlen(var) + 1) { + priv->ncells++; + } + dev_info(dev, "ncells:%d", priv->ncells); + + priv->cells = devm_kcalloc(dev, priv->ncells, sizeof(*priv->cells), GFP_KERNEL); + if (!priv->cells) + return -ENOMEM; + + for (var = data + sizeof(struct brcm_nvram_header), idx = 0; + var < (char *)data + len && *var; + var = value + strlen(value) + 1, idx++) { + eq = strchr(var, '='); + if (!eq) + break; + *eq = '\0'; + value = eq + 1; + + dev_info(dev, "%s: %s", var, value); + + priv->cells[idx].name = devm_kstrdup(dev, var, GFP_KERNEL); + if (!priv->cells[idx].name) + return -ENOMEM; + priv->cells[idx].offset = value - (char *)data; + priv->cells[idx].bytes = strlen(value); + } + + return 0; +} + +static int brcm_nvram_parse(struct brcm_nvram *priv) +{ + struct device *dev = priv->dev; + struct brcm_nvram_header header; + uint8_t *data; + size_t len; + int err; + + memcpy_fromio(&header, priv->base, sizeof(header)); + + if (memcmp(header.magic, NVRAM_MAGIC, 4)) { + dev_err(dev, "Invalid NVRAM magic\n"); + return -EINVAL; + } + + len = le32_to_cpu(header.len); + + data = kcalloc(1, len, GFP_KERNEL); + memcpy_fromio(data, priv->base, len); + data[len - 1] = '\0'; + + err = brcm_nvram_add_cells(priv, data, len); + if (err) { + dev_err(dev, "Failed to add cells: %d\n", err); + return err; + } + + kfree(data); + + return 0; +} + static int brcm_nvram_probe(struct platform_device *pdev) { struct nvmem_config config = { @@ -35,6 +121,7 @@ static int brcm_nvram_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct resource *res; struct brcm_nvram *priv; + int err; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) @@ -46,7 +133,13 @@ static int brcm_nvram_probe(struct platform_device *pdev) if (IS_ERR(priv->base)) return PTR_ERR(priv->base); + err = brcm_nvram_parse(priv); + if (err) + return err; + config.dev = dev; + config.cells = priv->cells; + config.ncells = priv->ncells; config.priv = priv; config.size = resource_size(res);