mtd: bcm47xxpart: lower minimal blocksize to 4Ki (from 64Ki)

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=16bd87b3a352b536ffdd7325e3178c4231f3cbf7
Commit:     16bd87b3a352b536ffdd7325e3178c4231f3cbf7
Parent:     bd10c26a4efe23e97ee9878a825c7e7a3e594946
Author:     Rafał Miłecki <zajec5 at gmail.com>
AuthorDate: Mon Dec 8 18:45:00 2014 +0100
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Wed Jan 7 12:24:19 2015 -0800

    mtd: bcm47xxpart: lower minimal blocksize to 4Ki (from 64Ki)
    
    Some devices like Netgear WNR1000v3 or WGR614v10 have partitions aligned
    to 0x1000. Using bigger blocksize stopped us from detecting some parts.
    
    Signed-off-by: Rafał Miłecki <zajec5 at gmail.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/bcm47xxpart.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c
index 26a4a4a..4ad3928 100644
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
@@ -94,8 +94,12 @@ static int bcm47xxpart_parse(struct mtd_info *master,
 	int last_trx_part = -1;
 	int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, };
 
-	if (blocksize <= 0x10000)
-		blocksize = 0x10000;
+	/*
+	 * Some really old flashes (like AT45DB*) had smaller erasesize-s, but
+	 * partitions were aligned to at least 0x1000 anyway.
+	 */
+	if (blocksize < 0x1000)
+		blocksize = 0x1000;
 
 	/* Alloc */
 	parts = kzalloc(sizeof(struct mtd_partition) * BCM47XXPART_MAX_PARTS,