kernel: start working on 3.18 support

[openwrt.git] / target / linux / generic / patches-3.18 / 431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch

diff --git a/target/linux/generic/patches-3.18/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch b/target/linux/generic/patches-3.18/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch
new file mode 100644 (file)
index 0000000..8c63803
--- /dev/null
+++ b/target/linux/generic/patches-3.18/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch
@@ -0,0 +1,66 @@
+--- a/drivers/mtd/bcm47xxpart.c
++++ b/drivers/mtd/bcm47xxpart.c
+@@ -36,6 +36,7 @@
+ #define ML_MAGIC2                     0x26594131
+ #define TRX_MAGIC                     0x30524448
+ #define SQSH_MAGIC                    0x71736873      /* shsq */
++#define UBI_EC_MAGIC                  0x23494255      /* UBI# */
+ 
+ struct trx_header {
+       uint32_t magic;
+@@ -46,7 +47,7 @@ struct trx_header {
+       uint32_t offset[3];
+ } __packed;
+ 
+-static void bcm47xxpart_add_part(struct mtd_partition *part, char *name,
++static void bcm47xxpart_add_part(struct mtd_partition *part, const char *name,
+                                u64 offset, uint32_t mask_flags)
+ {
+       part->name = name;
+@@ -54,6 +55,26 @@ static void bcm47xxpart_add_part(struct
+       part->mask_flags = mask_flags;
+ }
+ 
++static const char *bcm47xxpart_trx_data_part_name(struct mtd_info *master,
++                                                size_t offset)
++{
++      uint32_t buf;
++      size_t bytes_read;
++
++      if (mtd_read(master, offset, sizeof(&buf), &bytes_read,
++                   (uint8_t *)&buf) < 0) {
++              pr_err("mtd_read error while parsing (offset: 0x%X)!\n",
++                      offset);
++              goto out_default;
++      }
++
++      if (buf == UBI_EC_MAGIC)
++              return "ubi";
++
++out_default:
++      return "rootfs";
++}
++
+ static int bcm47xxpart_parse(struct mtd_info *master,
+                            struct mtd_partition **pparts,
+                            struct mtd_part_parser_data *data)
+@@ -147,6 +168,8 @@ static int bcm47xxpart_parse(struct mtd_
+ 
+               /* TRX */
+               if (buf[0x000 / 4] == TRX_MAGIC) {
++                      const char *name;
++
+                       if (BCM47XXPART_MAX_PARTS - curr_part < 4) {
+                               pr_warn("Not enough partitions left to register trx, scanning stopped!\n");
+                               break;
+@@ -177,7 +200,9 @@ static int bcm47xxpart_parse(struct mtd_
+                        * trx->length - trx->offset[i]. We don't fill it as
+                        * we want to have jffs2 (overlay) in the same mtd.
+                        */
+-                      bcm47xxpart_add_part(&parts[curr_part++], "rootfs",
++                      name = bcm47xxpart_trx_data_part_name(master,
++                                                            offset + trx->offset[i]);
++                      bcm47xxpart_add_part(&parts[curr_part++], name,
+                                            offset + trx->offset[i], 0);
+                       i++;
+