Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d085eea1 authored by Jonas Gorski's avatar Jonas Gorski Committed by David Woodhouse
Browse files

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: default avatarJonas Gorski <jogo@openwrt.org>
Acked-by: default avatarFlorian Fainelli <florian@openwrt.org>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent e60665c5

drivers/mtd/bcm63xxpart.c

+4 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * Copyright © 2006-2008  Florian Fainelli <florian@openwrt.org>

 *			  Mike Albon <malbon@openwrt.org>

 * Copyright © 2009-2010  Daniel Dickinson <openwrt@cshore.neomailbox.net>

 * Copyright © 2011-2012  Jonas Gorski <jonas.gorski@gmail.com>

 * Copyright © 2011-2013  Jonas Gorski <jonas.gorski@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));