mtd: parsers: Move TI AR7 parser

This moves the TI AR7 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>

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 80a6e2d..c86a1ca 100644 (file)
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -69,11 +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_AR7_PARTS
-       tristate "TI AR7 partitioning support"
-       help
-         TI AR7 partitioning support
-
 config MTD_BCM63XX_PARTS
        tristate "BCM63XX CFE partitioning support"
        depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST

diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index 62d649a..690d0b8 100644 (file)
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -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_AR7_PARTS)    += ar7part.o
 obj-$(CONFIG_MTD_BCM63XX_PARTS)        += bcm63xxpart.o
 obj-$(CONFIG_MTD_BCM47XX_PARTS)        += bcm47xxpart.o
 obj-y                          += parsers/

diff --git a/drivers/mtd/ar7part.c b/drivers/mtd/ar7part.c
deleted file mode 100644 (file)
index 8cd6837..0000000
--- a/drivers/mtd/ar7part.c
+++ /dev/null
@@ -1,129 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright © 2007 Eugene Konev <ejka@openwrt.org>
- *
- * TI AR7 flash partition table.
- * Based on ar7 map by Felix Fietkau <nbd@openwrt.org>
- */
-
-#include <linux/kernel.h>
-#include <linux/slab.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/memblock.h>
-#include <linux/module.h>
-
-#include <uapi/linux/magic.h>
-
-#define AR7_PARTS      4
-#define ROOT_OFFSET    0xe0000
-
-#define LOADER_MAGIC1  le32_to_cpu(0xfeedfa42)
-#define LOADER_MAGIC2  le32_to_cpu(0xfeed1281)
-
-struct ar7_bin_rec {
-       unsigned int checksum;
-       unsigned int length;
-       unsigned int address;
-};
-
-static int create_mtd_partitions(struct mtd_info *master,
-                                const struct mtd_partition **pparts,
-                                struct mtd_part_parser_data *data)
-{
-       struct ar7_bin_rec header;
-       unsigned int offset;
-       size_t len;
-       unsigned int pre_size = master->erasesize, post_size = 0;
-       unsigned int root_offset = ROOT_OFFSET;
-
-       int retries = 10;
-       struct mtd_partition *ar7_parts;
-
-       ar7_parts = kcalloc(AR7_PARTS, sizeof(*ar7_parts), GFP_KERNEL);
-       if (!ar7_parts)
-               return -ENOMEM;
-       ar7_parts[0].name = "loader";
-       ar7_parts[0].offset = 0;
-       ar7_parts[0].size = master->erasesize;
-       ar7_parts[0].mask_flags = MTD_WRITEABLE;
-
-       ar7_parts[1].name = "config";
-       ar7_parts[1].offset = 0;
-       ar7_parts[1].size = master->erasesize;
-       ar7_parts[1].mask_flags = 0;
-
-       do { /* Try 10 blocks starting from master->erasesize */
-               offset = pre_size;
-               mtd_read(master, offset, sizeof(header), &len,
-                        (uint8_t *)&header);
-               if (!strncmp((char *)&header, "TIENV0.8", 8))
-                       ar7_parts[1].offset = pre_size;
-               if (header.checksum == LOADER_MAGIC1)
-                       break;
-               if (header.checksum == LOADER_MAGIC2)
-                       break;
-               pre_size += master->erasesize;
-       } while (retries--);
-
-       pre_size = offset;
-
-       if (!ar7_parts[1].offset) {
-               ar7_parts[1].offset = master->size - master->erasesize;
-               post_size = master->erasesize;
-       }
-
-       switch (header.checksum) {
-       case LOADER_MAGIC1:
-               while (header.length) {
-                       offset += sizeof(header) + header.length;
-                       mtd_read(master, offset, sizeof(header), &len,
-                                (uint8_t *)&header);
-               }
-               root_offset = offset + sizeof(header) + 4;
-               break;
-       case LOADER_MAGIC2:
-               while (header.length) {
-                       offset += sizeof(header) + header.length;
-                       mtd_read(master, offset, sizeof(header), &len,
-                                (uint8_t *)&header);
-               }
-               root_offset = offset + sizeof(header) + 4 + 0xff;
-               root_offset &= ~(uint32_t)0xff;
-               break;
-       default:
-               printk(KERN_WARNING "Unknown magic: %08x\n", header.checksum);
-               break;
-       }
-
-       mtd_read(master, root_offset, sizeof(header), &len, (u8 *)&header);
-       if (header.checksum != SQUASHFS_MAGIC) {
-               root_offset += master->erasesize - 1;
-               root_offset &= ~(master->erasesize - 1);
-       }
-
-       ar7_parts[2].name = "linux";
-       ar7_parts[2].offset = pre_size;
-       ar7_parts[2].size = master->size - pre_size - post_size;
-       ar7_parts[2].mask_flags = 0;
-
-       ar7_parts[3].name = "rootfs";
-       ar7_parts[3].offset = root_offset;
-       ar7_parts[3].size = master->size - root_offset - post_size;
-       ar7_parts[3].mask_flags = 0;
-
-       *pparts = ar7_parts;
-       return AR7_PARTS;
-}
-
-static struct mtd_part_parser ar7_parser = {
-       .parse_fn = create_mtd_partitions,
-       .name = "ar7part",
-};
-module_mtd_part_parser(ar7_parser);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR( "Felix Fietkau <nbd@openwrt.org>, "
-               "Eugene Konev <ejka@openwrt.org>");
-MODULE_DESCRIPTION("MTD partitioning for TI AR7");

diff --git a/drivers/mtd/parsers/Kconfig b/drivers/mtd/parsers/Kconfig
index 176b75a..3b3675b 100644 (file)
--- a/drivers/mtd/parsers/Kconfig
+++ b/drivers/mtd/parsers/Kconfig
@@ -1,4 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-only
+config MTD_AR7_PARTS
+       tristate "TI AR7 partitioning parser"
+       help
+         TI AR7 partitioning parser support
+
 config MTD_PARSER_IMAGETAG
        tristate "Parser for BCM963XX Image Tag format partitions"
        depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST

diff --git a/drivers/mtd/parsers/Makefile b/drivers/mtd/parsers/Makefile
index dd566bd..0bc0638 100644 (file)
--- a/drivers/mtd/parsers/Makefile
+++ b/drivers/mtd/parsers/Makefile
@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
+obj-$(CONFIG_MTD_AR7_PARTS)            += ar7part.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/ar7part.c b/drivers/mtd/parsers/ar7part.c
new file mode 100644 (file)
index 0000000..8cd6837
--- /dev/null
+++ b/drivers/mtd/parsers/ar7part.c
@@ -0,0 +1,129 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright © 2007 Eugene Konev <ejka@openwrt.org>
+ *
+ * TI AR7 flash partition table.
+ * Based on ar7 map by Felix Fietkau <nbd@openwrt.org>
+ */
+
+#include <linux/kernel.h>
+#include <linux/slab.h>
+
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/memblock.h>
+#include <linux/module.h>
+
+#include <uapi/linux/magic.h>
+
+#define AR7_PARTS      4
+#define ROOT_OFFSET    0xe0000
+
+#define LOADER_MAGIC1  le32_to_cpu(0xfeedfa42)
+#define LOADER_MAGIC2  le32_to_cpu(0xfeed1281)
+
+struct ar7_bin_rec {
+       unsigned int checksum;
+       unsigned int length;
+       unsigned int address;
+};
+
+static int create_mtd_partitions(struct mtd_info *master,
+                                const struct mtd_partition **pparts,
+                                struct mtd_part_parser_data *data)
+{
+       struct ar7_bin_rec header;
+       unsigned int offset;
+       size_t len;
+       unsigned int pre_size = master->erasesize, post_size = 0;
+       unsigned int root_offset = ROOT_OFFSET;
+
+       int retries = 10;
+       struct mtd_partition *ar7_parts;
+
+       ar7_parts = kcalloc(AR7_PARTS, sizeof(*ar7_parts), GFP_KERNEL);
+       if (!ar7_parts)
+               return -ENOMEM;
+       ar7_parts[0].name = "loader";
+       ar7_parts[0].offset = 0;
+       ar7_parts[0].size = master->erasesize;
+       ar7_parts[0].mask_flags = MTD_WRITEABLE;
+
+       ar7_parts[1].name = "config";
+       ar7_parts[1].offset = 0;
+       ar7_parts[1].size = master->erasesize;
+       ar7_parts[1].mask_flags = 0;
+
+       do { /* Try 10 blocks starting from master->erasesize */
+               offset = pre_size;
+               mtd_read(master, offset, sizeof(header), &len,
+                        (uint8_t *)&header);
+               if (!strncmp((char *)&header, "TIENV0.8", 8))
+                       ar7_parts[1].offset = pre_size;
+               if (header.checksum == LOADER_MAGIC1)
+                       break;
+               if (header.checksum == LOADER_MAGIC2)
+                       break;
+               pre_size += master->erasesize;
+       } while (retries--);
+
+       pre_size = offset;
+
+       if (!ar7_parts[1].offset) {
+               ar7_parts[1].offset = master->size - master->erasesize;
+               post_size = master->erasesize;
+       }
+
+       switch (header.checksum) {
+       case LOADER_MAGIC1:
+               while (header.length) {
+                       offset += sizeof(header) + header.length;
+                       mtd_read(master, offset, sizeof(header), &len,
+                                (uint8_t *)&header);
+               }
+               root_offset = offset + sizeof(header) + 4;
+               break;
+       case LOADER_MAGIC2:
+               while (header.length) {
+                       offset += sizeof(header) + header.length;
+                       mtd_read(master, offset, sizeof(header), &len,
+                                (uint8_t *)&header);
+               }
+               root_offset = offset + sizeof(header) + 4 + 0xff;
+               root_offset &= ~(uint32_t)0xff;
+               break;
+       default:
+               printk(KERN_WARNING "Unknown magic: %08x\n", header.checksum);
+               break;
+       }
+
+       mtd_read(master, root_offset, sizeof(header), &len, (u8 *)&header);
+       if (header.checksum != SQUASHFS_MAGIC) {
+               root_offset += master->erasesize - 1;
+               root_offset &= ~(master->erasesize - 1);
+       }
+
+       ar7_parts[2].name = "linux";
+       ar7_parts[2].offset = pre_size;
+       ar7_parts[2].size = master->size - pre_size - post_size;
+       ar7_parts[2].mask_flags = 0;
+
+       ar7_parts[3].name = "rootfs";
+       ar7_parts[3].offset = root_offset;
+       ar7_parts[3].size = master->size - root_offset - post_size;
+       ar7_parts[3].mask_flags = 0;
+
+       *pparts = ar7_parts;
+       return AR7_PARTS;
+}
+
+static struct mtd_part_parser ar7_parser = {
+       .parse_fn = create_mtd_partitions,
+       .name = "ar7part",
+};
+module_mtd_part_parser(ar7_parser);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR( "Felix Fietkau <nbd@openwrt.org>, "
+               "Eugene Konev <ejka@openwrt.org>");
+MODULE_DESCRIPTION("MTD partitioning for TI AR7");