mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
4ed347aaad
Refresh pending patches with make target/linux/refresh. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
230 lines
6.1 KiB
Diff
230 lines
6.1 KiB
Diff
From: Florian Fainelli <f.fainelli@gmail.com>
|
|
Subject: Add myloader partition table parser
|
|
|
|
[john@phozen.org: shoud be upstreamable]
|
|
|
|
lede-commit: d8bf22859b51faa09d22c056fe221a45d2f7a3b8
|
|
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
[adjust for kernel 5.4, add myloader.c to patch]
|
|
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
|
|
|
|
--- a/drivers/mtd/parsers/Kconfig
|
|
+++ b/drivers/mtd/parsers/Kconfig
|
|
@@ -67,6 +67,22 @@ config MTD_CMDLINE_PARTS
|
|
|
|
If unsure, say 'N'.
|
|
|
|
+config MTD_MYLOADER_PARTS
|
|
+ tristate "MyLoader partition parsing"
|
|
+ depends on ADM5120 || ATH25 || ATH79
|
|
+ help
|
|
+ MyLoader is a bootloader which allows the user to define partitions
|
|
+ in flash devices, by putting a table in the second erase block
|
|
+ on the device, similar to a partition table. This table gives the
|
|
+ offsets and lengths of the user defined partitions.
|
|
+
|
|
+ If you need code which can detect and parse these tables, and
|
|
+ register MTD 'partitions' corresponding to each image detected,
|
|
+ enable this option.
|
|
+
|
|
+ You will still need the parsing functions to be called by the driver
|
|
+ for your particular device. It won't happen automatically.
|
|
+
|
|
config MTD_OF_PARTS
|
|
tristate "OpenFirmware (device tree) partitioning parser"
|
|
default y
|
|
--- a/drivers/mtd/parsers/Makefile
|
|
+++ b/drivers/mtd/parsers/Makefile
|
|
@@ -4,6 +4,7 @@ obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm4
|
|
obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o
|
|
obj-$(CONFIG_MTD_BRCM_U_BOOT) += brcm_u-boot.o
|
|
obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
|
|
+obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
|
|
obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o
|
|
ofpart-y += ofpart_core.o
|
|
ofpart-$(CONFIG_MTD_OF_PARTS_BCM4908) += ofpart_bcm4908.o
|
|
--- /dev/null
|
|
+++ b/drivers/mtd/parsers/myloader.c
|
|
@@ -0,0 +1,181 @@
|
|
+/*
|
|
+ * Parse MyLoader-style flash partition tables and produce a Linux partition
|
|
+ * array to match.
|
|
+ *
|
|
+ * Copyright (C) 2007-2009 Gabor Juhos <juhosg@openwrt.org>
|
|
+ *
|
|
+ * This file was based on drivers/mtd/redboot.c
|
|
+ * Author: Red Hat, Inc. - David Woodhouse <dwmw2@cambridge.redhat.com>
|
|
+ *
|
|
+ * This program is free software; you can redistribute it and/or modify it
|
|
+ * under the terms of the GNU General Public License version 2 as published
|
|
+ * by the Free Software Foundation.
|
|
+ */
|
|
+
|
|
+#include <linux/kernel.h>
|
|
+#include <linux/module.h>
|
|
+#include <linux/version.h>
|
|
+#include <linux/slab.h>
|
|
+#include <linux/init.h>
|
|
+#include <linux/vmalloc.h>
|
|
+#include <linux/mtd/mtd.h>
|
|
+#include <linux/mtd/partitions.h>
|
|
+#include <linux/byteorder/generic.h>
|
|
+#include <linux/myloader.h>
|
|
+
|
|
+#define BLOCK_LEN_MIN 0x10000
|
|
+#define PART_NAME_LEN 32
|
|
+
|
|
+struct part_data {
|
|
+ struct mylo_partition_table tab;
|
|
+ char names[MYLO_MAX_PARTITIONS][PART_NAME_LEN];
|
|
+};
|
|
+
|
|
+static int myloader_parse_partitions(struct mtd_info *master,
|
|
+ const struct mtd_partition **pparts,
|
|
+ struct mtd_part_parser_data *data)
|
|
+{
|
|
+ struct part_data *buf;
|
|
+ struct mylo_partition_table *tab;
|
|
+ struct mylo_partition *part;
|
|
+ struct mtd_partition *mtd_parts;
|
|
+ struct mtd_partition *mtd_part;
|
|
+ int num_parts;
|
|
+ int ret, i;
|
|
+ size_t retlen;
|
|
+ char *names;
|
|
+ unsigned long offset;
|
|
+ unsigned long blocklen;
|
|
+
|
|
+ buf = vmalloc(sizeof(*buf));
|
|
+ if (!buf) {
|
|
+ return -ENOMEM;
|
|
+ goto out;
|
|
+ }
|
|
+ tab = &buf->tab;
|
|
+
|
|
+ blocklen = master->erasesize;
|
|
+ if (blocklen < BLOCK_LEN_MIN)
|
|
+ blocklen = BLOCK_LEN_MIN;
|
|
+
|
|
+ offset = blocklen;
|
|
+
|
|
+ /* Find the partition table */
|
|
+ for (i = 0; i < 4; i++, offset += blocklen) {
|
|
+ printk(KERN_DEBUG "%s: searching for MyLoader partition table"
|
|
+ " at offset 0x%lx\n", master->name, offset);
|
|
+
|
|
+ ret = mtd_read(master, offset, sizeof(*buf), &retlen,
|
|
+ (void *)buf);
|
|
+ if (ret)
|
|
+ goto out_free_buf;
|
|
+
|
|
+ if (retlen != sizeof(*buf)) {
|
|
+ ret = -EIO;
|
|
+ goto out_free_buf;
|
|
+ }
|
|
+
|
|
+ /* Check for Partition Table magic number */
|
|
+ if (tab->magic == le32_to_cpu(MYLO_MAGIC_PARTITIONS))
|
|
+ break;
|
|
+
|
|
+ }
|
|
+
|
|
+ if (tab->magic != le32_to_cpu(MYLO_MAGIC_PARTITIONS)) {
|
|
+ printk(KERN_DEBUG "%s: no MyLoader partition table found\n",
|
|
+ master->name);
|
|
+ ret = 0;
|
|
+ goto out_free_buf;
|
|
+ }
|
|
+
|
|
+ /* The MyLoader and the Partition Table is always present */
|
|
+ num_parts = 2;
|
|
+
|
|
+ /* Detect number of used partitions */
|
|
+ for (i = 0; i < MYLO_MAX_PARTITIONS; i++) {
|
|
+ part = &tab->partitions[i];
|
|
+
|
|
+ if (le16_to_cpu(part->type) == PARTITION_TYPE_FREE)
|
|
+ continue;
|
|
+
|
|
+ num_parts++;
|
|
+ }
|
|
+
|
|
+ mtd_parts = kzalloc((num_parts * sizeof(*mtd_part) +
|
|
+ num_parts * PART_NAME_LEN), GFP_KERNEL);
|
|
+
|
|
+ if (!mtd_parts) {
|
|
+ ret = -ENOMEM;
|
|
+ goto out_free_buf;
|
|
+ }
|
|
+
|
|
+ mtd_part = mtd_parts;
|
|
+ names = (char *)&mtd_parts[num_parts];
|
|
+
|
|
+ strncpy(names, "myloader", PART_NAME_LEN);
|
|
+ mtd_part->name = names;
|
|
+ mtd_part->offset = 0;
|
|
+ mtd_part->size = offset;
|
|
+ mtd_part->mask_flags = MTD_WRITEABLE;
|
|
+ mtd_part++;
|
|
+ names += PART_NAME_LEN;
|
|
+
|
|
+ strncpy(names, "partition_table", PART_NAME_LEN);
|
|
+ mtd_part->name = names;
|
|
+ mtd_part->offset = offset;
|
|
+ mtd_part->size = blocklen;
|
|
+ mtd_part->mask_flags = MTD_WRITEABLE;
|
|
+ mtd_part++;
|
|
+ names += PART_NAME_LEN;
|
|
+
|
|
+ for (i = 0; i < MYLO_MAX_PARTITIONS; i++) {
|
|
+ part = &tab->partitions[i];
|
|
+
|
|
+ if (le16_to_cpu(part->type) == PARTITION_TYPE_FREE)
|
|
+ continue;
|
|
+
|
|
+ if ((buf->names[i][0]) && (buf->names[i][0] != '\xff'))
|
|
+ strncpy(names, buf->names[i], PART_NAME_LEN);
|
|
+ else
|
|
+ snprintf(names, PART_NAME_LEN, "partition%d", i);
|
|
+
|
|
+ mtd_part->offset = le32_to_cpu(part->addr);
|
|
+ mtd_part->size = le32_to_cpu(part->size);
|
|
+ mtd_part->name = names;
|
|
+ mtd_part++;
|
|
+ names += PART_NAME_LEN;
|
|
+ }
|
|
+
|
|
+ *pparts = mtd_parts;
|
|
+ ret = num_parts;
|
|
+
|
|
+ out_free_buf:
|
|
+ vfree(buf);
|
|
+ out:
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static struct mtd_part_parser myloader_mtd_parser = {
|
|
+ .owner = THIS_MODULE,
|
|
+ .parse_fn = myloader_parse_partitions,
|
|
+ .name = "MyLoader",
|
|
+};
|
|
+
|
|
+static int __init myloader_mtd_parser_init(void)
|
|
+{
|
|
+ register_mtd_parser(&myloader_mtd_parser);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static void __exit myloader_mtd_parser_exit(void)
|
|
+{
|
|
+ deregister_mtd_parser(&myloader_mtd_parser);
|
|
+}
|
|
+
|
|
+module_init(myloader_mtd_parser_init);
|
|
+module_exit(myloader_mtd_parser_exit);
|
|
+
|
|
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
|
|
+MODULE_DESCRIPTION("Parsing code for MyLoader partition tables");
|
|
+MODULE_LICENSE("GPL v2");
|