kernel: backport bcm47xxpart changes queued for 3.19

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 43223

diff --git a/target/linux/bcm53xx/patches-3.14/410-mtd-bcm47xxpart-alloc-memory-for-more-partitions.patch b/target/linux/bcm53xx/patches-3.14/410-mtd-bcm47xxpart-alloc-memory-for-more-partitions.patch
deleted file mode 100644 (file)
index 3372bf5..0000000
--- a/target/linux/bcm53xx/patches-3.14/410-mtd-bcm47xxpart-alloc-memory-for-more-partitions.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6b833541d73894b5afd40d69949f8f6099db2abf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Thu, 2 Oct 2014 11:33:40 +0200
-Subject: [PATCH] mtd: bcm47xxpart: alloc memory for more partitions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is needed for some new Netgear devices (e.g. R6250).
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
----
- drivers/mtd/bcm47xxpart.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
---- a/drivers/mtd/bcm47xxpart.c
-+++ b/drivers/mtd/bcm47xxpart.c
-@@ -15,8 +15,12 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- 
--/* 10 parts were found on sflash on Netgear WNDR4500 */
--#define BCM47XXPART_MAX_PARTS         12
-+/*
-+ * NAND flash on Netgear R6250 was verified to contain 15 partitions.
-+ * This will result in allocating too big array for some old devices, but the
-+ * memory will be freed soon anyway (see mtd_device_parse_register).
-+ */
-+#define BCM47XXPART_MAX_PARTS         20
- 
- /*
-  * Amount of bytes we read when analyzing each block of flash memory.

diff --git a/target/linux/bcm53xx/patches-3.18/410-mtd-bcm47xxpart-alloc-memory-for-more-partitions.patch b/target/linux/bcm53xx/patches-3.18/410-mtd-bcm47xxpart-alloc-memory-for-more-partitions.patch
deleted file mode 100644 (file)
index 3372bf5..0000000
--- a/target/linux/bcm53xx/patches-3.18/410-mtd-bcm47xxpart-alloc-memory-for-more-partitions.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6b833541d73894b5afd40d69949f8f6099db2abf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Thu, 2 Oct 2014 11:33:40 +0200
-Subject: [PATCH] mtd: bcm47xxpart: alloc memory for more partitions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is needed for some new Netgear devices (e.g. R6250).
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
----
- drivers/mtd/bcm47xxpart.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
---- a/drivers/mtd/bcm47xxpart.c
-+++ b/drivers/mtd/bcm47xxpart.c
-@@ -15,8 +15,12 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- 
--/* 10 parts were found on sflash on Netgear WNDR4500 */
--#define BCM47XXPART_MAX_PARTS         12
-+/*
-+ * NAND flash on Netgear R6250 was verified to contain 15 partitions.
-+ * This will result in allocating too big array for some old devices, but the
-+ * memory will be freed soon anyway (see mtd_device_parse_register).
-+ */
-+#define BCM47XXPART_MAX_PARTS         20
- 
- /*
-  * Amount of bytes we read when analyzing each block of flash memory.

diff --git a/target/linux/generic/patches-3.14/050-mtd-bcm47xxpart-backports-from-3.19.patch b/target/linux/generic/patches-3.14/050-mtd-bcm47xxpart-backports-from-3.19.patch
new file mode 100644 (file)
index 0000000..b2d53f9
--- /dev/null
+++ b/target/linux/generic/patches-3.14/050-mtd-bcm47xxpart-backports-from-3.19.patch
@@ -0,0 +1,50 @@
+--- a/drivers/mtd/bcm47xxpart.c
++++ b/drivers/mtd/bcm47xxpart.c
+@@ -15,8 +15,12 @@
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+ 
+-/* 10 parts were found on sflash on Netgear WNDR4500 */
+-#define BCM47XXPART_MAX_PARTS         12
++/*
++ * NAND flash on Netgear R6250 was verified to contain 15 partitions.
++ * This will result in allocating too big array for some old devices, but the
++ * memory will be freed soon anyway (see mtd_device_parse_register).
++ */
++#define BCM47XXPART_MAX_PARTS         20
+ 
+ /*
+  * Amount of bytes we read when analyzing each block of flash memory.
+@@ -168,18 +172,26 @@ static int bcm47xxpart_parse(struct mtd_
+                               i++;
+                       }
+ 
+-                      bcm47xxpart_add_part(&parts[curr_part++], "linux",
+-                                           offset + trx->offset[i], 0);
+-                      i++;
++                      if (trx->offset[i]) {
++                              bcm47xxpart_add_part(&parts[curr_part++],
++                                                   "linux",
++                                                   offset + trx->offset[i],
++                                                   0);
++                              i++;
++                      }
+ 
+                       /*
+                        * Pure rootfs size is known and can be calculated as:
+                        * 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",
+-                                           offset + trx->offset[i], 0);
+-                      i++;
++                      if (trx->offset[i]) {
++                              bcm47xxpart_add_part(&parts[curr_part++],
++                                                   "rootfs",
++                                                   offset + trx->offset[i],
++                                                   0);
++                              i++;
++                      }
+ 
+                       last_trx_part = curr_part - 1;
+ 

diff --git a/target/linux/generic/patches-3.14/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch b/target/linux/generic/patches-3.14/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch
index 8c6380318f8ffc46e0931b05d38af2f4be3a1518..4c4720341efe4d6afb516793fe63fde85f43ad9f 100644 (file)
--- a/target/linux/generic/patches-3.14/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch
+++ b/target/linux/generic/patches-3.14/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/bcm47xxpart.c
 +++ b/drivers/mtd/bcm47xxpart.c
-@@ -36,6 +36,7 @@
+@@ -40,6 +40,7 @@
  #define ML_MAGIC2                     0x26594131
  #define TRX_MAGIC                     0x30524448
  #define SQSH_MAGIC                    0x71736873      /* shsq */
@@ -8,7 +8,7 @@
  
  struct trx_header {
        uint32_t magic;
-@@ -46,7 +47,7 @@ struct trx_header {
+@@ -50,7 +51,7 @@ struct trx_header {
        uint32_t offset[3];
  } __packed;
  
@@ -17,7 +17,7 @@
                                 u64 offset, uint32_t mask_flags)
  {
        part->name = name;
-@@ -54,6 +55,26 @@ static void bcm47xxpart_add_part(struct
+@@ -58,6 +59,26 @@ static void bcm47xxpart_add_part(struct
        part->mask_flags = mask_flags;
  }
  
@@ -44,7 +44,7 @@
  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_
+@@ -151,6 +172,8 @@ static int bcm47xxpart_parse(struct mtd_
  
                /* TRX */
                if (buf[0x000 / 4] == TRX_MAGIC) {
@@ -53,14 +53,14 @@
                        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
+@@ -186,8 +209,9 @@ static int bcm47xxpart_parse(struct mtd_
                         * 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++;
- 
+                       if (trx->offset[i]) {
++                              name = bcm47xxpart_trx_data_part_name(master, offset + trx->offset[i]);
+                               bcm47xxpart_add_part(&parts[curr_part++],
+-                                                   "rootfs",
++                                                   name,
+                                                    offset + trx->offset[i],
+                                                    0);
+                               i++;

diff --git a/target/linux/generic/patches-3.18/040-mtd-bcm47xxpart-backports-from-3.19.patch b/target/linux/generic/patches-3.18/040-mtd-bcm47xxpart-backports-from-3.19.patch
new file mode 100644 (file)
index 0000000..b2d53f9
--- /dev/null
+++ b/target/linux/generic/patches-3.18/040-mtd-bcm47xxpart-backports-from-3.19.patch
@@ -0,0 +1,50 @@
+--- a/drivers/mtd/bcm47xxpart.c
++++ b/drivers/mtd/bcm47xxpart.c
+@@ -15,8 +15,12 @@
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+ 
+-/* 10 parts were found on sflash on Netgear WNDR4500 */
+-#define BCM47XXPART_MAX_PARTS         12
++/*
++ * NAND flash on Netgear R6250 was verified to contain 15 partitions.
++ * This will result in allocating too big array for some old devices, but the
++ * memory will be freed soon anyway (see mtd_device_parse_register).
++ */
++#define BCM47XXPART_MAX_PARTS         20
+ 
+ /*
+  * Amount of bytes we read when analyzing each block of flash memory.
+@@ -168,18 +172,26 @@ static int bcm47xxpart_parse(struct mtd_
+                               i++;
+                       }
+ 
+-                      bcm47xxpart_add_part(&parts[curr_part++], "linux",
+-                                           offset + trx->offset[i], 0);
+-                      i++;
++                      if (trx->offset[i]) {
++                              bcm47xxpart_add_part(&parts[curr_part++],
++                                                   "linux",
++                                                   offset + trx->offset[i],
++                                                   0);
++                              i++;
++                      }
+ 
+                       /*
+                        * Pure rootfs size is known and can be calculated as:
+                        * 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",
+-                                           offset + trx->offset[i], 0);
+-                      i++;
++                      if (trx->offset[i]) {
++                              bcm47xxpart_add_part(&parts[curr_part++],
++                                                   "rootfs",
++                                                   offset + trx->offset[i],
++                                                   0);
++                              i++;
++                      }
+ 
+                       last_trx_part = curr_part - 1;
+ 

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
index 8c6380318f8ffc46e0931b05d38af2f4be3a1518..4c4720341efe4d6afb516793fe63fde85f43ad9f 100644 (file)
--- 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
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/bcm47xxpart.c
 +++ b/drivers/mtd/bcm47xxpart.c
-@@ -36,6 +36,7 @@
+@@ -40,6 +40,7 @@
  #define ML_MAGIC2                     0x26594131
  #define TRX_MAGIC                     0x30524448
  #define SQSH_MAGIC                    0x71736873      /* shsq */
@@ -8,7 +8,7 @@
  
  struct trx_header {
        uint32_t magic;
-@@ -46,7 +47,7 @@ struct trx_header {
+@@ -50,7 +51,7 @@ struct trx_header {
        uint32_t offset[3];
  } __packed;
  
@@ -17,7 +17,7 @@
                                 u64 offset, uint32_t mask_flags)
  {
        part->name = name;
-@@ -54,6 +55,26 @@ static void bcm47xxpart_add_part(struct
+@@ -58,6 +59,26 @@ static void bcm47xxpart_add_part(struct
        part->mask_flags = mask_flags;
  }
  
@@ -44,7 +44,7 @@
  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_
+@@ -151,6 +172,8 @@ static int bcm47xxpart_parse(struct mtd_
  
                /* TRX */
                if (buf[0x000 / 4] == TRX_MAGIC) {
@@ -53,14 +53,14 @@
                        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
+@@ -186,8 +209,9 @@ static int bcm47xxpart_parse(struct mtd_
                         * 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++;
- 
+                       if (trx->offset[i]) {
++                              name = bcm47xxpart_trx_data_part_name(master, offset + trx->offset[i]);
+                               bcm47xxpart_add_part(&parts[curr_part++],
+-                                                   "rootfs",
++                                                   name,
+                                                    offset + trx->offset[i],
+                                                    0);
+                               i++;