diff mbox

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

Message ID 1418060700-1977-1-git-send-email-zajec5@gmail.com
State Accepted
Commit 16bd87b3a352b536ffdd7325e3178c4231f3cbf7
Headers show

Commit Message

Rafał Miłecki Dec. 8, 2014, 5:45 p.m. UTC
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@gmail.com>
---
 drivers/mtd/bcm47xxpart.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

Brian Norris Jan. 7, 2015, 8:34 p.m. UTC | #1
On Mon, Dec 08, 2014 at 06:45:00PM +0100, Rafał Miłecki wrote:
> 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@gmail.com>

Applied to l2-mtd.git. Thanks.

Brian
diff mbox

Patch

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,