kernel: reorganize 2.6.37 patches
[openwrt/svn-archive/archive.git] / target / linux / generic / patches-2.6.37 / 400-rootfs_split.patch
1 --- a/drivers/mtd/Kconfig
2 +++ b/drivers/mtd/Kconfig
3 @@ -53,6 +53,16 @@ config MTD_PARTITIONS
4 devices. Partitioning on NFTL 'devices' is a different - that's the
5 'normal' form of partitioning used on a block device.
6
7 +config MTD_ROOTFS_ROOT_DEV
8 + bool "Automatically set 'rootfs' partition to be root filesystem"
9 + depends on MTD_PARTITIONS
10 + default y
11 +
12 +config MTD_ROOTFS_SPLIT
13 + bool "Automatically split 'rootfs' partition for squashfs"
14 + depends on MTD_PARTITIONS
15 + default y
16 +
17 config MTD_REDBOOT_PARTS
18 tristate "RedBoot partition table parsing"
19 depends on MTD_PARTITIONS
20 --- a/drivers/mtd/mtdpart.c
21 +++ b/drivers/mtd/mtdpart.c
22 @@ -29,6 +29,8 @@
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>
29
30 /* Our partition linked list */
31 @@ -48,7 +50,7 @@ struct mtd_part {
32 * the pointer to that structure with this macro.
33 */
34 #define PART(x) ((struct mtd_part *)(x))
35 -
36 +#define IS_PART(mtd) (mtd->read == part_read)
37
38 /*
39 * MTD methods which simply translate the effective address and pass through
40 @@ -618,6 +620,153 @@ int mtd_del_partition(struct mtd_info *m
41 }
42 EXPORT_SYMBOL_GPL(mtd_del_partition);
43
44 +#ifdef CONFIG_MTD_ROOTFS_SPLIT
45 +#define ROOTFS_SPLIT_NAME "rootfs_data"
46 +#define ROOTFS_REMOVED_NAME "<removed>"
47 +
48 +struct squashfs_super_block {
49 + __le32 s_magic;
50 + __le32 pad0[9];
51 + __le64 bytes_used;
52 +};
53 +
54 +
55 +static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
56 +{
57 + struct squashfs_super_block sb;
58 + int len, ret;
59 +
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);
64 + return -EINVAL;
65 + }
66 +
67 + if (SQUASHFS_MAGIC != le32_to_cpu(sb.s_magic) ) {
68 + printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
69 + master->name);
70 + *split_offset = 0;
71 + return 0;
72 + }
73 +
74 + if (le64_to_cpu((sb.bytes_used)) <= 0) {
75 + printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
76 + master->name);
77 + *split_offset = 0;
78 + return 0;
79 + }
80 +
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;
87 +
88 + return 0;
89 +}
90 +
91 +static int split_rootfs_data(struct mtd_info *master, struct mtd_info *rpart, const struct mtd_partition *part)
92 +{
93 + struct mtd_partition *dpart;
94 + struct mtd_part *slave = NULL;
95 + int ret, split_offset = 0;
96 +
97 + ret = split_squashfs(master, part->offset, &split_offset);
98 + if (ret)
99 + return ret;
100 +
101 + if (split_offset <= 0)
102 + return 0;
103 +
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);
108 + return -ENOMEM;
109 + }
110 +
111 + memcpy(dpart, part, sizeof(*part));
112 + dpart->name = (unsigned char *)&dpart[1];
113 + strcpy(dpart->name, ROOTFS_SPLIT_NAME);
114 +
115 + dpart->size -= split_offset - dpart->offset;
116 + dpart->offset = split_offset;
117 +
118 + if (dpart == NULL)
119 + return 1;
120 +
121 + printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=%llX, len=%llX \n",
122 + ROOTFS_SPLIT_NAME, dpart->offset, dpart->size);
123 +
124 + slave = allocate_partition(master, dpart, 0, split_offset);
125 + if (IS_ERR(slave))
126 + return PTR_ERR(slave);
127 + mutex_lock(&mtd_partitions_mutex);
128 + list_add(&slave->list, &mtd_partitions);
129 + mutex_unlock(&mtd_partitions_mutex);
130 +
131 + add_mtd_device(&slave->mtd);
132 +
133 + rpart->split = &slave->mtd;
134 +
135 + return 0;
136 +}
137 +
138 +static int refresh_rootfs_split(struct mtd_info *mtd)
139 +{
140 + struct mtd_partition tpart;
141 + struct mtd_part *part;
142 + char *name;
143 + //int index = 0;
144 + int offset, size;
145 + int ret;
146 +
147 + part = PART(mtd);
148 +
149 + /* check for the new squashfs offset first */
150 + ret = split_squashfs(part->master, part->offset, &offset);
151 + if (ret)
152 + return ret;
153 +
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;
160 +
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;
165 +
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);
177 +
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;
183 + part->offset = 0;
184 + part->mtd.size = 0;
185 + }
186 +
187 + return 0;
188 +}
189 +#endif /* CONFIG_MTD_ROOTFS_SPLIT */
190 +
191 /*
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 @@ -633,7 +782,7 @@ int add_mtd_partitions(struct mtd_info *
195 {
196 struct mtd_part *slave;
197 uint64_t cur_offset = 0;
198 - int i;
199 + int i, ret;
200
201 printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
202
203 @@ -648,6 +797,21 @@ int add_mtd_partitions(struct mtd_info *
204
205 add_mtd_device(&slave->mtd);
206
207 + if (!strcmp(parts[i].name, "rootfs")) {
208 +#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
209 + if (ROOT_DEV == 0) {
210 + printk(KERN_NOTICE "mtd: partition \"rootfs\" "
211 + "set to be root filesystem\n");
212 + ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, slave->mtd.index);
213 + }
214 +#endif
215 +#ifdef CONFIG_MTD_ROOTFS_SPLIT
216 + ret = split_rootfs_data(master, &slave->mtd, &parts[i]);
217 + /* if (ret == 0)
218 + * j++; */
219 +#endif
220 + }
221 +
222 cur_offset = slave->offset + slave->mtd.size;
223 }
224
225 @@ -655,6 +819,32 @@ int add_mtd_partitions(struct mtd_info *
226 }
227 EXPORT_SYMBOL(add_mtd_partitions);
228
229 +int refresh_mtd_partitions(struct mtd_info *mtd)
230 +{
231 + int ret = 0;
232 +
233 + if (IS_PART(mtd)) {
234 + struct mtd_part *part;
235 + struct mtd_info *master;
236 +
237 + part = PART(mtd);
238 + master = part->master;
239 + if (master->refresh_device)
240 + ret = master->refresh_device(master);
241 + }
242 +
243 + if (!ret && mtd->refresh_device)
244 + ret = mtd->refresh_device(mtd);
245 +
246 +#ifdef CONFIG_MTD_ROOTFS_SPLIT
247 + if (!ret && IS_PART(mtd) && !strcmp(mtd->name, "rootfs"))
248 + refresh_rootfs_split(mtd);
249 +#endif
250 +
251 + return 0;
252 +}
253 +EXPORT_SYMBOL_GPL(refresh_mtd_partitions);
254 +
255 static DEFINE_SPINLOCK(part_parser_lock);
256 static LIST_HEAD(part_parsers);
257
258 --- a/drivers/mtd/mtdchar.c
259 +++ b/drivers/mtd/mtdchar.c
260 @@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file,
261 file->f_pos = 0;
262 break;
263 }
264 +#ifdef CONFIG_MTD_PARTITIONS
265 + case MTDREFRESH:
266 + {
267 + ret = refresh_mtd_partitions(mtd);
268 + break;
269 + }
270 +#endif
271
272 case OTPGETREGIONCOUNT:
273 case OTPGETREGIONINFO:
274 --- a/include/linux/mtd/mtd.h
275 +++ b/include/linux/mtd/mtd.h
276 @@ -125,6 +125,7 @@ struct nand_ecclayout {
277 struct nand_oobfree oobfree[MTD_MAX_OOBFREE_ENTRIES_LARGE];
278 };
279
280 +struct mtd_info;
281 struct mtd_info {
282 u_char type;
283 uint32_t flags;
284 @@ -266,6 +267,9 @@ struct mtd_info {
285 struct device dev;
286 int usecount;
287
288 + int (*refresh_device)(struct mtd_info *mtd);
289 + struct mtd_info *split;
290 +
291 /* If the driver is something smart, like UBI, it may need to maintain
292 * its own reference counting. The below functions are only for driver.
293 * The driver may register its callbacks. These callbacks are not
294 --- a/include/linux/mtd/partitions.h
295 +++ b/include/linux/mtd/partitions.h
296 @@ -34,12 +34,14 @@
297 * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
298 */
299
300 +struct mtd_partition;
301 struct mtd_partition {
302 char *name; /* identifier string */
303 uint64_t size; /* partition size */
304 uint64_t offset; /* offset within the master MTD space */
305 uint32_t mask_flags; /* master MTD flags to mask out for this partition */
306 struct nand_ecclayout *ecclayout; /* out of band layout for this partition (NAND only) */
307 + int (*refresh_partition)(struct mtd_info *);
308 };
309
310 #define MTDPART_OFS_NXTBLK (-2)
311 @@ -51,6 +53,7 @@ struct mtd_info;
312
313 int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
314 int del_mtd_partitions(struct mtd_info *);
315 +int refresh_mtd_partitions(struct mtd_info *);
316
317 /*
318 * Functions dealing with the various ways of partitioning the space
319 --- a/include/mtd/mtd-abi.h
320 +++ b/include/mtd/mtd-abi.h
321 @@ -127,6 +127,7 @@ struct otp_info {
322 #define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64)
323 #define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64)
324 #define MEMISLOCKED _IOR('M', 23, struct erase_info_user)
325 +#define MTDREFRESH _IO('M', 23)
326
327 /*
328 * Obsolete legacy interface. Keep it in order not to break userspace