aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.8/024-Revert-mtd-bcm47xxpart-improve-probing-of-nvram-part.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-03-09 19:48:03 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-03-09 19:48:03 +0000
commit44ed7d664afefa70df85247516846752c88140c0 (patch)
tree74a8f294a0d8c6fd1a4e333e4c87ae4ed386e9fb /target/linux/brcm47xx/patches-3.8/024-Revert-mtd-bcm47xxpart-improve-probing-of-nvram-part.patch
parent694050a4cf932b71e4d9ccdbe36927b16e047f55 (diff)
downloadupstream-44ed7d664afefa70df85247516846752c88140c0.tar.gz
upstream-44ed7d664afefa70df85247516846752c88140c0.tar.bz2
upstream-44ed7d664afefa70df85247516846752c88140c0.zip
brcm47xx: add some more partition parser fixes by Rafał Miłecki
SVN-Revision: 35912
Diffstat (limited to 'target/linux/brcm47xx/patches-3.8/024-Revert-mtd-bcm47xxpart-improve-probing-of-nvram-part.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.8/024-Revert-mtd-bcm47xxpart-improve-probing-of-nvram-part.patch61
1 files changed, 61 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.8/024-Revert-mtd-bcm47xxpart-improve-probing-of-nvram-part.patch b/target/linux/brcm47xx/patches-3.8/024-Revert-mtd-bcm47xxpart-improve-probing-of-nvram-part.patch
new file mode 100644
index 0000000000..0fc78c5355
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.8/024-Revert-mtd-bcm47xxpart-improve-probing-of-nvram-part.patch
@@ -0,0 +1,61 @@
+--- a/drivers/mtd/bcm47xxpart.c
++++ b/drivers/mtd/bcm47xxpart.c
+@@ -19,6 +19,12 @@
+ /* 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 */
+@@ -57,17 +63,14 @@ static int bcm47xxpart_parse(struct mtd_
+ 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(max_bytes_to_read, GFP_KERNEL);
++ buf = kzalloc(BCM47XXPART_BYTES_TO_READ, GFP_KERNEL);
+
+ /* Parse block by block looking for magics */
+ for (offset = 0; offset <= master->size - blocksize;
+@@ -82,7 +85,7 @@ static int bcm47xxpart_parse(struct mtd_
+ }
+
+ /* Read beginning of the block */
+- if (mtd_read(master, offset, max_bytes_to_read,
++ if (mtd_read(master, offset, BCM47XXPART_BYTES_TO_READ,
+ &bytes_read, (uint8_t *)buf) < 0) {
+ pr_err("mtd_read error while parsing (offset: 0x%X)!\n",
+ offset);
+@@ -97,16 +100,9 @@ static int bcm47xxpart_parse(struct mtd_
+ }
+
+ /* Standard NVRAM */
+- 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))) {
++ if (buf[0x000 / 4] == NVRAM_HEADER) {
+ bcm47xxpart_add_part(&parts[curr_part++], "nvram",
+ offset, 0);
+- offset = rounddown(offset, blocksize);
+ continue;
+ }
+