mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
bcm53xx: update NVMEM driver for NVRAM
This commit is contained in:
lean
parent
5428ab1b70
commit
790f6e67a7
@ -12,7 +12,7 @@ CPU_TYPE:=cortex-a9
|
|||||||
SUBTARGETS:=generic
|
SUBTARGETS:=generic
|
||||||
|
|
||||||
KERNEL_PATCHVER:=5.4
|
KERNEL_PATCHVER:=5.4
|
||||||
KERNEL_TESTING_PATCHVER:=5.4
|
KERNEL_TESTING_PATCHVER:=5.15
|
||||||
|
|
||||||
define Target/Description
|
define Target/Description
|
||||||
Build firmware images for Broadcom based BCM47xx/53xx routers with ARM CPU, *not* MIPS.
|
Build firmware images for Broadcom based BCM47xx/53xx routers with ARM CPU, *not* MIPS.
|
||||||
|
|||||||
@ -0,0 +1,146 @@
|
|||||||
|
From 6e977eaa8280e957b87904b536661550f2a6b3e8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||||
|
Date: Fri, 25 Feb 2022 17:58:20 +0000
|
||||||
|
Subject: [PATCH] nvmem: brcm_nvram: parse NVRAM content into NVMEM cells
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
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 <rafal@milecki.pl>
|
||||||
|
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||||
|
Link: https://lore.kernel.org/r/20220225175822.8293-3-srinivas.kandagatla@linaro.org
|
||||||
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||||
|
---
|
||||||
|
drivers/nvmem/brcm_nvram.c | 90 ++++++++++++++++++++++++++++++++++++++
|
||||||
|
1 file changed, 90 insertions(+)
|
||||||
|
|
||||||
|
--- a/drivers/nvmem/brcm_nvram.c
|
||||||
|
+++ b/drivers/nvmem/brcm_nvram.c
|
||||||
|
@@ -6,12 +6,26 @@
|
||||||
|
#include <linux/io.h>
|
||||||
|
#include <linux/mod_devicetable.h>
|
||||||
|
#include <linux/module.h>
|
||||||
|
+#include <linux/nvmem-consumer.h>
|
||||||
|
#include <linux/nvmem-provider.h>
|
||||||
|
#include <linux/platform_device.h>
|
||||||
|
+#include <linux/slab.h>
|
||||||
|
+
|
||||||
|
+#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,75 @@ static int brcm_nvram_read(void *context
|
||||||
|
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++;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ 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;
|
||||||
|
+
|
||||||
|
+ 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 +118,7 @@ static int brcm_nvram_probe(struct platf
|
||||||
|
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 +130,13 @@ static int brcm_nvram_probe(struct platf
|
||||||
|
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);
|
||||||
|
|
||||||
@ -0,0 +1,38 @@
|
|||||||
|
From 207775f7e17b8fd0426a2ac4a5b81e4e1d71849e Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||||
|
Date: Fri, 29 Apr 2022 17:26:47 +0100
|
||||||
|
Subject: [PATCH] nvmem: brcm_nvram: find Device Tree nodes for NVMEM cells
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
DT binding for Broadcom's NVRAM supports specifying NVMEM cells as NVMEM
|
||||||
|
device (provider) subnodes. Look for such subnodes when collecing NVMEM
|
||||||
|
cells. This allows NVMEM consumers to use NVRAM variables.
|
||||||
|
|
||||||
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||||
|
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||||
|
Link: https://lore.kernel.org/r/20220429162701.2222-3-srinivas.kandagatla@linaro.org
|
||||||
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||||
|
---
|
||||||
|
drivers/nvmem/brcm_nvram.c | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
--- a/drivers/nvmem/brcm_nvram.c
|
||||||
|
+++ b/drivers/nvmem/brcm_nvram.c
|
||||||
|
@@ -8,6 +8,7 @@
|
||||||
|
#include <linux/module.h>
|
||||||
|
#include <linux/nvmem-consumer.h>
|
||||||
|
#include <linux/nvmem-provider.h>
|
||||||
|
+#include <linux/of.h>
|
||||||
|
#include <linux/platform_device.h>
|
||||||
|
#include <linux/slab.h>
|
||||||
|
|
||||||
|
@@ -72,6 +73,7 @@ static int brcm_nvram_add_cells(struct b
|
||||||
|
return -ENOMEM;
|
||||||
|
priv->cells[idx].offset = value - (char *)data;
|
||||||
|
priv->cells[idx].bytes = strlen(value);
|
||||||
|
+ priv->cells[idx].np = of_get_child_by_name(dev->of_node, priv->cells[idx].name);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
@ -20,12 +20,12 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
#include <linux/mod_devicetable.h>
|
#include <linux/mod_devicetable.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
@@ -46,6 +47,8 @@ static int brcm_nvram_probe(struct platf
|
@@ -136,6 +137,8 @@ static int brcm_nvram_probe(struct platf
|
||||||
if (IS_ERR(priv->base))
|
if (err)
|
||||||
return PTR_ERR(priv->base);
|
return err;
|
||||||
|
|
||||||
+ bcm47xx_nvram_init_from_iomem(priv->base, resource_size(res));
|
+ bcm47xx_nvram_init_from_iomem(priv->base, resource_size(res));
|
||||||
+
|
+
|
||||||
config.dev = dev;
|
config.dev = dev;
|
||||||
config.priv = priv;
|
config.cells = priv->cells;
|
||||||
config.size = resource_size(res);
|
config.ncells = priv->ncells;
|
||||||
|
|||||||
@ -0,0 +1,301 @@
|
|||||||
|
From 9b78ef0c7997052e9eaa0f7a4513d546fa17358c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mikhail Zhilkin <csharper2005@gmail.com>
|
||||||
|
Date: Sun, 29 May 2022 11:07:14 +0000
|
||||||
|
Subject: [PATCH] mtd: parsers: add support for Sercomm partitions
|
||||||
|
|
||||||
|
This adds an MTD partition parser for the Sercomm partition table that
|
||||||
|
is used in some Beeline, Netgear and Sercomm routers.
|
||||||
|
|
||||||
|
The Sercomm partition map table contains real partition offsets, which
|
||||||
|
may differ from device to device depending on the number and location of
|
||||||
|
bad blocks on NAND.
|
||||||
|
|
||||||
|
Original patch (proposed by NOGUCHI Hiroshi):
|
||||||
|
Link: https://github.com/openwrt/openwrt/pull/1318#issuecomment-420607394
|
||||||
|
|
||||||
|
Signed-off-by: NOGUCHI Hiroshi <drvlabo@gmail.com>
|
||||||
|
Signed-off-by: Mikhail Zhilkin <csharper2005@gmail.com>
|
||||||
|
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
||||||
|
Link: https://lore.kernel.org/linux-mtd/20220529110714.189732-1-csharper2005@gmail.com
|
||||||
|
---
|
||||||
|
drivers/mtd/parsers/Kconfig | 9 ++
|
||||||
|
drivers/mtd/parsers/Makefile | 1 +
|
||||||
|
drivers/mtd/parsers/scpart.c | 248 +++++++++++++++++++++++++++++++++++
|
||||||
|
3 files changed, 258 insertions(+)
|
||||||
|
create mode 100644 drivers/mtd/parsers/scpart.c
|
||||||
|
|
||||||
|
--- a/drivers/mtd/parsers/Kconfig
|
||||||
|
+++ b/drivers/mtd/parsers/Kconfig
|
||||||
|
@@ -179,3 +179,12 @@ config MTD_REDBOOT_PARTS_READONLY
|
||||||
|
'FIS directory' images, enable this option.
|
||||||
|
|
||||||
|
endif # MTD_REDBOOT_PARTS
|
||||||
|
+
|
||||||
|
+config MTD_SERCOMM_PARTS
|
||||||
|
+ tristate "Sercomm partition table parser"
|
||||||
|
+ depends on MTD && RALINK
|
||||||
|
+ help
|
||||||
|
+ This provides partitions table parser for devices with Sercomm
|
||||||
|
+ partition map. This partition table contains real partition
|
||||||
|
+ offsets, which may differ from device to device depending on the
|
||||||
|
+ number and location of bad blocks on NAND.
|
||||||
|
--- a/drivers/mtd/parsers/Makefile
|
||||||
|
+++ b/drivers/mtd/parsers/Makefile
|
||||||
|
@@ -10,5 +10,6 @@ ofpart-$(CONFIG_MTD_OF_PARTS_LINKSYS_NS)
|
||||||
|
obj-$(CONFIG_MTD_PARSER_IMAGETAG) += parser_imagetag.o
|
||||||
|
obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
|
||||||
|
obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o
|
||||||
|
+obj-$(CONFIG_MTD_SERCOMM_PARTS) += scpart.o
|
||||||
|
obj-$(CONFIG_MTD_SHARPSL_PARTS) += sharpslpart.o
|
||||||
|
obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/drivers/mtd/parsers/scpart.c
|
||||||
|
@@ -0,0 +1,248 @@
|
||||||
|
+// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
+/*
|
||||||
|
+ * drivers/mtd/scpart.c: Sercomm Partition Parser
|
||||||
|
+ *
|
||||||
|
+ * Copyright (C) 2018 NOGUCHI Hiroshi
|
||||||
|
+ * Copyright (C) 2022 Mikhail Zhilkin
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#include <linux/kernel.h>
|
||||||
|
+#include <linux/slab.h>
|
||||||
|
+#include <linux/mtd/mtd.h>
|
||||||
|
+#include <linux/mtd/partitions.h>
|
||||||
|
+#include <linux/module.h>
|
||||||
|
+
|
||||||
|
+#define MOD_NAME "scpart"
|
||||||
|
+
|
||||||
|
+#ifdef pr_fmt
|
||||||
|
+#undef pr_fmt
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#define pr_fmt(fmt) MOD_NAME ": " fmt
|
||||||
|
+
|
||||||
|
+#define ID_ALREADY_FOUND 0xffffffffUL
|
||||||
|
+
|
||||||
|
+#define MAP_OFFS_IN_BLK 0x800
|
||||||
|
+#define MAP_MIRROR_NUM 2
|
||||||
|
+
|
||||||
|
+static const char sc_part_magic[] = {
|
||||||
|
+ 'S', 'C', 'F', 'L', 'M', 'A', 'P', 'O', 'K', '\0',
|
||||||
|
+};
|
||||||
|
+#define PART_MAGIC_LEN sizeof(sc_part_magic)
|
||||||
|
+
|
||||||
|
+/* assumes that all fields are set by CPU native endian */
|
||||||
|
+struct sc_part_desc {
|
||||||
|
+ uint32_t part_id;
|
||||||
|
+ uint32_t part_offs;
|
||||||
|
+ uint32_t part_bytes;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+static uint32_t scpart_desc_is_valid(struct sc_part_desc *pdesc)
|
||||||
|
+{
|
||||||
|
+ return ((pdesc->part_id != 0xffffffffUL) &&
|
||||||
|
+ (pdesc->part_offs != 0xffffffffUL) &&
|
||||||
|
+ (pdesc->part_bytes != 0xffffffffUL));
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int scpart_scan_partmap(struct mtd_info *master, loff_t partmap_offs,
|
||||||
|
+ struct sc_part_desc **ppdesc)
|
||||||
|
+{
|
||||||
|
+ int cnt = 0;
|
||||||
|
+ int res = 0;
|
||||||
|
+ int res2;
|
||||||
|
+ loff_t offs;
|
||||||
|
+ size_t retlen;
|
||||||
|
+ struct sc_part_desc *pdesc = NULL;
|
||||||
|
+ struct sc_part_desc *tmpdesc;
|
||||||
|
+ uint8_t *buf;
|
||||||
|
+
|
||||||
|
+ buf = kzalloc(master->erasesize, GFP_KERNEL);
|
||||||
|
+ if (!buf) {
|
||||||
|
+ res = -ENOMEM;
|
||||||
|
+ goto out;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ res2 = mtd_read(master, partmap_offs, master->erasesize, &retlen, buf);
|
||||||
|
+ if (res2 || retlen != master->erasesize) {
|
||||||
|
+ res = -EIO;
|
||||||
|
+ goto free;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ for (offs = MAP_OFFS_IN_BLK;
|
||||||
|
+ offs < master->erasesize - sizeof(*tmpdesc);
|
||||||
|
+ offs += sizeof(*tmpdesc)) {
|
||||||
|
+ tmpdesc = (struct sc_part_desc *)&buf[offs];
|
||||||
|
+ if (!scpart_desc_is_valid(tmpdesc))
|
||||||
|
+ break;
|
||||||
|
+ cnt++;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (cnt > 0) {
|
||||||
|
+ int bytes = cnt * sizeof(*pdesc);
|
||||||
|
+
|
||||||
|
+ pdesc = kcalloc(cnt, sizeof(*pdesc), GFP_KERNEL);
|
||||||
|
+ if (!pdesc) {
|
||||||
|
+ res = -ENOMEM;
|
||||||
|
+ goto free;
|
||||||
|
+ }
|
||||||
|
+ memcpy(pdesc, &(buf[MAP_OFFS_IN_BLK]), bytes);
|
||||||
|
+
|
||||||
|
+ *ppdesc = pdesc;
|
||||||
|
+ res = cnt;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+free:
|
||||||
|
+ kfree(buf);
|
||||||
|
+
|
||||||
|
+out:
|
||||||
|
+ return res;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int scpart_find_partmap(struct mtd_info *master,
|
||||||
|
+ struct sc_part_desc **ppdesc)
|
||||||
|
+{
|
||||||
|
+ int magic_found = 0;
|
||||||
|
+ int res = 0;
|
||||||
|
+ int res2;
|
||||||
|
+ loff_t offs = 0;
|
||||||
|
+ size_t retlen;
|
||||||
|
+ uint8_t rdbuf[PART_MAGIC_LEN];
|
||||||
|
+
|
||||||
|
+ while ((magic_found < MAP_MIRROR_NUM) &&
|
||||||
|
+ (offs < master->size) &&
|
||||||
|
+ !mtd_block_isbad(master, offs)) {
|
||||||
|
+ res2 = mtd_read(master, offs, PART_MAGIC_LEN, &retlen, rdbuf);
|
||||||
|
+ if (res2 || retlen != PART_MAGIC_LEN) {
|
||||||
|
+ res = -EIO;
|
||||||
|
+ goto out;
|
||||||
|
+ }
|
||||||
|
+ if (!memcmp(rdbuf, sc_part_magic, PART_MAGIC_LEN)) {
|
||||||
|
+ pr_debug("Signature found at 0x%llx\n", offs);
|
||||||
|
+ magic_found++;
|
||||||
|
+ res = scpart_scan_partmap(master, offs, ppdesc);
|
||||||
|
+ if (res > 0)
|
||||||
|
+ goto out;
|
||||||
|
+ }
|
||||||
|
+ offs += master->erasesize;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+out:
|
||||||
|
+ if (res > 0)
|
||||||
|
+ pr_info("Valid 'SC PART MAP' (%d partitions) found at 0x%llx\n", res, offs);
|
||||||
|
+ else
|
||||||
|
+ pr_info("No valid 'SC PART MAP' was found\n");
|
||||||
|
+
|
||||||
|
+ return res;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int scpart_parse(struct mtd_info *master,
|
||||||
|
+ const struct mtd_partition **pparts,
|
||||||
|
+ struct mtd_part_parser_data *data)
|
||||||
|
+{
|
||||||
|
+ const char *partname;
|
||||||
|
+ int n;
|
||||||
|
+ int nr_scparts;
|
||||||
|
+ int nr_parts = 0;
|
||||||
|
+ int res = 0;
|
||||||
|
+ struct sc_part_desc *scpart_map = NULL;
|
||||||
|
+ struct mtd_partition *parts = NULL;
|
||||||
|
+ struct device_node *mtd_node;
|
||||||
|
+ struct device_node *ofpart_node;
|
||||||
|
+ struct device_node *pp;
|
||||||
|
+
|
||||||
|
+ mtd_node = mtd_get_of_node(master);
|
||||||
|
+ if (!mtd_node) {
|
||||||
|
+ res = -ENOENT;
|
||||||
|
+ goto out;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ofpart_node = of_get_child_by_name(mtd_node, "partitions");
|
||||||
|
+ if (!ofpart_node) {
|
||||||
|
+ pr_info("%s: 'partitions' subnode not found on %pOF.\n",
|
||||||
|
+ master->name, mtd_node);
|
||||||
|
+ res = -ENOENT;
|
||||||
|
+ goto out;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ nr_scparts = scpart_find_partmap(master, &scpart_map);
|
||||||
|
+ if (nr_scparts <= 0) {
|
||||||
|
+ pr_info("No any partitions was found in 'SC PART MAP'.\n");
|
||||||
|
+ res = -ENOENT;
|
||||||
|
+ goto free;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ parts = kcalloc(of_get_child_count(ofpart_node), sizeof(*parts),
|
||||||
|
+ GFP_KERNEL);
|
||||||
|
+ if (!parts) {
|
||||||
|
+ res = -ENOMEM;
|
||||||
|
+ goto free;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ for_each_child_of_node(ofpart_node, pp) {
|
||||||
|
+ u32 scpart_id;
|
||||||
|
+
|
||||||
|
+ if (of_property_read_u32(pp, "sercomm,scpart-id", &scpart_id))
|
||||||
|
+ continue;
|
||||||
|
+
|
||||||
|
+ for (n = 0 ; n < nr_scparts ; n++)
|
||||||
|
+ if ((scpart_map[n].part_id != ID_ALREADY_FOUND) &&
|
||||||
|
+ (scpart_id == scpart_map[n].part_id))
|
||||||
|
+ break;
|
||||||
|
+ if (n >= nr_scparts)
|
||||||
|
+ /* not match */
|
||||||
|
+ continue;
|
||||||
|
+
|
||||||
|
+ /* add the partition found in OF into MTD partition array */
|
||||||
|
+ parts[nr_parts].offset = scpart_map[n].part_offs;
|
||||||
|
+ parts[nr_parts].size = scpart_map[n].part_bytes;
|
||||||
|
+ parts[nr_parts].of_node = pp;
|
||||||
|
+
|
||||||
|
+ if (!of_property_read_string(pp, "label", &partname))
|
||||||
|
+ parts[nr_parts].name = partname;
|
||||||
|
+ if (of_property_read_bool(pp, "read-only"))
|
||||||
|
+ parts[nr_parts].mask_flags |= MTD_WRITEABLE;
|
||||||
|
+ if (of_property_read_bool(pp, "lock"))
|
||||||
|
+ parts[nr_parts].mask_flags |= MTD_POWERUP_LOCK;
|
||||||
|
+
|
||||||
|
+ /* mark as 'done' */
|
||||||
|
+ scpart_map[n].part_id = ID_ALREADY_FOUND;
|
||||||
|
+
|
||||||
|
+ nr_parts++;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (nr_parts > 0) {
|
||||||
|
+ *pparts = parts;
|
||||||
|
+ res = nr_parts;
|
||||||
|
+ } else
|
||||||
|
+ pr_info("No partition in OF matches partition ID with 'SC PART MAP'.\n");
|
||||||
|
+
|
||||||
|
+ of_node_put(pp);
|
||||||
|
+
|
||||||
|
+free:
|
||||||
|
+ kfree(scpart_map);
|
||||||
|
+ if (res <= 0)
|
||||||
|
+ kfree(parts);
|
||||||
|
+
|
||||||
|
+out:
|
||||||
|
+ return res;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static const struct of_device_id scpart_parser_of_match_table[] = {
|
||||||
|
+ { .compatible = "sercomm,sc-partitions" },
|
||||||
|
+ {},
|
||||||
|
+};
|
||||||
|
+MODULE_DEVICE_TABLE(of, scpart_parser_of_match_table);
|
||||||
|
+
|
||||||
|
+static struct mtd_part_parser scpart_parser = {
|
||||||
|
+ .parse_fn = scpart_parse,
|
||||||
|
+ .name = "scpart",
|
||||||
|
+ .of_match_table = scpart_parser_of_match_table,
|
||||||
|
+};
|
||||||
|
+module_mtd_part_parser(scpart_parser);
|
||||||
|
+
|
||||||
|
+/* mtd parsers will request the module by parser name */
|
||||||
|
+MODULE_ALIAS("scpart");
|
||||||
|
+MODULE_LICENSE("GPL");
|
||||||
|
+MODULE_AUTHOR("NOGUCHI Hiroshi <drvlabo@gmail.com>");
|
||||||
|
+MODULE_AUTHOR("Mikhail Zhilkin <csharper2005@gmail.com>");
|
||||||
|
+MODULE_DESCRIPTION("Sercomm partition parser");
|
||||||
@ -0,0 +1,278 @@
|
|||||||
|
From f955dc14450695564926711cf9fa8e1d5d854302 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||||
|
Date: Wed, 15 Jun 2022 21:43:00 +0200
|
||||||
|
Subject: [PATCH] nvmem: add driver handling U-Boot environment variables
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
U-Boot stores its setup as environment variables. It's a list of
|
||||||
|
key-value pairs stored on flash device with a custom header.
|
||||||
|
|
||||||
|
This commit adds an NVMEM driver that:
|
||||||
|
1. Provides NVMEM access to environment vars binary data
|
||||||
|
2. Extracts variables as NVMEM cells
|
||||||
|
|
||||||
|
Current Linux's NVMEM sysfs API allows reading whole NVMEM data block.
|
||||||
|
It can be used by user-space tools for reading U-Boot env vars block
|
||||||
|
without the hassle of finding its location. Parsing will still need to
|
||||||
|
be re-done there.
|
||||||
|
|
||||||
|
Kernel-parsed NVMEM cells can be read however by Linux drivers. This may
|
||||||
|
be useful for Ethernet drivers for reading device MAC address which is
|
||||||
|
often stored as U-Boot env variable.
|
||||||
|
|
||||||
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||||
|
Reviewed-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
|
||||||
|
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||||
|
---
|
||||||
|
|
||||||
|
--- a/drivers/nvmem/Kconfig
|
||||||
|
+++ b/drivers/nvmem/Kconfig
|
||||||
|
@@ -270,4 +270,17 @@ config SPRD_EFUSE
|
||||||
|
This driver can also be built as a module. If so, the module
|
||||||
|
will be called nvmem-sprd-efuse.
|
||||||
|
|
||||||
|
+config NVMEM_U_BOOT_ENV
|
||||||
|
+ tristate "U-Boot environment variables support"
|
||||||
|
+ depends on OF && MTD
|
||||||
|
+ select CRC32
|
||||||
|
+ help
|
||||||
|
+ U-Boot stores its setup as environment variables. This driver adds
|
||||||
|
+ support for verifying & exporting such data. It also exposes variables
|
||||||
|
+ as NVMEM cells so they can be referenced by other drivers.
|
||||||
|
+
|
||||||
|
+ Currently this drivers works only with env variables on top of MTD.
|
||||||
|
+
|
||||||
|
+ If compiled as module it will be called nvmem_u-boot-env.
|
||||||
|
+
|
||||||
|
endif
|
||||||
|
--- a/drivers/nvmem/Makefile
|
||||||
|
+++ b/drivers/nvmem/Makefile
|
||||||
|
@@ -55,3 +55,5 @@ obj-$(CONFIG_NVMEM_ZYNQMP) += nvmem_zynq
|
||||||
|
nvmem_zynqmp_nvmem-y := zynqmp_nvmem.o
|
||||||
|
obj-$(CONFIG_SPRD_EFUSE) += nvmem_sprd_efuse.o
|
||||||
|
nvmem_sprd_efuse-y := sprd-efuse.o
|
||||||
|
+obj-$(CONFIG_NVMEM_U_BOOT_ENV) += nvmem_u-boot-env.o
|
||||||
|
+nvmem_u-boot-env-y := u-boot-env.o
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/drivers/nvmem/u-boot-env.c
|
||||||
|
@@ -0,0 +1,218 @@
|
||||||
|
+// SPDX-License-Identifier: GPL-2.0-only
|
||||||
|
+/*
|
||||||
|
+ * Copyright (C) 2022 Rafał Miłecki <rafal@milecki.pl>
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#include <linux/crc32.h>
|
||||||
|
+#include <linux/mod_devicetable.h>
|
||||||
|
+#include <linux/module.h>
|
||||||
|
+#include <linux/mtd/mtd.h>
|
||||||
|
+#include <linux/nvmem-consumer.h>
|
||||||
|
+#include <linux/nvmem-provider.h>
|
||||||
|
+#include <linux/of_device.h>
|
||||||
|
+#include <linux/platform_device.h>
|
||||||
|
+#include <linux/slab.h>
|
||||||
|
+
|
||||||
|
+enum u_boot_env_format {
|
||||||
|
+ U_BOOT_FORMAT_SINGLE,
|
||||||
|
+ U_BOOT_FORMAT_REDUNDANT,
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+struct u_boot_env {
|
||||||
|
+ struct device *dev;
|
||||||
|
+ enum u_boot_env_format format;
|
||||||
|
+
|
||||||
|
+ struct mtd_info *mtd;
|
||||||
|
+
|
||||||
|
+ /* Cells */
|
||||||
|
+ struct nvmem_cell_info *cells;
|
||||||
|
+ int ncells;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+struct u_boot_env_image_single {
|
||||||
|
+ __le32 crc32;
|
||||||
|
+ uint8_t data[];
|
||||||
|
+} __packed;
|
||||||
|
+
|
||||||
|
+struct u_boot_env_image_redundant {
|
||||||
|
+ __le32 crc32;
|
||||||
|
+ u8 mark;
|
||||||
|
+ uint8_t data[];
|
||||||
|
+} __packed;
|
||||||
|
+
|
||||||
|
+static int u_boot_env_read(void *context, unsigned int offset, void *val,
|
||||||
|
+ size_t bytes)
|
||||||
|
+{
|
||||||
|
+ struct u_boot_env *priv = context;
|
||||||
|
+ struct device *dev = priv->dev;
|
||||||
|
+ size_t bytes_read;
|
||||||
|
+ int err;
|
||||||
|
+
|
||||||
|
+ err = mtd_read(priv->mtd, offset, bytes, &bytes_read, val);
|
||||||
|
+ if (err && !mtd_is_bitflip(err)) {
|
||||||
|
+ dev_err(dev, "Failed to read from mtd: %d\n", err);
|
||||||
|
+ return err;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (bytes_read != bytes) {
|
||||||
|
+ dev_err(dev, "Failed to read %zu bytes\n", bytes);
|
||||||
|
+ return -EIO;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int u_boot_env_add_cells(struct u_boot_env *priv, uint8_t *buf,
|
||||||
|
+ size_t data_offset, size_t data_len)
|
||||||
|
+{
|
||||||
|
+ struct device *dev = priv->dev;
|
||||||
|
+ char *data = buf + data_offset;
|
||||||
|
+ char *var, *value, *eq;
|
||||||
|
+ int idx;
|
||||||
|
+
|
||||||
|
+ priv->ncells = 0;
|
||||||
|
+ for (var = data; var < data + data_len && *var; var += strlen(var) + 1)
|
||||||
|
+ priv->ncells++;
|
||||||
|
+
|
||||||
|
+ priv->cells = devm_kcalloc(dev, priv->ncells, sizeof(*priv->cells), GFP_KERNEL);
|
||||||
|
+ if (!priv->cells)
|
||||||
|
+ return -ENOMEM;
|
||||||
|
+
|
||||||
|
+ for (var = data, idx = 0;
|
||||||
|
+ var < data + data_len && *var;
|
||||||
|
+ var = value + strlen(value) + 1, idx++) {
|
||||||
|
+ eq = strchr(var, '=');
|
||||||
|
+ if (!eq)
|
||||||
|
+ break;
|
||||||
|
+ *eq = '\0';
|
||||||
|
+ value = eq + 1;
|
||||||
|
+
|
||||||
|
+ priv->cells[idx].name = devm_kstrdup(dev, var, GFP_KERNEL);
|
||||||
|
+ if (!priv->cells[idx].name)
|
||||||
|
+ return -ENOMEM;
|
||||||
|
+ priv->cells[idx].offset = data_offset + value - data;
|
||||||
|
+ priv->cells[idx].bytes = strlen(value);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (WARN_ON(idx != priv->ncells))
|
||||||
|
+ priv->ncells = idx;
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int u_boot_env_parse(struct u_boot_env *priv)
|
||||||
|
+{
|
||||||
|
+ struct device *dev = priv->dev;
|
||||||
|
+ size_t crc32_data_offset;
|
||||||
|
+ size_t crc32_data_len;
|
||||||
|
+ size_t crc32_offset;
|
||||||
|
+ size_t data_offset;
|
||||||
|
+ size_t data_len;
|
||||||
|
+ uint32_t crc32;
|
||||||
|
+ uint32_t calc;
|
||||||
|
+ size_t bytes;
|
||||||
|
+ uint8_t *buf;
|
||||||
|
+ int err;
|
||||||
|
+
|
||||||
|
+ buf = kcalloc(1, priv->mtd->size, GFP_KERNEL);
|
||||||
|
+ if (!buf) {
|
||||||
|
+ err = -ENOMEM;
|
||||||
|
+ goto err_out;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ err = mtd_read(priv->mtd, 0, priv->mtd->size, &bytes, buf);
|
||||||
|
+ if ((err && !mtd_is_bitflip(err)) || bytes != priv->mtd->size) {
|
||||||
|
+ dev_err(dev, "Failed to read from mtd: %d\n", err);
|
||||||
|
+ goto err_kfree;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ switch (priv->format) {
|
||||||
|
+ case U_BOOT_FORMAT_SINGLE:
|
||||||
|
+ crc32_offset = offsetof(struct u_boot_env_image_single, crc32);
|
||||||
|
+ crc32_data_offset = offsetof(struct u_boot_env_image_single, data);
|
||||||
|
+ data_offset = offsetof(struct u_boot_env_image_single, data);
|
||||||
|
+ break;
|
||||||
|
+ case U_BOOT_FORMAT_REDUNDANT:
|
||||||
|
+ crc32_offset = offsetof(struct u_boot_env_image_redundant, crc32);
|
||||||
|
+ crc32_data_offset = offsetof(struct u_boot_env_image_redundant, mark);
|
||||||
|
+ data_offset = offsetof(struct u_boot_env_image_redundant, data);
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ crc32 = le32_to_cpu(*(uint32_t *)(buf + crc32_offset));
|
||||||
|
+ crc32_data_len = priv->mtd->size - crc32_data_offset;
|
||||||
|
+ data_len = priv->mtd->size - data_offset;
|
||||||
|
+
|
||||||
|
+ calc = crc32(~0, buf + crc32_data_offset, crc32_data_len) ^ ~0L;
|
||||||
|
+ if (calc != crc32) {
|
||||||
|
+ dev_err(dev, "Invalid calculated CRC32: 0x%08x (expected: 0x%08x)\n", calc, crc32);
|
||||||
|
+ err = -EINVAL;
|
||||||
|
+ goto err_kfree;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ buf[priv->mtd->size - 1] = '\0';
|
||||||
|
+ err = u_boot_env_add_cells(priv, buf, data_offset, data_len);
|
||||||
|
+ if (err)
|
||||||
|
+ dev_err(dev, "Failed to add cells: %d\n", err);
|
||||||
|
+
|
||||||
|
+err_kfree:
|
||||||
|
+ kfree(buf);
|
||||||
|
+err_out:
|
||||||
|
+ return err;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int u_boot_env_probe(struct platform_device *pdev)
|
||||||
|
+{
|
||||||
|
+ struct nvmem_config config = {
|
||||||
|
+ .name = "u-boot-env",
|
||||||
|
+ .reg_read = u_boot_env_read,
|
||||||
|
+ };
|
||||||
|
+ struct device *dev = &pdev->dev;
|
||||||
|
+ struct device_node *np = dev->of_node;
|
||||||
|
+ struct u_boot_env *priv;
|
||||||
|
+ int err;
|
||||||
|
+
|
||||||
|
+ priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
|
||||||
|
+ if (!priv)
|
||||||
|
+ return -ENOMEM;
|
||||||
|
+ priv->dev = dev;
|
||||||
|
+
|
||||||
|
+ priv->format = (uintptr_t)of_device_get_match_data(dev);
|
||||||
|
+
|
||||||
|
+ priv->mtd = of_get_mtd_device_by_node(np);
|
||||||
|
+ if (IS_ERR(priv->mtd)) {
|
||||||
|
+ dev_err_probe(dev, PTR_ERR(priv->mtd), "Failed to get %pOF MTD\n", np);
|
||||||
|
+ return PTR_ERR(priv->mtd);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ err = u_boot_env_parse(priv);
|
||||||
|
+ if (err)
|
||||||
|
+ return err;
|
||||||
|
+
|
||||||
|
+ config.dev = dev;
|
||||||
|
+ config.cells = priv->cells;
|
||||||
|
+ config.ncells = priv->ncells;
|
||||||
|
+ config.priv = priv;
|
||||||
|
+ config.size = priv->mtd->size;
|
||||||
|
+
|
||||||
|
+ return PTR_ERR_OR_ZERO(devm_nvmem_register(dev, &config));
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static const struct of_device_id u_boot_env_of_match_table[] = {
|
||||||
|
+ { .compatible = "u-boot,env", .data = (void *)U_BOOT_FORMAT_SINGLE, },
|
||||||
|
+ { .compatible = "u-boot,env-redundant-bool", .data = (void *)U_BOOT_FORMAT_REDUNDANT, },
|
||||||
|
+ { .compatible = "u-boot,env-redundant-count", .data = (void *)U_BOOT_FORMAT_REDUNDANT, },
|
||||||
|
+ {},
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+static struct platform_driver u_boot_env_driver = {
|
||||||
|
+ .probe = u_boot_env_probe,
|
||||||
|
+ .driver = {
|
||||||
|
+ .name = "u_boot_env",
|
||||||
|
+ .of_match_table = u_boot_env_of_match_table,
|
||||||
|
+ },
|
||||||
|
+};
|
||||||
|
+module_platform_driver(u_boot_env_driver);
|
||||||
|
+
|
||||||
|
+MODULE_AUTHOR("Rafał Miłecki");
|
||||||
|
+MODULE_LICENSE("GPL");
|
||||||
|
+MODULE_DEVICE_TABLE(of, u_boot_env_of_match_table);
|
||||||
@ -0,0 +1,41 @@
|
|||||||
|
From dbc2f62061c6bfba0aee93161ee3194dcee84bd0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||||
|
Date: Fri, 29 Apr 2022 17:26:46 +0100
|
||||||
|
Subject: [PATCH] nvmem: core: support passing DT node in cell info
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Some hardware may have NVMEM cells described in Device Tree using
|
||||||
|
individual nodes. Let drivers pass such nodes to the NVMEM subsystem so
|
||||||
|
they can be later used by NVMEM consumers.
|
||||||
|
|
||||||
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||||
|
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||||
|
Link: https://lore.kernel.org/r/20220429162701.2222-2-srinivas.kandagatla@linaro.org
|
||||||
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||||
|
---
|
||||||
|
drivers/nvmem/core.c | 1 +
|
||||||
|
include/linux/nvmem-consumer.h | 1 +
|
||||||
|
2 files changed, 2 insertions(+)
|
||||||
|
|
||||||
|
--- a/drivers/nvmem/core.c
|
||||||
|
+++ b/drivers/nvmem/core.c
|
||||||
|
@@ -374,6 +374,7 @@ static int nvmem_cell_info_to_nvmem_cell
|
||||||
|
|
||||||
|
cell->bit_offset = info->bit_offset;
|
||||||
|
cell->nbits = info->nbits;
|
||||||
|
+ cell->np = info->np;
|
||||||
|
|
||||||
|
if (cell->nbits)
|
||||||
|
cell->bytes = DIV_ROUND_UP(cell->nbits + cell->bit_offset,
|
||||||
|
--- a/include/linux/nvmem-consumer.h
|
||||||
|
+++ b/include/linux/nvmem-consumer.h
|
||||||
|
@@ -25,6 +25,7 @@ struct nvmem_cell_info {
|
||||||
|
unsigned int bytes;
|
||||||
|
unsigned int bit_offset;
|
||||||
|
unsigned int nbits;
|
||||||
|
+ struct device_node *np;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
@ -0,0 +1,72 @@
|
|||||||
|
From b0321721be50b80c03a51866a94fde4f94690e18 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||||
|
Date: Wed, 15 Jun 2022 21:42:59 +0200
|
||||||
|
Subject: [PATCH] mtd: allow getting MTD device associated with a specific DT
|
||||||
|
node
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
MTD subsystem API allows interacting with MTD devices (e.g. reading,
|
||||||
|
writing, handling bad blocks). So far a random driver could get MTD
|
||||||
|
device only by its name (get_mtd_device_nm()). This change allows
|
||||||
|
getting them also by a DT node.
|
||||||
|
|
||||||
|
This API is required for drivers handling DT defined MTD partitions in a
|
||||||
|
specific way (e.g. U-Boot (sub)partition with environment variables).
|
||||||
|
|
||||||
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||||
|
Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
||||||
|
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||||
|
---
|
||||||
|
drivers/mtd/mtdcore.c | 28 ++++++++++++++++++++++++++++
|
||||||
|
include/linux/mtd/mtd.h | 1 +
|
||||||
|
2 files changed, 29 insertions(+)
|
||||||
|
|
||||||
|
--- a/drivers/mtd/mtdcore.c
|
||||||
|
+++ b/drivers/mtd/mtdcore.c
|
||||||
|
@@ -1227,6 +1227,34 @@ int __get_mtd_device(struct mtd_info *mt
|
||||||
|
EXPORT_SYMBOL_GPL(__get_mtd_device);
|
||||||
|
|
||||||
|
/**
|
||||||
|
+ * of_get_mtd_device_by_node - obtain an MTD device associated with a given node
|
||||||
|
+ *
|
||||||
|
+ * @np: device tree node
|
||||||
|
+ */
|
||||||
|
+struct mtd_info *of_get_mtd_device_by_node(struct device_node *np)
|
||||||
|
+{
|
||||||
|
+ struct mtd_info *mtd = NULL;
|
||||||
|
+ struct mtd_info *tmp;
|
||||||
|
+ int err;
|
||||||
|
+
|
||||||
|
+ mutex_lock(&mtd_table_mutex);
|
||||||
|
+
|
||||||
|
+ err = -EPROBE_DEFER;
|
||||||
|
+ mtd_for_each_device(tmp) {
|
||||||
|
+ if (mtd_get_of_node(tmp) == np) {
|
||||||
|
+ mtd = tmp;
|
||||||
|
+ err = __get_mtd_device(mtd);
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ mutex_unlock(&mtd_table_mutex);
|
||||||
|
+
|
||||||
|
+ return err ? ERR_PTR(err) : mtd;
|
||||||
|
+}
|
||||||
|
+EXPORT_SYMBOL_GPL(of_get_mtd_device_by_node);
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
* get_mtd_device_nm - obtain a validated handle for an MTD device by
|
||||||
|
* device name
|
||||||
|
* @name: MTD device name to open
|
||||||
|
--- a/include/linux/mtd/mtd.h
|
||||||
|
+++ b/include/linux/mtd/mtd.h
|
||||||
|
@@ -682,6 +682,7 @@ extern int mtd_device_unregister(struct
|
||||||
|
extern struct mtd_info *get_mtd_device(struct mtd_info *mtd, int num);
|
||||||
|
extern int __get_mtd_device(struct mtd_info *mtd);
|
||||||
|
extern void __put_mtd_device(struct mtd_info *mtd);
|
||||||
|
+extern struct mtd_info *of_get_mtd_device_by_node(struct device_node *np);
|
||||||
|
extern struct mtd_info *get_mtd_device_nm(const char *name);
|
||||||
|
extern void put_mtd_device(struct mtd_info *mtd);
|
||||||
|
|
||||||
@ -0,0 +1,278 @@
|
|||||||
|
From f955dc14450695564926711cf9fa8e1d5d854302 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||||
|
Date: Wed, 15 Jun 2022 21:43:00 +0200
|
||||||
|
Subject: [PATCH] nvmem: add driver handling U-Boot environment variables
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
U-Boot stores its setup as environment variables. It's a list of
|
||||||
|
key-value pairs stored on flash device with a custom header.
|
||||||
|
|
||||||
|
This commit adds an NVMEM driver that:
|
||||||
|
1. Provides NVMEM access to environment vars binary data
|
||||||
|
2. Extracts variables as NVMEM cells
|
||||||
|
|
||||||
|
Current Linux's NVMEM sysfs API allows reading whole NVMEM data block.
|
||||||
|
It can be used by user-space tools for reading U-Boot env vars block
|
||||||
|
without the hassle of finding its location. Parsing will still need to
|
||||||
|
be re-done there.
|
||||||
|
|
||||||
|
Kernel-parsed NVMEM cells can be read however by Linux drivers. This may
|
||||||
|
be useful for Ethernet drivers for reading device MAC address which is
|
||||||
|
often stored as U-Boot env variable.
|
||||||
|
|
||||||
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||||
|
Reviewed-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
|
||||||
|
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||||
|
---
|
||||||
|
|
||||||
|
--- a/drivers/nvmem/Kconfig
|
||||||
|
+++ b/drivers/nvmem/Kconfig
|
||||||
|
@@ -300,4 +300,17 @@ config NVMEM_BRCM_NVRAM
|
||||||
|
This driver provides support for Broadcom's NVRAM that can be accessed
|
||||||
|
using I/O mapping.
|
||||||
|
|
||||||
|
+config NVMEM_U_BOOT_ENV
|
||||||
|
+ tristate "U-Boot environment variables support"
|
||||||
|
+ depends on OF && MTD
|
||||||
|
+ select CRC32
|
||||||
|
+ help
|
||||||
|
+ U-Boot stores its setup as environment variables. This driver adds
|
||||||
|
+ support for verifying & exporting such data. It also exposes variables
|
||||||
|
+ as NVMEM cells so they can be referenced by other drivers.
|
||||||
|
+
|
||||||
|
+ Currently this drivers works only with env variables on top of MTD.
|
||||||
|
+
|
||||||
|
+ If compiled as module it will be called nvmem_u-boot-env.
|
||||||
|
+
|
||||||
|
endif
|
||||||
|
--- a/drivers/nvmem/Makefile
|
||||||
|
+++ b/drivers/nvmem/Makefile
|
||||||
|
@@ -61,3 +61,5 @@ obj-$(CONFIG_NVMEM_RMEM) += nvmem-rmem.
|
||||||
|
nvmem-rmem-y := rmem.o
|
||||||
|
obj-$(CONFIG_NVMEM_BRCM_NVRAM) += nvmem_brcm_nvram.o
|
||||||
|
nvmem_brcm_nvram-y := brcm_nvram.o
|
||||||
|
+obj-$(CONFIG_NVMEM_U_BOOT_ENV) += nvmem_u-boot-env.o
|
||||||
|
+nvmem_u-boot-env-y := u-boot-env.o
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/drivers/nvmem/u-boot-env.c
|
||||||
|
@@ -0,0 +1,218 @@
|
||||||
|
+// SPDX-License-Identifier: GPL-2.0-only
|
||||||
|
+/*
|
||||||
|
+ * Copyright (C) 2022 Rafał Miłecki <rafal@milecki.pl>
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#include <linux/crc32.h>
|
||||||
|
+#include <linux/mod_devicetable.h>
|
||||||
|
+#include <linux/module.h>
|
||||||
|
+#include <linux/mtd/mtd.h>
|
||||||
|
+#include <linux/nvmem-consumer.h>
|
||||||
|
+#include <linux/nvmem-provider.h>
|
||||||
|
+#include <linux/of_device.h>
|
||||||
|
+#include <linux/platform_device.h>
|
||||||
|
+#include <linux/slab.h>
|
||||||
|
+
|
||||||
|
+enum u_boot_env_format {
|
||||||
|
+ U_BOOT_FORMAT_SINGLE,
|
||||||
|
+ U_BOOT_FORMAT_REDUNDANT,
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+struct u_boot_env {
|
||||||
|
+ struct device *dev;
|
||||||
|
+ enum u_boot_env_format format;
|
||||||
|
+
|
||||||
|
+ struct mtd_info *mtd;
|
||||||
|
+
|
||||||
|
+ /* Cells */
|
||||||
|
+ struct nvmem_cell_info *cells;
|
||||||
|
+ int ncells;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+struct u_boot_env_image_single {
|
||||||
|
+ __le32 crc32;
|
||||||
|
+ uint8_t data[];
|
||||||
|
+} __packed;
|
||||||
|
+
|
||||||
|
+struct u_boot_env_image_redundant {
|
||||||
|
+ __le32 crc32;
|
||||||
|
+ u8 mark;
|
||||||
|
+ uint8_t data[];
|
||||||
|
+} __packed;
|
||||||
|
+
|
||||||
|
+static int u_boot_env_read(void *context, unsigned int offset, void *val,
|
||||||
|
+ size_t bytes)
|
||||||
|
+{
|
||||||
|
+ struct u_boot_env *priv = context;
|
||||||
|
+ struct device *dev = priv->dev;
|
||||||
|
+ size_t bytes_read;
|
||||||
|
+ int err;
|
||||||
|
+
|
||||||
|
+ err = mtd_read(priv->mtd, offset, bytes, &bytes_read, val);
|
||||||
|
+ if (err && !mtd_is_bitflip(err)) {
|
||||||
|
+ dev_err(dev, "Failed to read from mtd: %d\n", err);
|
||||||
|
+ return err;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (bytes_read != bytes) {
|
||||||
|
+ dev_err(dev, "Failed to read %zu bytes\n", bytes);
|
||||||
|
+ return -EIO;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int u_boot_env_add_cells(struct u_boot_env *priv, uint8_t *buf,
|
||||||
|
+ size_t data_offset, size_t data_len)
|
||||||
|
+{
|
||||||
|
+ struct device *dev = priv->dev;
|
||||||
|
+ char *data = buf + data_offset;
|
||||||
|
+ char *var, *value, *eq;
|
||||||
|
+ int idx;
|
||||||
|
+
|
||||||
|
+ priv->ncells = 0;
|
||||||
|
+ for (var = data; var < data + data_len && *var; var += strlen(var) + 1)
|
||||||
|
+ priv->ncells++;
|
||||||
|
+
|
||||||
|
+ priv->cells = devm_kcalloc(dev, priv->ncells, sizeof(*priv->cells), GFP_KERNEL);
|
||||||
|
+ if (!priv->cells)
|
||||||
|
+ return -ENOMEM;
|
||||||
|
+
|
||||||
|
+ for (var = data, idx = 0;
|
||||||
|
+ var < data + data_len && *var;
|
||||||
|
+ var = value + strlen(value) + 1, idx++) {
|
||||||
|
+ eq = strchr(var, '=');
|
||||||
|
+ if (!eq)
|
||||||
|
+ break;
|
||||||
|
+ *eq = '\0';
|
||||||
|
+ value = eq + 1;
|
||||||
|
+
|
||||||
|
+ priv->cells[idx].name = devm_kstrdup(dev, var, GFP_KERNEL);
|
||||||
|
+ if (!priv->cells[idx].name)
|
||||||
|
+ return -ENOMEM;
|
||||||
|
+ priv->cells[idx].offset = data_offset + value - data;
|
||||||
|
+ priv->cells[idx].bytes = strlen(value);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (WARN_ON(idx != priv->ncells))
|
||||||
|
+ priv->ncells = idx;
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int u_boot_env_parse(struct u_boot_env *priv)
|
||||||
|
+{
|
||||||
|
+ struct device *dev = priv->dev;
|
||||||
|
+ size_t crc32_data_offset;
|
||||||
|
+ size_t crc32_data_len;
|
||||||
|
+ size_t crc32_offset;
|
||||||
|
+ size_t data_offset;
|
||||||
|
+ size_t data_len;
|
||||||
|
+ uint32_t crc32;
|
||||||
|
+ uint32_t calc;
|
||||||
|
+ size_t bytes;
|
||||||
|
+ uint8_t *buf;
|
||||||
|
+ int err;
|
||||||
|
+
|
||||||
|
+ buf = kcalloc(1, priv->mtd->size, GFP_KERNEL);
|
||||||
|
+ if (!buf) {
|
||||||
|
+ err = -ENOMEM;
|
||||||
|
+ goto err_out;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ err = mtd_read(priv->mtd, 0, priv->mtd->size, &bytes, buf);
|
||||||
|
+ if ((err && !mtd_is_bitflip(err)) || bytes != priv->mtd->size) {
|
||||||
|
+ dev_err(dev, "Failed to read from mtd: %d\n", err);
|
||||||
|
+ goto err_kfree;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ switch (priv->format) {
|
||||||
|
+ case U_BOOT_FORMAT_SINGLE:
|
||||||
|
+ crc32_offset = offsetof(struct u_boot_env_image_single, crc32);
|
||||||
|
+ crc32_data_offset = offsetof(struct u_boot_env_image_single, data);
|
||||||
|
+ data_offset = offsetof(struct u_boot_env_image_single, data);
|
||||||
|
+ break;
|
||||||
|
+ case U_BOOT_FORMAT_REDUNDANT:
|
||||||
|
+ crc32_offset = offsetof(struct u_boot_env_image_redundant, crc32);
|
||||||
|
+ crc32_data_offset = offsetof(struct u_boot_env_image_redundant, mark);
|
||||||
|
+ data_offset = offsetof(struct u_boot_env_image_redundant, data);
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ crc32 = le32_to_cpu(*(uint32_t *)(buf + crc32_offset));
|
||||||
|
+ crc32_data_len = priv->mtd->size - crc32_data_offset;
|
||||||
|
+ data_len = priv->mtd->size - data_offset;
|
||||||
|
+
|
||||||
|
+ calc = crc32(~0, buf + crc32_data_offset, crc32_data_len) ^ ~0L;
|
||||||
|
+ if (calc != crc32) {
|
||||||
|
+ dev_err(dev, "Invalid calculated CRC32: 0x%08x (expected: 0x%08x)\n", calc, crc32);
|
||||||
|
+ err = -EINVAL;
|
||||||
|
+ goto err_kfree;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ buf[priv->mtd->size - 1] = '\0';
|
||||||
|
+ err = u_boot_env_add_cells(priv, buf, data_offset, data_len);
|
||||||
|
+ if (err)
|
||||||
|
+ dev_err(dev, "Failed to add cells: %d\n", err);
|
||||||
|
+
|
||||||
|
+err_kfree:
|
||||||
|
+ kfree(buf);
|
||||||
|
+err_out:
|
||||||
|
+ return err;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int u_boot_env_probe(struct platform_device *pdev)
|
||||||
|
+{
|
||||||
|
+ struct nvmem_config config = {
|
||||||
|
+ .name = "u-boot-env",
|
||||||
|
+ .reg_read = u_boot_env_read,
|
||||||
|
+ };
|
||||||
|
+ struct device *dev = &pdev->dev;
|
||||||
|
+ struct device_node *np = dev->of_node;
|
||||||
|
+ struct u_boot_env *priv;
|
||||||
|
+ int err;
|
||||||
|
+
|
||||||
|
+ priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
|
||||||
|
+ if (!priv)
|
||||||
|
+ return -ENOMEM;
|
||||||
|
+ priv->dev = dev;
|
||||||
|
+
|
||||||
|
+ priv->format = (uintptr_t)of_device_get_match_data(dev);
|
||||||
|
+
|
||||||
|
+ priv->mtd = of_get_mtd_device_by_node(np);
|
||||||
|
+ if (IS_ERR(priv->mtd)) {
|
||||||
|
+ dev_err_probe(dev, PTR_ERR(priv->mtd), "Failed to get %pOF MTD\n", np);
|
||||||
|
+ return PTR_ERR(priv->mtd);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ err = u_boot_env_parse(priv);
|
||||||
|
+ if (err)
|
||||||
|
+ return err;
|
||||||
|
+
|
||||||
|
+ config.dev = dev;
|
||||||
|
+ config.cells = priv->cells;
|
||||||
|
+ config.ncells = priv->ncells;
|
||||||
|
+ config.priv = priv;
|
||||||
|
+ config.size = priv->mtd->size;
|
||||||
|
+
|
||||||
|
+ return PTR_ERR_OR_ZERO(devm_nvmem_register(dev, &config));
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static const struct of_device_id u_boot_env_of_match_table[] = {
|
||||||
|
+ { .compatible = "u-boot,env", .data = (void *)U_BOOT_FORMAT_SINGLE, },
|
||||||
|
+ { .compatible = "u-boot,env-redundant-bool", .data = (void *)U_BOOT_FORMAT_REDUNDANT, },
|
||||||
|
+ { .compatible = "u-boot,env-redundant-count", .data = (void *)U_BOOT_FORMAT_REDUNDANT, },
|
||||||
|
+ {},
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+static struct platform_driver u_boot_env_driver = {
|
||||||
|
+ .probe = u_boot_env_probe,
|
||||||
|
+ .driver = {
|
||||||
|
+ .name = "u_boot_env",
|
||||||
|
+ .of_match_table = u_boot_env_of_match_table,
|
||||||
|
+ },
|
||||||
|
+};
|
||||||
|
+module_platform_driver(u_boot_env_driver);
|
||||||
|
+
|
||||||
|
+MODULE_AUTHOR("Rafał Miłecki");
|
||||||
|
+MODULE_LICENSE("GPL");
|
||||||
|
+MODULE_DEVICE_TABLE(of, u_boot_env_of_match_table);
|
||||||
@ -0,0 +1,41 @@
|
|||||||
|
From dbc2f62061c6bfba0aee93161ee3194dcee84bd0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||||
|
Date: Fri, 29 Apr 2022 17:26:46 +0100
|
||||||
|
Subject: [PATCH] nvmem: core: support passing DT node in cell info
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Some hardware may have NVMEM cells described in Device Tree using
|
||||||
|
individual nodes. Let drivers pass such nodes to the NVMEM subsystem so
|
||||||
|
they can be later used by NVMEM consumers.
|
||||||
|
|
||||||
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||||
|
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||||
|
Link: https://lore.kernel.org/r/20220429162701.2222-2-srinivas.kandagatla@linaro.org
|
||||||
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||||
|
---
|
||||||
|
drivers/nvmem/core.c | 1 +
|
||||||
|
include/linux/nvmem-consumer.h | 1 +
|
||||||
|
2 files changed, 2 insertions(+)
|
||||||
|
|
||||||
|
--- a/drivers/nvmem/core.c
|
||||||
|
+++ b/drivers/nvmem/core.c
|
||||||
|
@@ -462,6 +462,7 @@ static int nvmem_cell_info_to_nvmem_cell
|
||||||
|
|
||||||
|
cell->bit_offset = info->bit_offset;
|
||||||
|
cell->nbits = info->nbits;
|
||||||
|
+ cell->np = info->np;
|
||||||
|
|
||||||
|
if (cell->nbits)
|
||||||
|
cell->bytes = DIV_ROUND_UP(cell->nbits + cell->bit_offset,
|
||||||
|
--- a/include/linux/nvmem-consumer.h
|
||||||
|
+++ b/include/linux/nvmem-consumer.h
|
||||||
|
@@ -25,6 +25,7 @@ struct nvmem_cell_info {
|
||||||
|
unsigned int bytes;
|
||||||
|
unsigned int bit_offset;
|
||||||
|
unsigned int nbits;
|
||||||
|
+ struct device_node *np;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
@ -55,7 +55,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|||||||
net_dev->max_mtu = BGMAC_RX_MAX_FRAME_SIZE - ETH_FCS_LEN;
|
net_dev->max_mtu = BGMAC_RX_MAX_FRAME_SIZE - ETH_FCS_LEN;
|
||||||
|
|
||||||
+ if ((bgmac->feature_flags & BGMAC_FEAT_SRAB) && !bgmac_b53_pdata.regs) {
|
+ if ((bgmac->feature_flags & BGMAC_FEAT_SRAB) && !bgmac_b53_pdata.regs) {
|
||||||
+ bgmac_b53_pdata.regs = ioremap_nocache(0x18007000, 0x1000);
|
+ bgmac_b53_pdata.regs = ioremap(0x18007000, 0x1000);
|
||||||
+
|
+
|
||||||
+ err = platform_device_register(&bgmac_b53_dev);
|
+ err = platform_device_register(&bgmac_b53_dev);
|
||||||
+ if (!err)
|
+ if (!err)
|
||||||
|
|||||||
@ -16,10 +16,10 @@ Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
|
|||||||
|
|
||||||
--- a/drivers/mtd/parsers/Kconfig
|
--- a/drivers/mtd/parsers/Kconfig
|
||||||
+++ b/drivers/mtd/parsers/Kconfig
|
+++ b/drivers/mtd/parsers/Kconfig
|
||||||
@@ -195,3 +195,12 @@ config MTD_REDBOOT_PARTS_READONLY
|
@@ -204,3 +204,12 @@ config MTD_SERCOMM_PARTS
|
||||||
'FIS directory' images, enable this option.
|
partition map. This partition table contains real partition
|
||||||
|
offsets, which may differ from device to device depending on the
|
||||||
endif # MTD_REDBOOT_PARTS
|
number and location of bad blocks on NAND.
|
||||||
+
|
+
|
||||||
+config MTD_ROUTERBOOT_PARTS
|
+config MTD_ROUTERBOOT_PARTS
|
||||||
+ tristate "RouterBoot flash partition parser"
|
+ tristate "RouterBoot flash partition parser"
|
||||||
@ -31,8 +31,8 @@ Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
|
|||||||
+ formatted DTS.
|
+ formatted DTS.
|
||||||
--- a/drivers/mtd/parsers/Makefile
|
--- a/drivers/mtd/parsers/Makefile
|
||||||
+++ b/drivers/mtd/parsers/Makefile
|
+++ b/drivers/mtd/parsers/Makefile
|
||||||
@@ -13,3 +13,4 @@ obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
|
@@ -14,3 +14,4 @@ obj-$(CONFIG_MTD_PARSER_TRX) += parser_
|
||||||
obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o
|
obj-$(CONFIG_MTD_SERCOMM_PARTS) += scpart.o
|
||||||
obj-$(CONFIG_MTD_SHARPSL_PARTS) += sharpslpart.o
|
obj-$(CONFIG_MTD_SHARPSL_PARTS) += sharpslpart.o
|
||||||
obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
|
obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
|
||||||
+obj-$(CONFIG_MTD_ROUTERBOOT_PARTS) += routerbootpart.o
|
+obj-$(CONFIG_MTD_ROUTERBOOT_PARTS) += routerbootpart.o
|
||||||
|
|||||||
@ -1,75 +0,0 @@
|
|||||||
From 1bd1b740f208d1cf4071932cc51860d37266c402 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Bernhard Frauendienst <kernel@nospam.obeliks.de>
|
|
||||||
Date: Sat, 1 Sep 2018 00:30:11 +0200
|
|
||||||
Subject: [PATCH 495/497] mtd: core: add get_mtd_device_by_node
|
|
||||||
|
|
||||||
Add function to retrieve a mtd device by its OF node. Since drivers can
|
|
||||||
assign arbitrary names to mtd devices in the absence of a label
|
|
||||||
property, there is no other reliable way to retrieve a mtd device for a
|
|
||||||
given OF node.
|
|
||||||
|
|
||||||
Signed-off-by: Bernhard Frauendienst <kernel@nospam.obeliks.de>
|
|
||||||
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
||||||
---
|
|
||||||
drivers/mtd/mtdcore.c | 38 ++++++++++++++++++++++++++++++++++++++
|
|
||||||
include/linux/mtd/mtd.h | 2 ++
|
|
||||||
2 files changed, 40 insertions(+)
|
|
||||||
|
|
||||||
--- a/drivers/mtd/mtdcore.c
|
|
||||||
+++ b/drivers/mtd/mtdcore.c
|
|
||||||
@@ -1046,6 +1046,44 @@ out_unlock:
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL_GPL(get_mtd_device_nm);
|
|
||||||
|
|
||||||
+/**
|
|
||||||
+ * get_mtd_device_by_node - obtain a validated handle for an MTD device
|
|
||||||
+ * by of_node
|
|
||||||
+ * @of_node: OF node of MTD device to open
|
|
||||||
+ *
|
|
||||||
+ * This function returns MTD device description structure in case of
|
|
||||||
+ * success and an error code in case of failure.
|
|
||||||
+ */
|
|
||||||
+struct mtd_info *get_mtd_device_by_node(const struct device_node *of_node)
|
|
||||||
+{
|
|
||||||
+ int err = -ENODEV;
|
|
||||||
+ struct mtd_info *mtd = NULL, *other;
|
|
||||||
+
|
|
||||||
+ mutex_lock(&mtd_table_mutex);
|
|
||||||
+
|
|
||||||
+ mtd_for_each_device(other) {
|
|
||||||
+ if (of_node == other->dev.of_node) {
|
|
||||||
+ mtd = other;
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (!mtd)
|
|
||||||
+ goto out_unlock;
|
|
||||||
+
|
|
||||||
+ err = __get_mtd_device(mtd);
|
|
||||||
+ if (err)
|
|
||||||
+ goto out_unlock;
|
|
||||||
+
|
|
||||||
+ mutex_unlock(&mtd_table_mutex);
|
|
||||||
+ return mtd;
|
|
||||||
+
|
|
||||||
+out_unlock:
|
|
||||||
+ mutex_unlock(&mtd_table_mutex);
|
|
||||||
+ return ERR_PTR(err);
|
|
||||||
+}
|
|
||||||
+EXPORT_SYMBOL_GPL(get_mtd_device_by_node);
|
|
||||||
+
|
|
||||||
void put_mtd_device(struct mtd_info *mtd)
|
|
||||||
{
|
|
||||||
mutex_lock(&mtd_table_mutex);
|
|
||||||
--- a/include/linux/mtd/mtd.h
|
|
||||||
+++ b/include/linux/mtd/mtd.h
|
|
||||||
@@ -694,6 +694,8 @@ extern struct mtd_info *get_mtd_device(s
|
|
||||||
extern int __get_mtd_device(struct mtd_info *mtd);
|
|
||||||
extern void __put_mtd_device(struct mtd_info *mtd);
|
|
||||||
extern struct mtd_info *get_mtd_device_nm(const char *name);
|
|
||||||
+extern struct mtd_info *get_mtd_device_by_node(
|
|
||||||
+ const struct device_node *of_node);
|
|
||||||
extern void put_mtd_device(struct mtd_info *mtd);
|
|
||||||
|
|
||||||
static inline uint64_t mtdpart_get_offset(const struct mtd_info *mtd)
|
|
||||||
Loading…
Reference in New Issue
Block a user