kernel: 3.14: update bcm47xxpart

It it used by brcm47xx and bcm53xx targets, so put patches in generic.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42212 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/bcm53xx/config-3.14 b/target/linux/bcm53xx/config-3.14
index 48759e9..6c54436 100644 (file)
--- a/target/linux/bcm53xx/config-3.14
+++ b/target/linux/bcm53xx/config-3.14
@@ -165,6 +165,7 @@ CONFIG_MDIO_BOARDINFO=y
 CONFIG_MIGHT_HAVE_PCI=y
 # CONFIG_MLX5_CORE is not set
 CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_MTD_BCM47XX_PARTS=y
 # CONFIG_MTD_PHYSMAP_OF is not set
 CONFIG_MULTI_IRQ_HANDLER=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y

diff --git a/target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch
index 086d7b3..0b3874b 100644 (file)
--- a/target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch
+++ b/target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/bcm47xxpart.c
 +++ b/drivers/mtd/bcm47xxpart.c
-@@ -68,6 +68,7 @@ static int bcm47xxpart_parse(struct mtd_
+@@ -89,6 +89,7 @@ static int bcm47xxpart_parse(struct mtd_
        int trx_part = -1;
        int last_trx_part = -1;
        int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, };
@@ -8,7 +8,7 @@
  
        if (blocksize <= 0x10000)
                blocksize = 0x10000;
-@@ -229,12 +230,23 @@ static int bcm47xxpart_parse(struct mtd_
+@@ -269,12 +270,23 @@ static int bcm47xxpart_parse(struct mtd_
                if (buf[0] == NVRAM_HEADER) {
                        bcm47xxpart_add_part(&parts[curr_part++], "nvram",
                                             master->size - blocksize, 0);

diff --git a/target/linux/generic/patches-3.14/048-mtd-bcm47xxpart-backports-from-3.16.patch b/target/linux/generic/patches-3.14/048-mtd-bcm47xxpart-backports-from-3.16.patch
new file mode 100644 (file)
index 0000000..540db6f
--- /dev/null
+++ b/target/linux/generic/patches-3.14/048-mtd-bcm47xxpart-backports-from-3.16.patch
@@ -0,0 +1,59 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -150,7 +150,7 @@ config MTD_BCM63XX_PARTS
+ 
+ config MTD_BCM47XX_PARTS
+       tristate "BCM47XX partitioning support"
+-      depends on BCM47XX
++      depends on BCM47XX || ARCH_BCM_5301X
+       help
+         This provides partitions parser for devices based on BCM47xx
+         boards.
+--- a/drivers/mtd/bcm47xxpart.c
++++ b/drivers/mtd/bcm47xxpart.c
+@@ -14,7 +14,6 @@
+ #include <linux/slab.h>
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+-#include <bcm47xx_nvram.h>
+ 
+ /* 10 parts were found on sflash on Netgear WNDR4500 */
+ #define BCM47XXPART_MAX_PARTS         12
+@@ -30,6 +29,7 @@
+ #define BOARD_DATA_MAGIC2             0xBD0D0BBD
+ #define CFE_MAGIC                     0x43464531      /* 1EFC */
+ #define FACTORY_MAGIC                 0x59544346      /* FCTY */
++#define NVRAM_HEADER                  0x48534C46      /* FLSH */
+ #define POT_MAGIC1                    0x54544f50      /* POTT */
+ #define POT_MAGIC2                    0x504f          /* OP */
+ #define ML_MAGIC1                     0x39685a42
+@@ -91,7 +91,7 @@ static int bcm47xxpart_parse(struct mtd_
+               if (offset >= 0x2000000)
+                       break;
+ 
+-              if (curr_part > BCM47XXPART_MAX_PARTS) {
++              if (curr_part >= BCM47XXPART_MAX_PARTS) {
+                       pr_warn("Reached maximum number of partitions, scanning stopped!\n");
+                       break;
+               }
+@@ -147,6 +147,11 @@ static int bcm47xxpart_parse(struct mtd_
+ 
+               /* TRX */
+               if (buf[0x000 / 4] == TRX_MAGIC) {
++                      if (BCM47XXPART_MAX_PARTS - curr_part < 4) {
++                              pr_warn("Not enough partitions left to register trx, scanning stopped!\n");
++                              break;
++                      }
++
+                       trx = (struct trx_header *)buf;
+ 
+                       trx_part = curr_part;
+@@ -212,7 +217,7 @@ static int bcm47xxpart_parse(struct mtd_
+ 
+       /* Look for NVRAM at the end of the last block. */
+       for (i = 0; i < ARRAY_SIZE(possible_nvram_sizes); i++) {
+-              if (curr_part > BCM47XXPART_MAX_PARTS) {
++              if (curr_part >= BCM47XXPART_MAX_PARTS) {
+                       pr_warn("Reached maximum number of partitions, scanning stopped!\n");
+                       break;
+               }

diff --git a/target/linux/generic/patches-3.14/049-mtd-bcm47xxpart-find-NVRAM-partitions-in-middle-bloc.patch b/target/linux/generic/patches-3.14/049-mtd-bcm47xxpart-find-NVRAM-partitions-in-middle-bloc.patch
new file mode 100644 (file)
index 0000000..48f8d36
--- /dev/null
+++ b/target/linux/generic/patches-3.14/049-mtd-bcm47xxpart-find-NVRAM-partitions-in-middle-bloc.patch
@@ -0,0 +1,19 @@
+--- a/drivers/mtd/bcm47xxpart.c
++++ b/drivers/mtd/bcm47xxpart.c
+@@ -199,6 +199,16 @@ static int bcm47xxpart_parse(struct mtd_
+                       continue;
+               }
+ 
++              /* New (ARM?) devices may have NVRAM in some middle block. Last
++               * block will be checked later, so skip it.
++               */
++              if (offset != master->size - blocksize &&
++                  buf[0x000 / 4] == NVRAM_HEADER) {
++                      bcm47xxpart_add_part(&parts[curr_part++], "nvram",
++                                           offset, 0);
++                      continue;
++              }
++
+               /* Read middle of the block */
+               if (mtd_read(master, offset + 0x8000, 0x4,
+                            &bytes_read, (uint8_t *)buf) < 0) {

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
new file mode 100644 (file)
index 0000000..8c63803
--- /dev/null
+++ b/target/linux/generic/patches-3.14/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++;
+