mirror of
https://github.com/torvalds/linux
synced 2024-10-15 15:59:15 +00:00
MIPS: bcm63xx: nvram: Use nvram structure definition from header file
Use the common definition of the nvram structure from the header file include/linux/bcm963xx_nvram.h instead of maintaining a separate copy. Read the version 5 size of nvram data from memory and then call the new checksum verification function from the header file. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Brian Norris <computersforpeace@gmail.com> Cc: Kevin Cernekee <cernekee@gmail.com> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: Jonas Gorski <jogo@openwrt.org> Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org> Cc: MIPS Mailing List <linux-mips@linux-mips.org> Cc: MTD Maling List <linux-mtd@lists.infradead.org> Patchwork: https://patchwork.linux-mips.org/patch/11831/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
3271e61031
commit
5a8b0b13b6
|
@ -10,6 +10,7 @@
|
||||||
|
|
||||||
#define pr_fmt(fmt) "bcm63xx_nvram: " fmt
|
#define pr_fmt(fmt) "bcm63xx_nvram: " fmt
|
||||||
|
|
||||||
|
#include <linux/bcm963xx_nvram.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/crc32.h>
|
#include <linux/crc32.h>
|
||||||
#include <linux/export.h>
|
#include <linux/export.h>
|
||||||
|
@ -18,23 +19,6 @@
|
||||||
|
|
||||||
#include <bcm63xx_nvram.h>
|
#include <bcm63xx_nvram.h>
|
||||||
|
|
||||||
/*
|
|
||||||
* nvram structure
|
|
||||||
*/
|
|
||||||
struct bcm963xx_nvram {
|
|
||||||
u32 version;
|
|
||||||
u8 reserved1[256];
|
|
||||||
u8 name[16];
|
|
||||||
u32 main_tp_number;
|
|
||||||
u32 psi_size;
|
|
||||||
u32 mac_addr_count;
|
|
||||||
u8 mac_addr_base[ETH_ALEN];
|
|
||||||
u8 reserved2[2];
|
|
||||||
u32 checksum_old;
|
|
||||||
u8 reserved3[720];
|
|
||||||
u32 checksum_high;
|
|
||||||
};
|
|
||||||
|
|
||||||
#define BCM63XX_DEFAULT_PSI_SIZE 64
|
#define BCM63XX_DEFAULT_PSI_SIZE 64
|
||||||
|
|
||||||
static struct bcm963xx_nvram nvram;
|
static struct bcm963xx_nvram nvram;
|
||||||
|
@ -42,27 +26,14 @@ static int mac_addr_used;
|
||||||
|
|
||||||
void __init bcm63xx_nvram_init(void *addr)
|
void __init bcm63xx_nvram_init(void *addr)
|
||||||
{
|
{
|
||||||
unsigned int check_len;
|
|
||||||
u32 crc, expected_crc;
|
u32 crc, expected_crc;
|
||||||
u8 hcs_mac_addr[ETH_ALEN] = { 0x00, 0x10, 0x18, 0xff, 0xff, 0xff };
|
u8 hcs_mac_addr[ETH_ALEN] = { 0x00, 0x10, 0x18, 0xff, 0xff, 0xff };
|
||||||
|
|
||||||
/* extract nvram data */
|
/* extract nvram data */
|
||||||
memcpy(&nvram, addr, sizeof(nvram));
|
memcpy(&nvram, addr, BCM963XX_NVRAM_V5_SIZE);
|
||||||
|
|
||||||
/* check checksum before using data */
|
/* check checksum before using data */
|
||||||
if (nvram.version <= 4) {
|
if (bcm963xx_nvram_checksum(&nvram, &expected_crc, &crc))
|
||||||
check_len = offsetof(struct bcm963xx_nvram, reserved3);
|
|
||||||
expected_crc = nvram.checksum_old;
|
|
||||||
nvram.checksum_old = 0;
|
|
||||||
} else {
|
|
||||||
check_len = sizeof(nvram);
|
|
||||||
expected_crc = nvram.checksum_high;
|
|
||||||
nvram.checksum_high = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
crc = crc32_le(~0, (u8 *)&nvram, check_len);
|
|
||||||
|
|
||||||
if (crc != expected_crc)
|
|
||||||
pr_warn("nvram checksum failed, contents may be invalid (expected %08x, got %08x)\n",
|
pr_warn("nvram checksum failed, contents may be invalid (expected %08x, got %08x)\n",
|
||||||
expected_crc, crc);
|
expected_crc, crc);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue