mtd: parsers: Move BCM63xx parser
authorLinus Walleij <linus.walleij@linaro.org>
Tue, 13 Aug 2019 07:25:29 +0000 (09:25 +0200)
committerRichard Weinberger <richard@nod.at>
Sun, 15 Sep 2019 21:50:49 +0000 (23:50 +0200)
This moves the BCM63xx 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/bcm63xxpart.c [deleted file]
drivers/mtd/parsers/Kconfig
drivers/mtd/parsers/Makefile
drivers/mtd/parsers/bcm63xxpart.c [new file with mode: 0644]

index c1feaf2da80839112c064ca50072ae0ec2ff9982..5a833305e4c42d0aa2412cd56b8d8b55d888ac48 100644 (file)
@@ -69,15 +69,6 @@ config MTD_OF_PARTS
          the partition map from the children of the flash node,
          as described in Documentation/devicetree/bindings/mtd/partition.txt.
 
-config MTD_BCM63XX_PARTS
-       tristate "BCM63XX CFE partitioning support"
-       depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST
-       select CRC32
-       select MTD_PARSER_IMAGETAG
-       help
-         This provides partition parsing for BCM63xx devices with CFE
-         bootloaders.
-
 menu "Partition parsers"
 source "drivers/mtd/parsers/Kconfig"
 endmenu
index bbc81595e693f287be581d5ae6438d134574d162..7b4dae4cf52da335b9763ff7c061ae81a109189a 100644 (file)
@@ -9,7 +9,6 @@ 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-$(CONFIG_MTD_BCM63XX_PARTS)        += bcm63xxpart.o
 obj-y                          += parsers/
 
 # 'Users' - code which presents functionality to userspace.
diff --git a/drivers/mtd/bcm63xxpart.c b/drivers/mtd/bcm63xxpart.c
deleted file mode 100644 (file)
index 78f90c6..0000000
+++ /dev/null
@@ -1,180 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * BCM63XX CFE image tag parser
- *
- * Copyright © 2006-2008  Florian Fainelli <florian@openwrt.org>
- *                       Mike Albon <malbon@openwrt.org>
- * Copyright © 2009-2010  Daniel Dickinson <openwrt@cshore.neomailbox.net>
- * Copyright © 2011-2013  Jonas Gorski <jonas.gorski@gmail.com>
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/bcm963xx_nvram.h>
-#include <linux/bcm963xx_tag.h>
-#include <linux/crc32.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/sizes.h>
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/of.h>
-
-#define BCM963XX_CFE_BLOCK_SIZE                SZ_64K  /* always at least 64KiB */
-
-#define BCM963XX_CFE_MAGIC_OFFSET      0x4e0
-#define BCM963XX_CFE_VERSION_OFFSET    0x570
-#define BCM963XX_NVRAM_OFFSET          0x580
-
-/* Ensure strings read from flash structs are null terminated */
-#define STR_NULL_TERMINATE(x) \
-       do { char *_str = (x); _str[sizeof(x) - 1] = 0; } while (0)
-
-static int bcm63xx_detect_cfe(struct mtd_info *master)
-{
-       char buf[9];
-       int ret;
-       size_t retlen;
-
-       ret = mtd_read(master, BCM963XX_CFE_VERSION_OFFSET, 5, &retlen,
-                      (void *)buf);
-       buf[retlen] = 0;
-
-       if (ret)
-               return ret;
-
-       if (strncmp("cfe-v", buf, 5) == 0)
-               return 0;
-
-       /* very old CFE's do not have the cfe-v string, so check for magic */
-       ret = mtd_read(master, BCM963XX_CFE_MAGIC_OFFSET, 8, &retlen,
-                      (void *)buf);
-       buf[retlen] = 0;
-
-       return strncmp("CFE1CFE1", buf, 8);
-}
-
-static int bcm63xx_read_nvram(struct mtd_info *master,
-       struct bcm963xx_nvram *nvram)
-{
-       u32 actual_crc, expected_crc;
-       size_t retlen;
-       int ret;
-
-       /* extract nvram data */
-       ret = mtd_read(master, BCM963XX_NVRAM_OFFSET, BCM963XX_NVRAM_V5_SIZE,
-                       &retlen, (void *)nvram);
-       if (ret)
-               return ret;
-
-       ret = bcm963xx_nvram_checksum(nvram, &expected_crc, &actual_crc);
-       if (ret)
-               pr_warn("nvram checksum failed, contents may be invalid (expected %08x, got %08x)\n",
-                       expected_crc, actual_crc);
-
-       if (!nvram->psi_size)
-               nvram->psi_size = BCM963XX_DEFAULT_PSI_SIZE;
-
-       return 0;
-}
-
-static const char * const bcm63xx_cfe_part_types[] = {
-       "bcm963xx-imagetag",
-       NULL,
-};
-
-static int bcm63xx_parse_cfe_nor_partitions(struct mtd_info *master,
-       const struct mtd_partition **pparts, struct bcm963xx_nvram *nvram)
-{
-       struct mtd_partition *parts;
-       int nrparts = 3, curpart = 0;
-       unsigned int cfelen, nvramlen;
-       unsigned int cfe_erasesize;
-       int i;
-
-       cfe_erasesize = max_t(uint32_t, master->erasesize,
-                             BCM963XX_CFE_BLOCK_SIZE);
-
-       cfelen = cfe_erasesize;
-       nvramlen = nvram->psi_size * SZ_1K;
-       nvramlen = roundup(nvramlen, cfe_erasesize);
-
-       parts = kzalloc(sizeof(*parts) * nrparts + 10 * nrparts, GFP_KERNEL);
-       if (!parts)
-               return -ENOMEM;
-
-       /* Start building partition list */
-       parts[curpart].name = "CFE";
-       parts[curpart].offset = 0;
-       parts[curpart].size = cfelen;
-       curpart++;
-
-       parts[curpart].name = "nvram";
-       parts[curpart].offset = master->size - nvramlen;
-       parts[curpart].size = nvramlen;
-       curpart++;
-
-       /* Global partition "linux" to make easy firmware upgrade */
-       parts[curpart].name = "linux";
-       parts[curpart].offset = cfelen;
-       parts[curpart].size = master->size - cfelen - nvramlen;
-       parts[curpart].types = bcm63xx_cfe_part_types;
-
-       for (i = 0; i < nrparts; i++)
-               pr_info("Partition %d is %s offset %llx and length %llx\n", i,
-                       parts[i].name, parts[i].offset, parts[i].size);
-
-       *pparts = parts;
-
-       return nrparts;
-}
-
-static int bcm63xx_parse_cfe_partitions(struct mtd_info *master,
-                                       const struct mtd_partition **pparts,
-                                       struct mtd_part_parser_data *data)
-{
-       struct bcm963xx_nvram *nvram = NULL;
-       int ret;
-
-       if (bcm63xx_detect_cfe(master))
-               return -EINVAL;
-
-       nvram = vzalloc(sizeof(*nvram));
-       if (!nvram)
-               return -ENOMEM;
-
-       ret = bcm63xx_read_nvram(master, nvram);
-       if (ret)
-               goto out;
-
-       if (!mtd_type_is_nand(master))
-               ret = bcm63xx_parse_cfe_nor_partitions(master, pparts, nvram);
-       else
-               ret = -EINVAL;
-
-out:
-       vfree(nvram);
-       return ret;
-};
-
-static const struct of_device_id parse_bcm63xx_cfe_match_table[] = {
-       { .compatible = "brcm,bcm963xx-cfe-nor-partitions" },
-       {},
-};
-MODULE_DEVICE_TABLE(of, parse_bcm63xx_cfe_match_table);
-
-static struct mtd_part_parser bcm63xx_cfe_parser = {
-       .parse_fn = bcm63xx_parse_cfe_partitions,
-       .name = "bcm63xxpart",
-       .of_match_table = parse_bcm63xx_cfe_match_table,
-};
-module_mtd_part_parser(bcm63xx_cfe_parser);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Daniel Dickinson <openwrt@cshore.neomailbox.net>");
-MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
-MODULE_AUTHOR("Mike Albon <malbon@openwrt.org>");
-MODULE_AUTHOR("Jonas Gorski <jonas.gorski@gmail.com");
-MODULE_DESCRIPTION("MTD partitioning for BCM63XX CFE bootloaders");
index e5288b9bb8c58136664ba83e783e90c41da12e79..e356b4311d4dc99c3d4c724c3e1c9461a43eb524 100644 (file)
@@ -11,6 +11,15 @@ config MTD_BCM47XX_PARTS
          This provides partitions parser for devices based on BCM47xx
          boards.
 
+config MTD_BCM63XX_PARTS
+       tristate "BCM63XX CFE partitioning parser"
+       depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST
+       select CRC32
+       select MTD_PARSER_IMAGETAG
+       help
+         This provides partition parsing for BCM63xx devices with CFE
+         bootloaders.
+
 config MTD_PARSER_IMAGETAG
        tristate "Parser for BCM963XX Image Tag format partitions"
        depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST
index 3e020c66af64f815222a4360572524fd5d7fd4f4..582def5408804092d54d81553d202f87140797ea 100644 (file)
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_MTD_AR7_PARTS)            += ar7part.o
 obj-$(CONFIG_MTD_BCM47XX_PARTS)                += bcm47xxpart.o
+obj-$(CONFIG_MTD_BCM63XX_PARTS)                += bcm63xxpart.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/bcm63xxpart.c b/drivers/mtd/parsers/bcm63xxpart.c
new file mode 100644 (file)
index 0000000..78f90c6
--- /dev/null
@@ -0,0 +1,180 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * BCM63XX CFE image tag parser
+ *
+ * Copyright © 2006-2008  Florian Fainelli <florian@openwrt.org>
+ *                       Mike Albon <malbon@openwrt.org>
+ * Copyright © 2009-2010  Daniel Dickinson <openwrt@cshore.neomailbox.net>
+ * Copyright © 2011-2013  Jonas Gorski <jonas.gorski@gmail.com>
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/bcm963xx_nvram.h>
+#include <linux/bcm963xx_tag.h>
+#include <linux/crc32.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sizes.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/of.h>
+
+#define BCM963XX_CFE_BLOCK_SIZE                SZ_64K  /* always at least 64KiB */
+
+#define BCM963XX_CFE_MAGIC_OFFSET      0x4e0
+#define BCM963XX_CFE_VERSION_OFFSET    0x570
+#define BCM963XX_NVRAM_OFFSET          0x580
+
+/* Ensure strings read from flash structs are null terminated */
+#define STR_NULL_TERMINATE(x) \
+       do { char *_str = (x); _str[sizeof(x) - 1] = 0; } while (0)
+
+static int bcm63xx_detect_cfe(struct mtd_info *master)
+{
+       char buf[9];
+       int ret;
+       size_t retlen;
+
+       ret = mtd_read(master, BCM963XX_CFE_VERSION_OFFSET, 5, &retlen,
+                      (void *)buf);
+       buf[retlen] = 0;
+
+       if (ret)
+               return ret;
+
+       if (strncmp("cfe-v", buf, 5) == 0)
+               return 0;
+
+       /* very old CFE's do not have the cfe-v string, so check for magic */
+       ret = mtd_read(master, BCM963XX_CFE_MAGIC_OFFSET, 8, &retlen,
+                      (void *)buf);
+       buf[retlen] = 0;
+
+       return strncmp("CFE1CFE1", buf, 8);
+}
+
+static int bcm63xx_read_nvram(struct mtd_info *master,
+       struct bcm963xx_nvram *nvram)
+{
+       u32 actual_crc, expected_crc;
+       size_t retlen;
+       int ret;
+
+       /* extract nvram data */
+       ret = mtd_read(master, BCM963XX_NVRAM_OFFSET, BCM963XX_NVRAM_V5_SIZE,
+                       &retlen, (void *)nvram);
+       if (ret)
+               return ret;
+
+       ret = bcm963xx_nvram_checksum(nvram, &expected_crc, &actual_crc);
+       if (ret)
+               pr_warn("nvram checksum failed, contents may be invalid (expected %08x, got %08x)\n",
+                       expected_crc, actual_crc);
+
+       if (!nvram->psi_size)
+               nvram->psi_size = BCM963XX_DEFAULT_PSI_SIZE;
+
+       return 0;
+}
+
+static const char * const bcm63xx_cfe_part_types[] = {
+       "bcm963xx-imagetag",
+       NULL,
+};
+
+static int bcm63xx_parse_cfe_nor_partitions(struct mtd_info *master,
+       const struct mtd_partition **pparts, struct bcm963xx_nvram *nvram)
+{
+       struct mtd_partition *parts;
+       int nrparts = 3, curpart = 0;
+       unsigned int cfelen, nvramlen;
+       unsigned int cfe_erasesize;
+       int i;
+
+       cfe_erasesize = max_t(uint32_t, master->erasesize,
+                             BCM963XX_CFE_BLOCK_SIZE);
+
+       cfelen = cfe_erasesize;
+       nvramlen = nvram->psi_size * SZ_1K;
+       nvramlen = roundup(nvramlen, cfe_erasesize);
+
+       parts = kzalloc(sizeof(*parts) * nrparts + 10 * nrparts, GFP_KERNEL);
+       if (!parts)
+               return -ENOMEM;
+
+       /* Start building partition list */
+       parts[curpart].name = "CFE";
+       parts[curpart].offset = 0;
+       parts[curpart].size = cfelen;
+       curpart++;
+
+       parts[curpart].name = "nvram";
+       parts[curpart].offset = master->size - nvramlen;
+       parts[curpart].size = nvramlen;
+       curpart++;
+
+       /* Global partition "linux" to make easy firmware upgrade */
+       parts[curpart].name = "linux";
+       parts[curpart].offset = cfelen;
+       parts[curpart].size = master->size - cfelen - nvramlen;
+       parts[curpart].types = bcm63xx_cfe_part_types;
+
+       for (i = 0; i < nrparts; i++)
+               pr_info("Partition %d is %s offset %llx and length %llx\n", i,
+                       parts[i].name, parts[i].offset, parts[i].size);
+
+       *pparts = parts;
+
+       return nrparts;
+}
+
+static int bcm63xx_parse_cfe_partitions(struct mtd_info *master,
+                                       const struct mtd_partition **pparts,
+                                       struct mtd_part_parser_data *data)
+{
+       struct bcm963xx_nvram *nvram = NULL;
+       int ret;
+
+       if (bcm63xx_detect_cfe(master))
+               return -EINVAL;
+
+       nvram = vzalloc(sizeof(*nvram));
+       if (!nvram)
+               return -ENOMEM;
+
+       ret = bcm63xx_read_nvram(master, nvram);
+       if (ret)
+               goto out;
+
+       if (!mtd_type_is_nand(master))
+               ret = bcm63xx_parse_cfe_nor_partitions(master, pparts, nvram);
+       else
+               ret = -EINVAL;
+
+out:
+       vfree(nvram);
+       return ret;
+};
+
+static const struct of_device_id parse_bcm63xx_cfe_match_table[] = {
+       { .compatible = "brcm,bcm963xx-cfe-nor-partitions" },
+       {},
+};
+MODULE_DEVICE_TABLE(of, parse_bcm63xx_cfe_match_table);
+
+static struct mtd_part_parser bcm63xx_cfe_parser = {
+       .parse_fn = bcm63xx_parse_cfe_partitions,
+       .name = "bcm63xxpart",
+       .of_match_table = parse_bcm63xx_cfe_match_table,
+};
+module_mtd_part_parser(bcm63xx_cfe_parser);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Daniel Dickinson <openwrt@cshore.neomailbox.net>");
+MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
+MODULE_AUTHOR("Mike Albon <malbon@openwrt.org>");
+MODULE_AUTHOR("Jonas Gorski <jonas.gorski@gmail.com");
+MODULE_DESCRIPTION("MTD partitioning for BCM63XX CFE bootloaders");