kernel/3.10: add separate rootfs partition parser
[openwrt/openwrt.git] / target / linux / generic / patches-3.10 / 405-mtd-add-more-helper-functions.patch
1 --- a/drivers/mtd/mtdpart.c
2 +++ b/drivers/mtd/mtdpart.c
3 @@ -435,14 +435,12 @@ static struct mtd_part *allocate_partiti
4 if (slave->offset == MTDPART_OFS_APPEND)
5 slave->offset = cur_offset;
6 if (slave->offset == MTDPART_OFS_NXTBLK) {
7 - slave->offset = cur_offset;
8 - if (mtd_mod_by_eb(cur_offset, master) != 0) {
9 - /* Round up to next erasesize */
10 - slave->offset = (mtd_div_by_eb(cur_offset, master) + 1) * master->erasesize;
11 + /* Round up to next erasesize */
12 + slave->offset = mtd_roundup_to_eb(cur_offset, master);
13 + if (slave->offset != cur_offset)
14 printk(KERN_NOTICE "Moving partition %d: "
15 "0x%012llx -> 0x%012llx\n", partno,
16 (unsigned long long)cur_offset, (unsigned long long)slave->offset);
17 - }
18 }
19 if (slave->offset == MTDPART_OFS_RETAIN) {
20 slave->offset = cur_offset;
21 @@ -996,6 +994,24 @@ int mtd_is_partition(const struct mtd_in
22 }
23 EXPORT_SYMBOL_GPL(mtd_is_partition);
24
25 +struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd)
26 +{
27 + if (!mtd_is_partition(mtd))
28 + return (struct mtd_info *)mtd;
29 +
30 + return PART(mtd)->master;
31 +}
32 +EXPORT_SYMBOL_GPL(mtdpart_get_master);
33 +
34 +uint64_t mtdpart_get_offset(const struct mtd_info *mtd)
35 +{
36 + if (!mtd_is_partition(mtd))
37 + return 0;
38 +
39 + return PART(mtd)->offset;
40 +}
41 +EXPORT_SYMBOL_GPL(mtdpart_get_offset);
42 +
43 /* Returns the size of the entire flash chip */
44 uint64_t mtd_get_device_size(const struct mtd_info *mtd)
45 {
46 --- a/include/linux/mtd/partitions.h
47 +++ b/include/linux/mtd/partitions.h
48 @@ -90,6 +90,8 @@ int mtd_is_partition(const struct mtd_in
49 int mtd_add_partition(struct mtd_info *master, char *name,
50 long long offset, long long length);
51 int mtd_del_partition(struct mtd_info *master, int partno);
52 +struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd);
53 +uint64_t mtdpart_get_offset(const struct mtd_info *mtd);
54 uint64_t mtd_get_device_size(const struct mtd_info *mtd);
55 extern void __weak arch_split_mtd_part(struct mtd_info *master,
56 const char *name, int offset, int size);
57 --- a/include/linux/mtd/mtd.h
58 +++ b/include/linux/mtd/mtd.h
59 @@ -331,6 +331,24 @@ static inline uint32_t mtd_mod_by_eb(uin
60 return do_div(sz, mtd->erasesize);
61 }
62
63 +static inline uint64_t mtd_roundup_to_eb(uint64_t sz, struct mtd_info *mtd)
64 +{
65 + if (mtd_mod_by_eb(sz, mtd) == 0)
66 + return sz;
67 +
68 + /* Round up to next erase block */
69 + return (mtd_div_by_eb(sz, mtd) + 1) * mtd->erasesize;
70 +}
71 +
72 +static inline uint64_t mtd_rounddown_to_eb(uint64_t sz, struct mtd_info *mtd)
73 +{
74 + if (mtd_mod_by_eb(sz, mtd) == 0)
75 + return sz;
76 +
77 + /* Round down to the start of the current erase block */
78 + return (mtd_div_by_eb(sz, mtd)) * mtd->erasesize;
79 +}
80 +
81 static inline uint32_t mtd_div_by_ws(uint64_t sz, struct mtd_info *mtd)
82 {
83 if (mtd->writesize_shift)