mtd: bcm63xxpart: use nvram for PSI size

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=d085eea16c05e5fecf258fc254059e9bc1e6db91
Commit:     d085eea16c05e5fecf258fc254059e9bc1e6db91
Parent:     e60665c50f0d94c0f2696b19cad7d281b2bc00cf
Author:     Jonas Gorski <jogo at openwrt.org>
AuthorDate: Sat Mar 23 14:07:49 2013 +0100
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Mon Aug 5 18:59:34 2013 +0100

    mtd: bcm63xxpart: use nvram for PSI size
    
    Read out the SPI size from nvram instead of defaulting to 64KiB — some
    vendors actually use values larger than the "max" value of 64.
    
    Signed-off-by: Jonas Gorski <jogo at openwrt.org>
    Acked-by: Florian Fainelli <florian at openwrt.org>
    Signed-off-by: Artem Bityutskiy <artem.bityutskiy at linux.intel.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/bcm63xxpart.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/bcm63xxpart.c b/drivers/mtd/bcm63xxpart.c
index fc3d7d0..5c81390 100644
--- a/drivers/mtd/bcm63xxpart.c
+++ b/drivers/mtd/bcm63xxpart.c
@@ -4,7 +4,7 @@
  * Copyright © 2006-2008  Florian Fainelli <florian at openwrt.org>
  *			  Mike Albon <malbon at openwrt.org>
  * Copyright © 2009-2010  Daniel Dickinson <openwrt at cshore.neomailbox.net>
- * Copyright © 2011-2012  Jonas Gorski <jonas.gorski at gmail.com>
+ * Copyright © 2011-2013  Jonas Gorski <jonas.gorski at gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,6 +33,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 
+#include <asm/mach-bcm63xx/bcm63xx_nvram.h>
 #include <asm/mach-bcm63xx/bcm963xx_tag.h>
 #include <asm/mach-bcm63xx/board_bcm963xx.h>
 
@@ -91,7 +92,8 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info *master,
 			      BCM63XX_CFE_BLOCK_SIZE);
 
 	cfelen = cfe_erasesize;
-	nvramlen = cfe_erasesize;
+	nvramlen = bcm63xx_nvram_get_psi_size() * SZ_1K;
+	nvramlen = roundup(nvramlen, cfe_erasesize);
 
 	/* Allocate memory for buffer */
 	buf = vmalloc(sizeof(struct bcm_tag));