Merge tag 'for-linus-20130301' of git://git.infradead.org/linux-mtd

[karo-tx-linux.git] / drivers / mtd / bcm47xxpart.c

diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c
index 3411bc2a1482f350c9abadab43e721db4d98b307..63feb75cc8e01d2048949343955023b01fc7fadc 100644 (file)
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
@@ -14,17 +14,11 @@
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <asm/mach-bcm47xx/nvram.h>
+#include <bcm47xx_nvram.h>
 
 /* 10 parts were found on sflash on Netgear WNDR4500 */
 #define BCM47XXPART_MAX_PARTS          12
 
-/*
- * Amount of bytes we read when analyzing each block of flash memory.
- * Set it big enough to allow detecting partition and reading important data.
- */
-#define BCM47XXPART_BYTES_TO_READ      0x404
-
 /* Magics */
 #define BOARD_DATA_MAGIC               0x5246504D      /* MPFR */
 #define POT_MAGIC1                     0x54544f50      /* POTT */
@@ -59,15 +53,21 @@ static int bcm47xxpart_parse(struct mtd_info *master,
        uint32_t *buf;
        size_t bytes_read;
        uint32_t offset;
-       uint32_t blocksize = 0x10000;
+       uint32_t blocksize = master->erasesize;
        struct trx_header *trx;
        int trx_part = -1;
        int last_trx_part = -1;
+       int max_bytes_to_read = 0x8004;
+
+       if (blocksize <= 0x10000)
+               blocksize = 0x10000;
+       if (blocksize == 0x20000)
+               max_bytes_to_read = 0x18004;
 
        /* Alloc */
        parts = kzalloc(sizeof(struct mtd_partition) * BCM47XXPART_MAX_PARTS,
                        GFP_KERNEL);
-       buf = kzalloc(BCM47XXPART_BYTES_TO_READ, GFP_KERNEL);
+       buf = kzalloc(max_bytes_to_read, GFP_KERNEL);
 
        /* Parse block by block looking for magics */
        for (offset = 0; offset <= master->size - blocksize;
@@ -82,7 +82,7 @@ static int bcm47xxpart_parse(struct mtd_info *master,
                }
 
                /* Read beginning of the block */
-               if (mtd_read(master, offset, BCM47XXPART_BYTES_TO_READ,
+               if (mtd_read(master, offset, max_bytes_to_read,
                             &bytes_read, (uint8_t *)buf) < 0) {
                        pr_err("mtd_read error while parsing (offset: 0x%X)!\n",
                               offset);
@@ -97,9 +97,16 @@ static int bcm47xxpart_parse(struct mtd_info *master,
                }
 
                /* Standard NVRAM */
-               if (buf[0x000 / 4] == NVRAM_HEADER) {
+               if (buf[0x000 / 4] == NVRAM_HEADER ||
+                   buf[0x1000 / 4] == NVRAM_HEADER ||
+                   buf[0x8000 / 4] == NVRAM_HEADER ||
+                   (blocksize == 0x20000 && (
+                     buf[0x10000 / 4] == NVRAM_HEADER ||
+                     buf[0x11000 / 4] == NVRAM_HEADER ||
+                     buf[0x18000 / 4] == NVRAM_HEADER))) {
                        bcm47xxpart_add_part(&parts[curr_part++], "nvram",
                                             offset, 0);
+                       offset = rounddown(offset, blocksize);
                        continue;
                }