leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MIPS: BCM63XX: Make nvram checksum failure non fatal

Browse Source 
Some vendors modify the nvram layout moving the checksum to a different
place or dropping entirely, so reduce the checksum failure to a warning.

Reported-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Cc: linux-mips@linux-mips.org
Cc: John Crispin <blogic@openwrt.org>
Cc: Maxime Bizon <mbizon@freebox.fr>
Cc: Florian Fainelli <florian@openwrt.org>
Cc: Kevin Cernekee <cernekee@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Jonas Gorski 2013-03-19 13:08:27 +00:00 committed by Ralf Baechle
parent 63c2b6812f
commit 97367519d7
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/mips/bcm63xx/boards/board_bcm963xx.c
View File

@ -745,10 +745,7 @@ void __init board_prom_init(void)
strcpy(cfe_version, "unknown"); strcpy(cfe_version, "unknown");
printk(KERN_INFO PFX "CFE version: %s\n", cfe_version); printk(KERN_INFO PFX "CFE version: %s\n", cfe_version);
if (bcm63xx_nvram_init(boot_addr + BCM963XX_NVRAM_OFFSET)) { bcm63xx_nvram_init(boot_addr + BCM963XX_NVRAM_OFFSET);
printk(KERN_ERR PFX "invalid nvram checksum\n");
return;
}
board_name = bcm63xx_nvram_get_name(); board_name = bcm63xx_nvram_get_name();
/* find board by name */ /* find board by name */

7
arch/mips/bcm63xx/nvram.c
View File

@ -38,7 +38,7 @@ struct bcm963xx_nvram {
static struct bcm963xx_nvram nvram; static struct bcm963xx_nvram nvram;
static int mac_addr_used; static int mac_addr_used;
int __init bcm63xx_nvram_init(void *addr) void __init bcm63xx_nvram_init(void *addr)
{ {
unsigned int check_len; unsigned int check_len;
u32 crc, expected_crc; u32 crc, expected_crc;
@ -60,9 +60,8 @@ int __init bcm63xx_nvram_init(void *addr)
crc = crc32_le(~0, (u8 *)&nvram, check_len); crc = crc32_le(~0, (u8 *)&nvram, check_len);
if (crc != expected_crc) if (crc != expected_crc)
return -EINVAL; pr_warn("nvram checksum failed, contents may be invalid (expected %08x, got %08x)\n",
expected_crc, crc);
return 0;
} }
u8 *bcm63xx_nvram_get_name(void) u8 *bcm63xx_nvram_get_name(void)

4
arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h
View File

@ -9,10 +9,8 @@
* *
* Initialized the local nvram copy from the target address and checks * Initialized the local nvram copy from the target address and checks
* its checksum. * its checksum.
*
* Returns 0 on success.
*/ */
int __init bcm63xx_nvram_init(void *nvram); void bcm63xx_nvram_init(void *nvram);
/** /**
* bcm63xx_nvram_get_name() - returns the board name according to nvram * bcm63xx_nvram_get_name() - returns the board name according to nvram