mtd: parsers: Move OF parser
authorLinus Walleij <linus.walleij@linaro.org>
Tue, 13 Aug 2019 07:25:30 +0000 (09:25 +0200)
committerRichard Weinberger <richard@nod.at>
Sun, 15 Sep 2019 21:50:49 +0000 (23:50 +0200)
This moves the OF/device tree partition parser down into the
parser subdirectory. No functional change.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Richard Weinberger <richard@nod.at>
drivers/mtd/Kconfig
drivers/mtd/Makefile
drivers/mtd/ofpart.c [deleted file]
drivers/mtd/parsers/Kconfig
drivers/mtd/parsers/Makefile
drivers/mtd/parsers/ofpart.c [new file with mode: 0644]

index 5a833305e4c42d0aa2412cd56b8d8b55d888ac48..4833e5b640f7654d9b157632eaf7506dd0d8583a 100644 (file)
@@ -60,15 +60,6 @@ config MTD_CMDLINE_PARTS
 
          If unsure, say 'N'.
 
-config MTD_OF_PARTS
-       tristate "OpenFirmware partitioning information support"
-       default y
-       depends on OF
-       help
-         This provides a partition parsing function which derives
-         the partition map from the children of the flash node,
-         as described in Documentation/devicetree/bindings/mtd/partition.txt.
-
 menu "Partition parsers"
 source "drivers/mtd/parsers/Kconfig"
 endmenu
index 7b4dae4cf52da335b9763ff7c061ae81a109189a..d5f1fd696f87387601d2880ccfd89bd57f87b53a 100644 (file)
@@ -7,7 +7,6 @@
 obj-$(CONFIG_MTD)              += mtd.o
 mtd-y                          := mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o mtdchar.o
 
-obj-$(CONFIG_MTD_OF_PARTS)     += ofpart.o
 obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
 obj-y                          += parsers/
 
diff --git a/drivers/mtd/ofpart.c b/drivers/mtd/ofpart.c
deleted file mode 100644 (file)
index 3caeabf..0000000
+++ /dev/null
@@ -1,236 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Flash partitions described by the OF (or flattened) device tree
- *
- * Copyright © 2006 MontaVista Software Inc.
- * Author: Vitaly Wool <vwool@ru.mvista.com>
- *
- * Revised to handle newer style flash binding by:
- *   Copyright © 2007 David Gibson, IBM Corporation.
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/of.h>
-#include <linux/mtd/mtd.h>
-#include <linux/slab.h>
-#include <linux/mtd/partitions.h>
-
-static bool node_has_compatible(struct device_node *pp)
-{
-       return of_get_property(pp, "compatible", NULL);
-}
-
-static int parse_fixed_partitions(struct mtd_info *master,
-                                 const struct mtd_partition **pparts,
-                                 struct mtd_part_parser_data *data)
-{
-       struct mtd_partition *parts;
-       struct device_node *mtd_node;
-       struct device_node *ofpart_node;
-       const char *partname;
-       struct device_node *pp;
-       int nr_parts, i, ret = 0;
-       bool dedicated = true;
-
-
-       /* Pull of_node from the master device node */
-       mtd_node = mtd_get_of_node(master);
-       if (!mtd_node)
-               return 0;
-
-       ofpart_node = of_get_child_by_name(mtd_node, "partitions");
-       if (!ofpart_node) {
-               /*
-                * We might get here even when ofpart isn't used at all (e.g.,
-                * when using another parser), so don't be louder than
-                * KERN_DEBUG
-                */
-               pr_debug("%s: 'partitions' subnode not found on %pOF. Trying to parse direct subnodes as partitions.\n",
-                        master->name, mtd_node);
-               ofpart_node = mtd_node;
-               dedicated = false;
-       } else if (!of_device_is_compatible(ofpart_node, "fixed-partitions")) {
-               /* The 'partitions' subnode might be used by another parser */
-               return 0;
-       }
-
-       /* First count the subnodes */
-       nr_parts = 0;
-       for_each_child_of_node(ofpart_node,  pp) {
-               if (!dedicated && node_has_compatible(pp))
-                       continue;
-
-               nr_parts++;
-       }
-
-       if (nr_parts == 0)
-               return 0;
-
-       parts = kcalloc(nr_parts, sizeof(*parts), GFP_KERNEL);
-       if (!parts)
-               return -ENOMEM;
-
-       i = 0;
-       for_each_child_of_node(ofpart_node,  pp) {
-               const __be32 *reg;
-               int len;
-               int a_cells, s_cells;
-
-               if (!dedicated && node_has_compatible(pp))
-                       continue;
-
-               reg = of_get_property(pp, "reg", &len);
-               if (!reg) {
-                       if (dedicated) {
-                               pr_debug("%s: ofpart partition %pOF (%pOF) missing reg property.\n",
-                                        master->name, pp,
-                                        mtd_node);
-                               goto ofpart_fail;
-                       } else {
-                               nr_parts--;
-                               continue;
-                       }
-               }
-
-               a_cells = of_n_addr_cells(pp);
-               s_cells = of_n_size_cells(pp);
-               if (len / 4 != a_cells + s_cells) {
-                       pr_debug("%s: ofpart partition %pOF (%pOF) error parsing reg property.\n",
-                                master->name, pp,
-                                mtd_node);
-                       goto ofpart_fail;
-               }
-
-               parts[i].offset = of_read_number(reg, a_cells);
-               parts[i].size = of_read_number(reg + a_cells, s_cells);
-               parts[i].of_node = pp;
-
-               partname = of_get_property(pp, "label", &len);
-               if (!partname)
-                       partname = of_get_property(pp, "name", &len);
-               parts[i].name = partname;
-
-               if (of_get_property(pp, "read-only", &len))
-                       parts[i].mask_flags |= MTD_WRITEABLE;
-
-               if (of_get_property(pp, "lock", &len))
-                       parts[i].mask_flags |= MTD_POWERUP_LOCK;
-
-               i++;
-       }
-
-       if (!nr_parts)
-               goto ofpart_none;
-
-       *pparts = parts;
-       return nr_parts;
-
-ofpart_fail:
-       pr_err("%s: error parsing ofpart partition %pOF (%pOF)\n",
-              master->name, pp, mtd_node);
-       ret = -EINVAL;
-ofpart_none:
-       of_node_put(pp);
-       kfree(parts);
-       return ret;
-}
-
-static const struct of_device_id parse_ofpart_match_table[] = {
-       { .compatible = "fixed-partitions" },
-       {},
-};
-MODULE_DEVICE_TABLE(of, parse_ofpart_match_table);
-
-static struct mtd_part_parser ofpart_parser = {
-       .parse_fn = parse_fixed_partitions,
-       .name = "fixed-partitions",
-       .of_match_table = parse_ofpart_match_table,
-};
-
-static int parse_ofoldpart_partitions(struct mtd_info *master,
-                                     const struct mtd_partition **pparts,
-                                     struct mtd_part_parser_data *data)
-{
-       struct mtd_partition *parts;
-       struct device_node *dp;
-       int i, plen, nr_parts;
-       const struct {
-               __be32 offset, len;
-       } *part;
-       const char *names;
-
-       /* Pull of_node from the master device node */
-       dp = mtd_get_of_node(master);
-       if (!dp)
-               return 0;
-
-       part = of_get_property(dp, "partitions", &plen);
-       if (!part)
-               return 0; /* No partitions found */
-
-       pr_warn("Device tree uses obsolete partition map binding: %pOF\n", dp);
-
-       nr_parts = plen / sizeof(part[0]);
-
-       parts = kcalloc(nr_parts, sizeof(*parts), GFP_KERNEL);
-       if (!parts)
-               return -ENOMEM;
-
-       names = of_get_property(dp, "partition-names", &plen);
-
-       for (i = 0; i < nr_parts; i++) {
-               parts[i].offset = be32_to_cpu(part->offset);
-               parts[i].size   = be32_to_cpu(part->len) & ~1;
-               /* bit 0 set signifies read only partition */
-               if (be32_to_cpu(part->len) & 1)
-                       parts[i].mask_flags = MTD_WRITEABLE;
-
-               if (names && (plen > 0)) {
-                       int len = strlen(names) + 1;
-
-                       parts[i].name = names;
-                       plen -= len;
-                       names += len;
-               } else {
-                       parts[i].name = "unnamed";
-               }
-
-               part++;
-       }
-
-       *pparts = parts;
-       return nr_parts;
-}
-
-static struct mtd_part_parser ofoldpart_parser = {
-       .parse_fn = parse_ofoldpart_partitions,
-       .name = "ofoldpart",
-};
-
-static int __init ofpart_parser_init(void)
-{
-       register_mtd_parser(&ofpart_parser);
-       register_mtd_parser(&ofoldpart_parser);
-       return 0;
-}
-
-static void __exit ofpart_parser_exit(void)
-{
-       deregister_mtd_parser(&ofpart_parser);
-       deregister_mtd_parser(&ofoldpart_parser);
-}
-
-module_init(ofpart_parser_init);
-module_exit(ofpart_parser_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Parser for MTD partitioning information in device tree");
-MODULE_AUTHOR("Vitaly Wool, David Gibson");
-/*
- * When MTD core cannot find the requested parser, it tries to load the module
- * with the same name. Since we provide the ofoldpart parser, we should have
- * the corresponding alias.
- */
-MODULE_ALIAS("fixed-partitions");
-MODULE_ALIAS("ofoldpart");
index e356b4311d4dc99c3d4c724c3e1c9461a43eb524..2001d96cb82a9fa0032bebe89042bc8dd887f4bf 100644 (file)
@@ -20,6 +20,16 @@ config MTD_BCM63XX_PARTS
          This provides partition parsing for BCM63xx devices with CFE
          bootloaders.
 
+config MTD_OF_PARTS
+       tristate "OpenFirmware (device tree) partitioning parser"
+       default y
+       depends on OF
+       help
+         This provides a open firmware device tree partition parser
+         which derives the partition map from the children of the
+         flash memory node, as described in
+         Documentation/devicetree/bindings/mtd/partition.txt.
+
 config MTD_PARSER_IMAGETAG
        tristate "Parser for BCM963XX Image Tag format partitions"
        depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST
index 582def5408804092d54d81553d202f87140797ea..69b2c5289f9654cca21676fafe6d55690b3055a5 100644 (file)
@@ -2,6 +2,7 @@
 obj-$(CONFIG_MTD_AR7_PARTS)            += ar7part.o
 obj-$(CONFIG_MTD_BCM47XX_PARTS)                += bcm47xxpart.o
 obj-$(CONFIG_MTD_BCM63XX_PARTS)                += bcm63xxpart.o
+obj-$(CONFIG_MTD_OF_PARTS)             += ofpart.o
 obj-$(CONFIG_MTD_PARSER_IMAGETAG)      += parser_imagetag.o
 obj-$(CONFIG_MTD_AFS_PARTS)            += afs.o
 obj-$(CONFIG_MTD_PARSER_TRX)           += parser_trx.o
diff --git a/drivers/mtd/parsers/ofpart.c b/drivers/mtd/parsers/ofpart.c
new file mode 100644 (file)
index 0000000..3caeabf
--- /dev/null
@@ -0,0 +1,236 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Flash partitions described by the OF (or flattened) device tree
+ *
+ * Copyright © 2006 MontaVista Software Inc.
+ * Author: Vitaly Wool <vwool@ru.mvista.com>
+ *
+ * Revised to handle newer style flash binding by:
+ *   Copyright © 2007 David Gibson, IBM Corporation.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/of.h>
+#include <linux/mtd/mtd.h>
+#include <linux/slab.h>
+#include <linux/mtd/partitions.h>
+
+static bool node_has_compatible(struct device_node *pp)
+{
+       return of_get_property(pp, "compatible", NULL);
+}
+
+static int parse_fixed_partitions(struct mtd_info *master,
+                                 const struct mtd_partition **pparts,
+                                 struct mtd_part_parser_data *data)
+{
+       struct mtd_partition *parts;
+       struct device_node *mtd_node;
+       struct device_node *ofpart_node;
+       const char *partname;
+       struct device_node *pp;
+       int nr_parts, i, ret = 0;
+       bool dedicated = true;
+
+
+       /* Pull of_node from the master device node */
+       mtd_node = mtd_get_of_node(master);
+       if (!mtd_node)
+               return 0;
+
+       ofpart_node = of_get_child_by_name(mtd_node, "partitions");
+       if (!ofpart_node) {
+               /*
+                * We might get here even when ofpart isn't used at all (e.g.,
+                * when using another parser), so don't be louder than
+                * KERN_DEBUG
+                */
+               pr_debug("%s: 'partitions' subnode not found on %pOF. Trying to parse direct subnodes as partitions.\n",
+                        master->name, mtd_node);
+               ofpart_node = mtd_node;
+               dedicated = false;
+       } else if (!of_device_is_compatible(ofpart_node, "fixed-partitions")) {
+               /* The 'partitions' subnode might be used by another parser */
+               return 0;
+       }
+
+       /* First count the subnodes */
+       nr_parts = 0;
+       for_each_child_of_node(ofpart_node,  pp) {
+               if (!dedicated && node_has_compatible(pp))
+                       continue;
+
+               nr_parts++;
+       }
+
+       if (nr_parts == 0)
+               return 0;
+
+       parts = kcalloc(nr_parts, sizeof(*parts), GFP_KERNEL);
+       if (!parts)
+               return -ENOMEM;
+
+       i = 0;
+       for_each_child_of_node(ofpart_node,  pp) {
+               const __be32 *reg;
+               int len;
+               int a_cells, s_cells;
+
+               if (!dedicated && node_has_compatible(pp))
+                       continue;
+
+               reg = of_get_property(pp, "reg", &len);
+               if (!reg) {
+                       if (dedicated) {
+                               pr_debug("%s: ofpart partition %pOF (%pOF) missing reg property.\n",
+                                        master->name, pp,
+                                        mtd_node);
+                               goto ofpart_fail;
+                       } else {
+                               nr_parts--;
+                               continue;
+                       }
+               }
+
+               a_cells = of_n_addr_cells(pp);
+               s_cells = of_n_size_cells(pp);
+               if (len / 4 != a_cells + s_cells) {
+                       pr_debug("%s: ofpart partition %pOF (%pOF) error parsing reg property.\n",
+                                master->name, pp,
+                                mtd_node);
+                       goto ofpart_fail;
+               }
+
+               parts[i].offset = of_read_number(reg, a_cells);
+               parts[i].size = of_read_number(reg + a_cells, s_cells);
+               parts[i].of_node = pp;
+
+               partname = of_get_property(pp, "label", &len);
+               if (!partname)
+                       partname = of_get_property(pp, "name", &len);
+               parts[i].name = partname;
+
+               if (of_get_property(pp, "read-only", &len))
+                       parts[i].mask_flags |= MTD_WRITEABLE;
+
+               if (of_get_property(pp, "lock", &len))
+                       parts[i].mask_flags |= MTD_POWERUP_LOCK;
+
+               i++;
+       }
+
+       if (!nr_parts)
+               goto ofpart_none;
+
+       *pparts = parts;
+       return nr_parts;
+
+ofpart_fail:
+       pr_err("%s: error parsing ofpart partition %pOF (%pOF)\n",
+              master->name, pp, mtd_node);
+       ret = -EINVAL;
+ofpart_none:
+       of_node_put(pp);
+       kfree(parts);
+       return ret;
+}
+
+static const struct of_device_id parse_ofpart_match_table[] = {
+       { .compatible = "fixed-partitions" },
+       {},
+};
+MODULE_DEVICE_TABLE(of, parse_ofpart_match_table);
+
+static struct mtd_part_parser ofpart_parser = {
+       .parse_fn = parse_fixed_partitions,
+       .name = "fixed-partitions",
+       .of_match_table = parse_ofpart_match_table,
+};
+
+static int parse_ofoldpart_partitions(struct mtd_info *master,
+                                     const struct mtd_partition **pparts,
+                                     struct mtd_part_parser_data *data)
+{
+       struct mtd_partition *parts;
+       struct device_node *dp;
+       int i, plen, nr_parts;
+       const struct {
+               __be32 offset, len;
+       } *part;
+       const char *names;
+
+       /* Pull of_node from the master device node */
+       dp = mtd_get_of_node(master);
+       if (!dp)
+               return 0;
+
+       part = of_get_property(dp, "partitions", &plen);
+       if (!part)
+               return 0; /* No partitions found */
+
+       pr_warn("Device tree uses obsolete partition map binding: %pOF\n", dp);
+
+       nr_parts = plen / sizeof(part[0]);
+
+       parts = kcalloc(nr_parts, sizeof(*parts), GFP_KERNEL);
+       if (!parts)
+               return -ENOMEM;
+
+       names = of_get_property(dp, "partition-names", &plen);
+
+       for (i = 0; i < nr_parts; i++) {
+               parts[i].offset = be32_to_cpu(part->offset);
+               parts[i].size   = be32_to_cpu(part->len) & ~1;
+               /* bit 0 set signifies read only partition */
+               if (be32_to_cpu(part->len) & 1)
+                       parts[i].mask_flags = MTD_WRITEABLE;
+
+               if (names && (plen > 0)) {
+                       int len = strlen(names) + 1;
+
+                       parts[i].name = names;
+                       plen -= len;
+                       names += len;
+               } else {
+                       parts[i].name = "unnamed";
+               }
+
+               part++;
+       }
+
+       *pparts = parts;
+       return nr_parts;
+}
+
+static struct mtd_part_parser ofoldpart_parser = {
+       .parse_fn = parse_ofoldpart_partitions,
+       .name = "ofoldpart",
+};
+
+static int __init ofpart_parser_init(void)
+{
+       register_mtd_parser(&ofpart_parser);
+       register_mtd_parser(&ofoldpart_parser);
+       return 0;
+}
+
+static void __exit ofpart_parser_exit(void)
+{
+       deregister_mtd_parser(&ofpart_parser);
+       deregister_mtd_parser(&ofoldpart_parser);
+}
+
+module_init(ofpart_parser_init);
+module_exit(ofpart_parser_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Parser for MTD partitioning information in device tree");
+MODULE_AUTHOR("Vitaly Wool, David Gibson");
+/*
+ * When MTD core cannot find the requested parser, it tries to load the module
+ * with the same name. Since we provide the ofoldpart parser, we should have
+ * the corresponding alias.
+ */
+MODULE_ALIAS("fixed-partitions");
+MODULE_ALIAS("ofoldpart");