fix NVRAM partition size if larger than expected
Subsystems (2)
cover fix NVRAM partition size if larger than expected
Some device vendors use a larger nvram size than expected. While Broadcom has defined it as 64K max, devices with 128K have been seen in the wild. Luckily they properly set the nvram's PSI size to the correct value, so we can use that to size the nvram partion.
Yes it's a bit confusing as there are two nvrams, one with a fixed layout with in the bootloader, with the size information about the other.
Since 2 of 3 patches are for the mtd tree, this patchset should go there (but it applies to both l2-mtd and mips-next fine).
Jonas Gorski (3):
MTD: bcm63xxpart: use size macro for CFE block size
MIPS: BCM63XX: export PSI size from nvram
MTD: bcm63xxpart: use nvram for PSI size
arch/mips/bcm63xx/nvram.c | 11 +++++++++++ arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h | 2 ++ drivers/mtd/bcm63xxpart.c | 9 ++++++--- 3 files changed, 19 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.10.4
PATCH 1/3 MTD: bcm63xxpart: use size macro for CFE block size
--- drivers/mtd/bcm63xxpart.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mtd/bcm63xxpart.c +2 -1
@@ -27,6 +27,7 @@#include <linux/crc32.h> #include <linux/module.h> #include <linux/kernel.h> +#include <linux/sizes.h> #include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/mtd/mtd.h>
@@ -37,7 +38,7 @@#define BCM63XX_EXTENDED_SIZE 0xBFC00000/* Extended flash address */ -#define BCM63XX_CFE_BLOCK_SIZE 0x10000/* always at least 64KiB */ +#define BCM63XX_CFE_BLOCK_SIZE SZ_64K/* always at least 64KiB */ #define BCM63XX_CFE_MAGIC_OFFSET 0x4e0
Signature · 1 line
1.7.10.4
PATCH 2/3 MIPS: BCM63XX: export PSI size from nvram
In reply to Jonas Gorski--- arch/mips/bcm63xx/nvram.c | 11 +++++++++++ arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h | 2 ++ 2 files changed, 13 insertions(+)
arch/mips/bcm63xx/nvram.c +11 -0
@@ -35,6 +35,8 @@ struct bcm963xx_nvram {u32 checksum_high; }; +#define BCM63XX_DEFAULT_PSI_SIZE 64 +static struct bcm963xx_nvram nvram;static int mac_addr_used;
@@ -105,3 +107,12 @@ int bcm63xx_nvram_get_mac_address(u8 *mac)return 0 ; }EXPORT_SYMBOL (bcm63xx_nvram_get_mac_address); + +int bcm63xx_nvram_get_psi_size (void ) +{ +if (nvram.psi_size >0 ) +return nvram.psi_size; + +return BCM63XX_DEFAULT_PSI_SIZE ; +} +EXPORT_SYMBOL (bcm63xx_nvram_get_psi_size);
arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h +2 -0
@@ -32,4 +32,6 @@ u8 *bcm63xx_nvram_get_name(void);*/ int bcm63xx_nvram_get_mac_address (u8 *mac); +int bcm63xx_nvram_get_psi_size (void ); +#endif /* BCM63XX_NVRAM_H */
Signature · 1 line
1.7.10.4
Re: [PATCH 2/3] MIPS: BCM63XX: export PSI size from nvram
Hello Jonas,
A few minor comments below:
Quoted 20 lines · Jonas Gorski
Signed-off-by Jonas Gorski <[email protected]>--- arch/mips/bcm63xx/nvram.c | 11 +++++++++++ arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h | 2 ++ 2 files changed, 13 insertions(+)arch/mips/bcm63xx/nvram.c +2
-0@@ -35,6 +35,8 @@ struct bcm963xx_nvram {u32 checksum_high; }; +#define BCM63XX_DEFAULT_PSI_SIZE 64 +static struct bcm963xx_nvram nvram;static int mac_addr_used;
arch/mips/bcm63xx/nvram.c int bcm63xx_nvram_get_mac_address(u8 *mac) · line 116
Quoted 10 lines
arch/mips/bcm63xx/nvram.c +7
-0@@ -105,3 +107,12 @@ int bcm63xx_nvram_get_mac_address(u8 *mac)return 0 ; }EXPORT_SYMBOL (bcm63xx_nvram_get_mac_address); + +int bcm63xx_nvram_get_psi_size (void ) +{ +if (nvram.psi_size >0 ) +return nvram.psi_size; + +return BCM63XX_DEFAULT_PSI_SIZE ;
I wonder if it would not be better to return a size in KBytes here instead of a multiple of KBytes?
arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h u8 *bcm63xx_nvram_get_name(void); · line 35
Quoted 12 lines
arch/mips/bcm63xx/nvram.c +2
-0+} +EXPORT_SYMBOL (bcm63xx_nvram_get_psi_size);(quoted diff) +0
-0
b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.hindex 62d6a3b..d76a486 100644arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h +1
-0@@ -32,4 +32,6 @@ u8 *bcm63xx_nvram_get_name(void);*/ int bcm63xx_nvram_get_mac_address (u8 *mac); +int bcm63xx_nvram_get_psi_size (void );
You could use an unsigned int here.
Signature · 1 line
Florian
Re: [PATCH 2/3] MIPS: BCM63XX: export PSI size from nvram
In reply to Jonas GorskiQuoted 5 lines · Jonas Gorski
Signed-off-by Jonas Gorski <[email protected]>--- arch/mips/bcm63xx/nvram.c | 11 +++++++++++ arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h | 2 ++ 2 files changed, 13 insertions(+)
Acks from MIPS folks would be nice to have, but I pushed this patch to the l2-mtd.git tree, thanks!
Signature · 2 lines
Best Regards, Artem Bityutskiy
Re: [PATCH 2/3] MIPS: BCM63XX: export PSI size from nvram
Quoted 9 lines · Artem Bityutskiy
Quoted 5 lines · Jonas Gorski
Signed-off-by Jonas Gorski <[email protected]>--- arch/mips/bcm63xx/nvram.c | 11 +++++++++++ arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h | 2 ++ 2 files changed, 13 insertions(+)Acks from MIPS folks would be nice to have, but I pushed this patch to the l2-mtd.git tree, thanks!
I had expected Florian's valid comment from preventing this series from going in, but if you pushed it already then I will fix the return type problem that Florian pointed out in a separate patch (or rather add add some range check for nvram.psi_size). Luckily it is a theoretical issue only, as I haven't seen a device yet with an invalid value.
Regards
Jonas
Re: [PATCH 2/3] MIPS: BCM63XX: export PSI size from nvram
Quoted 11 lines · Jonas Gorski
Quoted 9 lines · Artem Bityutskiy
Quoted 5 lines · Jonas Gorski
Signed-off-by Jonas Gorski <[email protected]>--- arch/mips/bcm63xx/nvram.c | 11 +++++++++++ arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h | 2 ++ 2 files changed, 13 insertions(+)Acks from MIPS folks would be nice to have, but I pushed this patch to the l2-mtd.git tree, thanks!
Quoted 6 lines
I had expected Florian's valid comment from preventing this series from going in, but if you pushed it already then I will fix the return type problem that Florian pointed out in a separate patch (or rather add add some range check for nvram.psi_size). Luckily it is a theoretical issue only, as I haven't seen a device yet with an invalid value.
Right, but this is no blocker from my perspective. As about the MIPS folks, Maxime, Kevin, Jonas and myself have been the "historical" contributors to the MIPS BCM63XX port, so I would consider Jonas to be authoritave here for these paches. John and Ralf usually do not comment unless the see something bad. --
Florian
PATCH 3/3 MTD: bcm63xxpart: use nvram for PSI size
In reply to Jonas GorskiRead out the SPI size from nvram instead of defaulting to 64K - some vendors actually use values larger than the "max" value of 64.
--- drivers/mtd/bcm63xxpart.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/mtd/bcm63xxpart.c +4 -2
@@ -4,7 +4,7 @@* Copyright © 2006-2008 Florian Fainelli <[email protected]> * Mike Albon <[email protected]> * Copyright © 2009-2010 Daniel Dickinson <[email protected]> -* Copyright © 2011-2012 Jonas Gorski <[email protected]> +* Copyright © 2011-2013 Jonas Gorski <[email protected]> * * 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 ));
Signature · 1 line
1.7.10.4
Quoted 10 lines · Jonas Gorski
Some device vendors use a larger nvram size than expected. While Broadcom has defined it as 64K max, devices with 128K have been seen in the wild. Luckily they properly set the nvram's PSI size to the correct value, so we can use that to size the nvram partion.
Yes it's a bit confusing as there are two nvrams, one with a fixed layout with in the bootloader, with the size information about the other.
Since 2 of 3 patches are for the mtd tree, this patchset should go there (but it applies to both l2-mtd and mips-next fine).
Besides the minor nitpicks from patch 2, this serie looks good:
Thanks!
Signature · 1 line
Florian
Quoted 10 lines · Jonas Gorski
Some device vendors use a larger nvram size than expected. While Broadcom has defined it as 64K max, devices with 128K have been seen in the wild. Luckily they properly set the nvram's PSI size to the correct value, so we can use that to size the nvram partion.
Yes it's a bit confusing as there are two nvrams, one with a fixed layout with in the bootloader, with the size information about the other.
Since 2 of 3 patches are for the mtd tree, this patchset should go there (but it applies to both l2-mtd and mips-next fine).
Pushed all 3 to l2-mtd.git, thanks!
Signature · 2 lines
Best Regards, Artem Bityutskiy