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/magic.h>
43 #include <linux/err.h>
46 @@ -45,13 +46,14 @@ struct mtd_part {
47 struct list_head list;
50 +static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part);
53 * Given a pointer to the MTD object in the mtd_part structure, we can retrieve
54 * the pointer to that structure with this macro.
56 #define PART(x) ((struct mtd_part *)(x))
60 * MTD methods which simply translate the effective address and pass through
61 * to the _real_ device.
62 @@ -533,8 +535,10 @@ out_register:
66 -int mtd_add_partition(struct mtd_info *master, char *name,
67 - long long offset, long long length)
70 +__mtd_add_partition(struct mtd_info *master, char *name,
71 + long long offset, long long length, bool dup_check)
73 struct mtd_partition part;
74 struct mtd_part *p, *new;
75 @@ -566,21 +570,24 @@ int mtd_add_partition(struct mtd_info *m
76 end = offset + length;
78 mutex_lock(&mtd_partitions_mutex);
79 - list_for_each_entry(p, &mtd_partitions, list)
80 - if (p->master == master) {
81 - if ((start >= p->offset) &&
82 - (start < (p->offset + p->mtd.size)))
85 - if ((end >= p->offset) &&
86 - (end < (p->offset + p->mtd.size)))
90 + list_for_each_entry(p, &mtd_partitions, list)
91 + if (p->master == master) {
92 + if ((start >= p->offset) &&
93 + (start < (p->offset + p->mtd.size)))
96 + if ((end >= p->offset) &&
97 + (end < (p->offset + p->mtd.size)))
102 list_add(&new->list, &mtd_partitions);
103 mutex_unlock(&mtd_partitions_mutex);
105 add_mtd_device(&new->mtd);
106 + mtd_partition_split(master, new);
110 @@ -590,6 +597,12 @@ err_inv:
112 EXPORT_SYMBOL_GPL(mtd_add_partition);
114 +int mtd_add_partition(struct mtd_info *master, char *name,
115 + long long offset, long long length)
117 + return __mtd_add_partition(master, name, offset, length, true);
120 int mtd_del_partition(struct mtd_info *master, int partno)
122 struct mtd_part *slave, *next;
123 @@ -613,6 +626,144 @@ int mtd_del_partition(struct mtd_info *m
125 EXPORT_SYMBOL_GPL(mtd_del_partition);
127 +static inline unsigned long
128 +mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len)
130 + unsigned long mask = mtd->erasesize - 1;
132 + len += offset & mask;
133 + len = (len + mask) & ~mask;
134 + len -= offset & mask;
138 +#define ROOTFS_SPLIT_NAME "rootfs_data"
140 +struct squashfs_super_block {
147 +static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
149 + struct squashfs_super_block sb;
152 + ret = mtd_read(master, offset, sizeof(sb), &len, (void *) &sb);
153 + if (ret || (len != sizeof(sb))) {
154 + printk(KERN_ALERT "split_squashfs: error occured while reading "
155 + "from \"%s\"\n", master->name);
159 + if (SQUASHFS_MAGIC != le32_to_cpu(sb.s_magic) ) {
160 + printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
166 + if (le64_to_cpu((sb.bytes_used)) <= 0) {
167 + printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
173 + len = (u32) le64_to_cpu(sb.bytes_used);
174 + len = mtd_pad_erasesize(master, offset, len);
175 + *split_offset = offset + len;
180 +static void split_rootfs_data(struct mtd_info *master, struct mtd_part *part)
182 + unsigned int split_offset = 0;
183 + unsigned int split_size;
186 + ret = split_squashfs(master, part->offset, &split_offset);
190 + if (split_offset <= 0)
193 + split_size = part->mtd.size - (split_offset - part->offset);
194 + printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=0x%x, len=0x%x\n",
195 + ROOTFS_SPLIT_NAME, split_offset, split_size);
197 + __mtd_add_partition(master, ROOTFS_SPLIT_NAME, split_offset,
198 + split_size, false);
201 +#define UBOOT_MAGIC 0x27051956
203 +static void split_uimage(struct mtd_info *master, struct mtd_part *part)
212 + if (mtd_read(master, part->offset, sizeof(hdr), &len, (void *) &hdr))
215 + if (len != sizeof(hdr) || hdr.magic != cpu_to_be32(UBOOT_MAGIC))
218 + len = be32_to_cpu(hdr.size) + 0x40;
219 + len = mtd_pad_erasesize(master, part->offset, len);
220 + if (len + master->erasesize > part->mtd.size)
223 + __mtd_add_partition(master, "rootfs", part->offset + len,
224 + part->mtd.size - len, false);
227 +#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
228 +#define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME
230 +#define SPLIT_FIRMWARE_NAME "unused"
233 +static void split_firmware(struct mtd_info *master, struct mtd_part *part)
235 + if (config_enabled(CONFIG_MTD_UIMAGE_SPLIT))
236 + split_uimage(master, part);
239 +void __weak arch_split_mtd_part(struct mtd_info *master, const char *name,
240 + int offset, int size)
244 +static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part)
246 + static int rootfs_found = 0;
251 + if (!strcmp(part->mtd.name, "rootfs")) {
254 + if (config_enabled(CONFIG_MTD_ROOTFS_SPLIT))
255 + split_rootfs_data(master, part);
258 + if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
259 + config_enabled(CONFIG_MTD_SPLIT_FIRMWARE))
260 + split_firmware(master, part);
262 + arch_split_mtd_part(master, part->mtd.name, part->offset,
266 * This function, given a master MTD object and a partition table, creates
267 * and registers slave MTD objects which are bound to the master according to
268 @@ -642,6 +793,7 @@ int add_mtd_partitions(struct mtd_info *
269 mutex_unlock(&mtd_partitions_mutex);
271 add_mtd_device(&slave->mtd);
272 + mtd_partition_split(master, slave);
274 cur_offset = slave->offset + slave->mtd.size;
276 --- a/include/linux/mtd/partitions.h
277 +++ b/include/linux/mtd/partitions.h
278 @@ -84,5 +84,7 @@ int mtd_add_partition(struct mtd_info *m
279 long long offset, long long length);
280 int mtd_del_partition(struct mtd_info *master, int partno);
281 uint64_t mtd_get_device_size(const struct mtd_info *mtd);
282 +extern void __weak arch_split_mtd_part(struct mtd_info *master,
283 + const char *name, int offset, int size);