1 --- a/drivers/mtd/Kconfig
2 +++ b/drivers/mtd/Kconfig
3 @@ -12,6 +12,32 @@ menuconfig MTD
7 +menu "OpenWrt specific MTD options"
9 +config MTD_ROOTFS_ROOT_DEV
10 + bool "Automatically set 'rootfs' partition to be root filesystem"
13 +config MTD_ROOTFS_SPLIT
14 + bool "Automatically split 'rootfs' partition for squashfs"
17 +config MTD_SPLIT_FIRMWARE
18 + bool "Automatically split firmware partition for kernel+rootfs"
21 +config MTD_SPLIT_FIRMWARE_NAME
22 + string "Firmware partition name"
23 + depends on MTD_SPLIT_FIRMWARE
26 +config MTD_UIMAGE_SPLIT
27 + bool "Enable split support for firmware partitions containing a uImage"
28 + depends on MTD_SPLIT_FIRMWARE
34 tristate "MTD tests support (DANGEROUS)"
36 --- a/drivers/mtd/mtdpart.c
37 +++ b/drivers/mtd/mtdpart.c
39 #include <linux/kmod.h>
40 #include <linux/mtd/mtd.h>
41 #include <linux/mtd/partitions.h>
42 +#include <linux/root_dev.h>
43 +#include <linux/magic.h>
44 #include <linux/err.h>
47 @@ -45,13 +47,14 @@ struct mtd_part {
48 struct list_head list;
51 +static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part);
54 * Given a pointer to the MTD object in the mtd_part structure, we can retrieve
55 * the pointer to that structure with this macro.
57 #define PART(x) ((struct mtd_part *)(x))
61 * MTD methods which simply translate the effective address and pass through
62 * to the _real_ device.
63 @@ -534,8 +537,10 @@ out_register:
67 -int mtd_add_partition(struct mtd_info *master, char *name,
68 - long long offset, long long length)
71 +__mtd_add_partition(struct mtd_info *master, char *name,
72 + long long offset, long long length, bool dup_check)
74 struct mtd_partition part;
75 struct mtd_part *p, *new;
76 @@ -567,21 +572,24 @@ int mtd_add_partition(struct mtd_info *m
77 end = offset + length;
79 mutex_lock(&mtd_partitions_mutex);
80 - list_for_each_entry(p, &mtd_partitions, list)
81 - if (p->master == master) {
82 - if ((start >= p->offset) &&
83 - (start < (p->offset + p->mtd.size)))
86 - if ((end >= p->offset) &&
87 - (end < (p->offset + p->mtd.size)))
91 + list_for_each_entry(p, &mtd_partitions, list)
92 + if (p->master == master) {
93 + if ((start >= p->offset) &&
94 + (start < (p->offset + p->mtd.size)))
97 + if ((end >= p->offset) &&
98 + (end < (p->offset + p->mtd.size)))
103 list_add(&new->list, &mtd_partitions);
104 mutex_unlock(&mtd_partitions_mutex);
106 add_mtd_device(&new->mtd);
107 + mtd_partition_split(master, new);
111 @@ -591,6 +599,12 @@ err_inv:
113 EXPORT_SYMBOL_GPL(mtd_add_partition);
115 +int mtd_add_partition(struct mtd_info *master, char *name,
116 + long long offset, long long length)
118 + return __mtd_add_partition(master, name, offset, length, true);
121 int mtd_del_partition(struct mtd_info *master, int partno)
123 struct mtd_part *slave, *next;
124 @@ -614,6 +628,151 @@ int mtd_del_partition(struct mtd_info *m
126 EXPORT_SYMBOL_GPL(mtd_del_partition);
128 +static inline unsigned long
129 +mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len)
131 + unsigned long mask = mtd->erasesize - 1;
133 + len += offset & mask;
134 + len = (len + mask) & ~mask;
135 + len -= offset & mask;
139 +#define ROOTFS_SPLIT_NAME "rootfs_data"
141 +struct squashfs_super_block {
148 +static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
150 + struct squashfs_super_block sb;
153 + ret = mtd_read(master, offset, sizeof(sb), &len, (void *) &sb);
154 + if (ret || (len != sizeof(sb))) {
155 + printk(KERN_ALERT "split_squashfs: error occured while reading "
156 + "from \"%s\"\n", master->name);
160 + if (SQUASHFS_MAGIC != le32_to_cpu(sb.s_magic) ) {
161 + printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
167 + if (le64_to_cpu((sb.bytes_used)) <= 0) {
168 + printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
174 + len = (u32) le64_to_cpu(sb.bytes_used);
175 + len = mtd_pad_erasesize(master, offset, len);
176 + *split_offset = offset + len;
181 +static void split_rootfs_data(struct mtd_info *master, struct mtd_part *part)
183 + unsigned int split_offset = 0;
184 + unsigned int split_size;
187 + ret = split_squashfs(master, part->offset, &split_offset);
191 + if (split_offset <= 0)
194 + split_size = part->mtd.size - (split_offset - part->offset);
195 + printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=0x%x, len=0x%x\n",
196 + ROOTFS_SPLIT_NAME, split_offset, split_size);
198 + __mtd_add_partition(master, ROOTFS_SPLIT_NAME, split_offset,
199 + split_size, false);
202 +#define UBOOT_MAGIC 0x27051956
204 +static void split_uimage(struct mtd_info *master, struct mtd_part *part)
213 + if (mtd_read(master, part->offset, sizeof(hdr), &len, (void *) &hdr))
216 + if (len != sizeof(hdr) || hdr.magic != cpu_to_be32(UBOOT_MAGIC))
219 + len = be32_to_cpu(hdr.size) + 0x40;
220 + len = mtd_pad_erasesize(master, part->offset, len);
221 + if (len + master->erasesize > part->mtd.size)
224 + __mtd_add_partition(master, "rootfs", part->offset + len,
225 + part->mtd.size - len, false);
228 +#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
229 +#define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME
231 +#define SPLIT_FIRMWARE_NAME "unused"
234 +static void split_firmware(struct mtd_info *master, struct mtd_part *part)
236 + if (config_enabled(CONFIG_MTD_UIMAGE_SPLIT))
237 + split_uimage(master, part);
240 +void __weak arch_split_mtd_part(struct mtd_info *master, const char *name,
241 + int offset, int size)
245 +static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part)
247 + static int rootfs_found = 0;
252 + if (!strcmp(part->mtd.name, "rootfs")) {
255 + if (config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
257 + printk(KERN_NOTICE "mtd: partition \"rootfs\" "
258 + "set to be root filesystem\n");
259 + ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, part->mtd.index);
262 + if (config_enabled(CONFIG_MTD_ROOTFS_SPLIT))
263 + split_rootfs_data(master, part);
266 + if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
267 + config_enabled(CONFIG_MTD_SPLIT_FIRMWARE))
268 + split_firmware(master, part);
270 + arch_split_mtd_part(master, part->mtd.name, part->offset,
274 * This function, given a master MTD object and a partition table, creates
275 * and registers slave MTD objects which are bound to the master according to
276 @@ -643,6 +802,7 @@ int add_mtd_partitions(struct mtd_info *
277 mutex_unlock(&mtd_partitions_mutex);
279 add_mtd_device(&slave->mtd);
280 + mtd_partition_split(master, slave);
282 cur_offset = slave->offset + slave->mtd.size;
284 --- a/include/linux/mtd/partitions.h
285 +++ b/include/linux/mtd/partitions.h
286 @@ -84,5 +84,7 @@ int mtd_add_partition(struct mtd_info *m
287 long long offset, long long length);
288 int mtd_del_partition(struct mtd_info *master, int partno);
289 uint64_t mtd_get_device_size(const struct mtd_info *mtd);
290 +extern void __weak arch_split_mtd_part(struct mtd_info *master,
291 + const char *name, int offset, int size);