MIPS: BCM63XX: make nvram checksum failure non fatal
PATCH 1/1 MIPS: BCM63XX: make nvram checksum failure non fatal
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 <[email protected]>
Signed-off-by Jonas Gorski <[email protected]>
---
I'm not sure if it should be that "loud" (pr_warn) because users can't actually do anything to fix it, so maybe pr_debug would be fine, too.
arch/mips/bcm63xx/boards/board_bcm963xx.c | 5 +---- arch/mips/bcm63xx/nvram.c | 7 +++---- arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h | 4 +--- 3 files changed, 5 insertions(+), 11 deletions(-)
arch/mips/bcm63xx/boards/board_bcm963xx.c +1 -4
@@ -745,10 +745,7 @@ void __init board_prom_init(void)strcpy (cfe_version,"unknown" ); printk(KERN_INFO PFX "CFE version: %s\n", cfe_version); -if (bcm63xx_nvram_init (boot_addr +BCM963XX_NVRAM_OFFSET )) { - printk(KERN_ERR PFX "invalid nvram checksum\n"); -return ; - } +bcm63xx_nvram_init (boot_addr +BCM963XX_NVRAM_OFFSET ); board_name =bcm63xx_nvram_get_name ();/* find board by name */
arch/mips/bcm63xx/nvram.c +3 -4
@@ -38,7 +38,7 @@ struct bcm963xx_nvram {static struct bcm963xx_nvram nvram;static int mac_addr_used; -int __init bcm63xx_nvram_init (void *addr) +void __init bcm63xx_nvram_init (void *addr) {unsigned int check_len;u32 crc, expected_crc;
@@ -60,9 +60,8 @@ int __init bcm63xx_nvram_init(void *addr) crc =crc32_le (~0 , (u8 *)&nvram, check_len);if (crc != expected_crc) -return -EINVAL ; - -return 0 ; +pr_warn ("nvram checksum failed, contents may be invalid (expected %08x, got %08x)\n" , + expected_crc, crc); }u8 *bcm63xx_nvram_get_name (void )
arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h +1 -3
@@ -9,10 +9,8 @@* * Initialized the local nvram copy from the target address and checks * 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
Signature · 1 line
1.7.10.4