1 --- a/drivers/mtd/Kconfig
2 +++ b/drivers/mtd/Kconfig
3 @@ -55,6 +55,16 @@ config MTD_PARTITIONS
7 +config MTD_ROOTFS_ROOT_DEV
8 + bool "Automatically set 'rootfs' partition to be root filesystem"
9 + depends on MTD_PARTITIONS
12 +config MTD_ROOTFS_SPLIT
13 + bool "Automatically split 'rootfs' partition for squashfs"
14 + depends on MTD_PARTITIONS
17 config MTD_REDBOOT_PARTS
18 tristate "RedBoot partition table parsing"
20 --- a/drivers/mtd/mtdpart.c
21 +++ b/drivers/mtd/mtdpart.c
23 #include <linux/kmod.h>
24 #include <linux/mtd/mtd.h>
25 #include <linux/mtd/partitions.h>
26 +#include <linux/root_dev.h>
27 +#include <linux/magic.h>
28 #include <linux/err.h>
30 /* Our partition linked list */
31 @@ -48,7 +50,7 @@ struct mtd_part {
32 * the pointer to that structure with this macro.
34 #define PART(x) ((struct mtd_part *)(x))
36 +#define IS_PART(mtd) (mtd->read == part_read)
39 * MTD methods which simply translate the effective address and pass through
40 @@ -636,6 +638,153 @@ int mtd_del_partition(struct mtd_info *m
42 EXPORT_SYMBOL_GPL(mtd_del_partition);
44 +#ifdef CONFIG_MTD_ROOTFS_SPLIT
45 +#define ROOTFS_SPLIT_NAME "rootfs_data"
46 +#define ROOTFS_REMOVED_NAME "<removed>"
48 +struct squashfs_super_block {
55 +static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
57 + struct squashfs_super_block sb;
60 + ret = master->read(master, offset, sizeof(sb), &len, (void *) &sb);
61 + if (ret || (len != sizeof(sb))) {
62 + printk(KERN_ALERT "split_squashfs: error occured while reading "
63 + "from \"%s\"\n", master->name);
67 + if (SQUASHFS_MAGIC != le32_to_cpu(sb.s_magic) ) {
68 + printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
74 + if (le64_to_cpu((sb.bytes_used)) <= 0) {
75 + printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
81 + len = (u32) le64_to_cpu(sb.bytes_used);
82 + len += (offset & 0x000fffff);
83 + len += (master->erasesize - 1);
84 + len &= ~(master->erasesize - 1);
85 + len -= (offset & 0x000fffff);
86 + *split_offset = offset + len;
91 +static int split_rootfs_data(struct mtd_info *master, struct mtd_info *rpart, const struct mtd_partition *part)
93 + struct mtd_partition *dpart;
94 + struct mtd_part *slave = NULL;
95 + int ret, split_offset = 0;
97 + ret = split_squashfs(master, part->offset, &split_offset);
101 + if (split_offset <= 0)
104 + dpart = kmalloc(sizeof(*part)+sizeof(ROOTFS_SPLIT_NAME)+1, GFP_KERNEL);
105 + if (dpart == NULL) {
106 + printk(KERN_INFO "split_squashfs: no memory for partition \"%s\"\n",
107 + ROOTFS_SPLIT_NAME);
111 + memcpy(dpart, part, sizeof(*part));
112 + dpart->name = (unsigned char *)&dpart[1];
113 + strcpy(dpart->name, ROOTFS_SPLIT_NAME);
115 + dpart->size -= split_offset - dpart->offset;
116 + dpart->offset = split_offset;
121 + printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=%llX, len=%llX \n",
122 + ROOTFS_SPLIT_NAME, dpart->offset, dpart->size);
124 + slave = allocate_partition(master, dpart, 0, split_offset);
126 + return PTR_ERR(slave);
127 + mutex_lock(&mtd_partitions_mutex);
128 + list_add(&slave->list, &mtd_partitions);
129 + mutex_unlock(&mtd_partitions_mutex);
131 + add_mtd_device(&slave->mtd);
133 + rpart->split = &slave->mtd;
138 +static int refresh_rootfs_split(struct mtd_info *mtd)
140 + struct mtd_partition tpart;
141 + struct mtd_part *part;
149 + /* check for the new squashfs offset first */
150 + ret = split_squashfs(part->master, part->offset, &offset);
154 + if ((offset > 0) && !mtd->split) {
155 + printk(KERN_INFO "%s: creating new split partition for \"%s\"\n", __func__, mtd->name);
156 + /* if we don't have a rootfs split partition, create a new one */
157 + tpart.name = (char *) mtd->name;
158 + tpart.size = mtd->size;
159 + tpart.offset = part->offset;
161 + return split_rootfs_data(part->master, &part->mtd, &tpart);
162 + } else if ((offset > 0) && mtd->split) {
163 + /* update the offsets of the existing partition */
164 + size = mtd->size + part->offset - offset;
166 + part = PART(mtd->split);
167 + part->offset = offset;
168 + part->mtd.size = size;
169 + printk(KERN_INFO "%s: %s partition \"" ROOTFS_SPLIT_NAME "\", offset: 0x%06x (0x%06x)\n",
170 + __func__, (!strcmp(part->mtd.name, ROOTFS_SPLIT_NAME) ? "updating" : "creating"),
171 + (u32) part->offset, (u32) part->mtd.size);
172 + name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
173 + strcpy(name, ROOTFS_SPLIT_NAME);
174 + part->mtd.name = name;
175 + } else if ((offset <= 0) && mtd->split) {
176 + printk(KERN_INFO "%s: removing partition \"%s\"\n", __func__, mtd->split->name);
178 + /* mark existing partition as removed */
179 + part = PART(mtd->split);
180 + name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
181 + strcpy(name, ROOTFS_REMOVED_NAME);
182 + part->mtd.name = name;
184 + part->mtd.size = 0;
189 +#endif /* CONFIG_MTD_ROOTFS_SPLIT */
192 * This function, given a master MTD object and a partition table, creates
193 * and registers slave MTD objects which are bound to the master according to
194 @@ -652,6 +801,9 @@ int add_mtd_partitions(struct mtd_info *
195 struct mtd_part *slave;
196 uint64_t cur_offset = 0;
198 +#ifdef CONFIG_MTD_ROOTFS_SPLIT
202 printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
204 @@ -666,6 +818,21 @@ int add_mtd_partitions(struct mtd_info *
206 add_mtd_device(&slave->mtd);
208 + if (!strcmp(parts[i].name, "rootfs")) {
209 +#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
210 + if (ROOT_DEV == 0) {
211 + printk(KERN_NOTICE "mtd: partition \"rootfs\" "
212 + "set to be root filesystem\n");
213 + ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, slave->mtd.index);
216 +#ifdef CONFIG_MTD_ROOTFS_SPLIT
217 + ret = split_rootfs_data(master, &slave->mtd, &parts[i]);
223 cur_offset = slave->offset + slave->mtd.size;
226 @@ -673,6 +840,32 @@ int add_mtd_partitions(struct mtd_info *
228 EXPORT_SYMBOL(add_mtd_partitions);
230 +int refresh_mtd_partitions(struct mtd_info *mtd)
234 + if (IS_PART(mtd)) {
235 + struct mtd_part *part;
236 + struct mtd_info *master;
239 + master = part->master;
240 + if (master->refresh_device)
241 + ret = master->refresh_device(master);
244 + if (!ret && mtd->refresh_device)
245 + ret = mtd->refresh_device(mtd);
247 +#ifdef CONFIG_MTD_ROOTFS_SPLIT
248 + if (!ret && IS_PART(mtd) && !strcmp(mtd->name, "rootfs"))
249 + refresh_rootfs_split(mtd);
254 +EXPORT_SYMBOL_GPL(refresh_mtd_partitions);
256 static DEFINE_SPINLOCK(part_parser_lock);
257 static LIST_HEAD(part_parsers);
259 --- a/drivers/mtd/devices/block2mtd.c
260 +++ b/drivers/mtd/devices/block2mtd.c
261 @@ -30,6 +30,8 @@ struct block2mtd_dev {
262 struct block_device *blkdev;
264 struct mutex write_mutex;
265 + rwlock_t bdev_mutex;
270 @@ -82,6 +84,12 @@ static int block2mtd_erase(struct mtd_in
271 size_t len = instr->len;
274 + read_lock(&dev->bdev_mutex);
275 + if (!dev->blkdev) {
280 instr->state = MTD_ERASING;
281 mutex_lock(&dev->write_mutex);
282 err = _block2mtd_erase(dev, from, len);
283 @@ -93,6 +101,10 @@ static int block2mtd_erase(struct mtd_in
284 instr->state = MTD_ERASE_DONE;
286 mtd_erase_callback(instr);
289 + read_unlock(&dev->bdev_mutex);
294 @@ -104,10 +116,14 @@ static int block2mtd_read(struct mtd_inf
296 int index = from >> PAGE_SHIFT;
297 int offset = from & (PAGE_SIZE-1);
299 + int cpylen, err = 0;
301 + read_lock(&dev->bdev_mutex);
302 + if (!dev->blkdev || (from > mtd->size)) {
307 - if (from > mtd->size)
309 if (from + len > mtd->size)
310 len = mtd->size - from;
312 @@ -122,10 +138,14 @@ static int block2mtd_read(struct mtd_inf
315 page = page_read(dev->blkdev->bd_inode->i_mapping, index);
319 - return PTR_ERR(page);
324 + if (IS_ERR(page)) {
325 + err = PTR_ERR(page);
329 memcpy(buf, page_address(page) + offset, cpylen);
330 page_cache_release(page);
331 @@ -136,7 +156,10 @@ static int block2mtd_read(struct mtd_inf
338 + read_unlock(&dev->bdev_mutex);
343 @@ -188,12 +211,22 @@ static int block2mtd_write(struct mtd_in
344 size_t *retlen, const u_char *buf)
346 struct block2mtd_dev *dev = mtd->priv;
350 + read_lock(&dev->bdev_mutex);
351 + if (!dev->blkdev) {
358 - if (to >= mtd->size)
362 + if (to >= mtd->size) {
367 if (to + len > mtd->size)
368 len = mtd->size - to;
370 @@ -202,6 +235,9 @@ static int block2mtd_write(struct mtd_in
371 mutex_unlock(&dev->write_mutex);
376 + read_unlock(&dev->bdev_mutex);
380 @@ -210,33 +246,109 @@ static int block2mtd_write(struct mtd_in
381 static void block2mtd_sync(struct mtd_info *mtd)
383 struct block2mtd_dev *dev = mtd->priv;
384 + read_lock(&dev->bdev_mutex);
386 sync_blockdev(dev->blkdev);
387 + read_unlock(&dev->bdev_mutex);
393 +static int _open_bdev(struct block2mtd_dev *dev)
395 + const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL;
396 + struct block_device *bdev;
398 + /* Get a handle on the device */
399 + bdev = blkdev_get_by_path(dev->devname, mode, dev);
401 + if (IS_ERR(bdev)) {
403 + /* We might not have rootfs mounted at this point. Try
404 + to resolve the device name by other means. */
406 + dev_t devt = name_to_dev_t(dev->devname);
408 + bdev = blkdev_get_by_dev(devt, mode, dev);
412 + if (IS_ERR(bdev)) {
413 + ERROR("error: cannot open device %s", dev->devname);
416 + dev->blkdev = bdev;
418 + if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
419 + ERROR("attempting to use an MTD device as a block device");
426 +static void _close_bdev(struct block2mtd_dev *dev)
428 + struct block_device *bdev;
433 + bdev = dev->blkdev;
434 + invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping, 0, -1);
435 + blkdev_put(dev->blkdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL);
436 + dev->blkdev = NULL;
439 static void block2mtd_free_device(struct block2mtd_dev *dev)
444 kfree(dev->mtd.name);
447 - invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping,
449 - blkdev_put(dev->blkdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL);
457 -/* FIXME: ensure that mtd->size % erase_size == 0 */
458 -static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
459 +static int block2mtd_refresh(struct mtd_info *mtd)
461 - const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL;
462 + struct block2mtd_dev *dev = mtd->priv;
463 struct block_device *bdev;
467 + /* no other mtd function can run at this point */
468 + write_lock(&dev->bdev_mutex);
470 + /* get the device number for the whole disk */
471 + devt = MKDEV(MAJOR(dev->blkdev->bd_dev), 0);
473 + /* close the old block device */
476 + /* open the whole disk, issue a partition rescan, then */
477 + bdev = blkdev_get_by_dev(devt, FMODE_WRITE | FMODE_READ);
478 + if (!bdev || !bdev->bd_disk)
480 +#ifndef CONFIG_MTD_BLOCK2MTD_MODULE
482 + err = rescan_partitions(bdev->bd_disk, bdev);
485 + blkdev_put(bdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL);
487 + /* try to open the partition block device again */
489 + write_unlock(&dev->bdev_mutex);
494 +/* FIXME: ensure that mtd->size % erase_size == 0 */
495 +static struct block2mtd_dev *add_device(char *devname, int erase_size, char *mtdname)
497 struct block2mtd_dev *dev;
498 struct mtd_partition *part;
500 @@ -244,36 +356,17 @@ static struct block2mtd_dev *add_device(
504 - dev = kzalloc(sizeof(struct block2mtd_dev), GFP_KERNEL);
505 + dev = kzalloc(sizeof(struct block2mtd_dev) + strlen(devname) + 1, GFP_KERNEL);
509 - /* Get a handle on the device */
510 - bdev = blkdev_get_by_path(devname, mode, dev);
512 - if (IS_ERR(bdev)) {
514 - /* We might not have rootfs mounted at this point. Try
515 - to resolve the device name by other means. */
516 + strcpy(dev->devname, devname);
518 - dev_t devt = name_to_dev_t(devname);
520 - bdev = blkdev_get_by_dev(devt, mode, dev);
524 - if (IS_ERR(bdev)) {
525 - ERROR("error: cannot open device %s", devname);
526 + if (_open_bdev(dev))
529 - dev->blkdev = bdev;
531 - if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
532 - ERROR("attempting to use an MTD device as a block device");
536 mutex_init(&dev->write_mutex);
537 + rwlock_init(&dev->bdev_mutex);
539 /* Setup the MTD structure */
540 /* make the name contain the block device in */
541 @@ -298,6 +391,7 @@ static struct block2mtd_dev *add_device(
542 dev->mtd.read = block2mtd_read;
544 dev->mtd.owner = THIS_MODULE;
545 + dev->mtd.refresh_device = block2mtd_refresh;
547 part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
548 part->name = dev->mtd.name;
549 --- a/drivers/mtd/mtdchar.c
550 +++ b/drivers/mtd/mtdchar.c
551 @@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file,
555 +#ifdef CONFIG_MTD_PARTITIONS
558 + ret = refresh_mtd_partitions(mtd);
563 case OTPGETREGIONCOUNT:
564 case OTPGETREGIONINFO:
565 --- a/include/linux/mtd/mtd.h
566 +++ b/include/linux/mtd/mtd.h
567 @@ -125,6 +125,7 @@ struct nand_ecclayout {
568 struct nand_oobfree oobfree[MTD_MAX_OOBFREE_ENTRIES_LARGE];
575 @@ -277,6 +278,9 @@ struct mtd_info {
579 + int (*refresh_device)(struct mtd_info *mtd);
580 + struct mtd_info *split;
582 /* If the driver is something smart, like UBI, it may need to maintain
583 * its own reference counting. The below functions are only for driver.
584 * The driver may register its callbacks. These callbacks are not
585 --- a/include/linux/mtd/partitions.h
586 +++ b/include/linux/mtd/partitions.h
588 * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
591 +struct mtd_partition;
592 struct mtd_partition {
593 char *name; /* identifier string */
594 uint64_t size; /* partition size */
595 uint64_t offset; /* offset within the master MTD space */
596 uint32_t mask_flags; /* master MTD flags to mask out for this partition */
597 struct nand_ecclayout *ecclayout; /* out of band layout for this partition (NAND only) */
598 + int (*refresh_partition)(struct mtd_info *);
601 #define MTDPART_OFS_NXTBLK (-2)
602 @@ -51,6 +53,7 @@ struct mtd_info;
604 int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
605 int del_mtd_partitions(struct mtd_info *);
606 +int refresh_mtd_partitions(struct mtd_info *);
609 * Functions dealing with the various ways of partitioning the space
610 --- a/include/mtd/mtd-abi.h
611 +++ b/include/mtd/mtd-abi.h
612 @@ -127,6 +127,7 @@ struct otp_info {
613 #define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64)
614 #define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64)
615 #define MEMISLOCKED _IOR('M', 23, struct erase_info_user)
616 +#define MTDREFRESH _IO('M', 23)
619 * Obsolete legacy interface. Keep it in order not to break userspace