[PATCH linux-next (v3) 2/3] MIPS: bcm63xx: nvram: Use nvram structure definition from header file

[Simon Arlott]

Use the common definition of the nvram structure from the header file
include/uapi/linux/bcm963xx_nvram.h instead of maintaining a separate
copy.

Read the version 5 size of nvram data from memory and then support the
version 4 and version 5 variants of nvram data checksums.

Signed-off-by: Simon Arlott 
---
Compile tested only (there is no support for brcmnand on mach-bcm63xx).

v3: No changes (reworded commit message).

v2: Use external struct bcm963xx_nvram definition for bcm963268part.

 arch/mips/bcm63xx/nvram.c | 32 
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/arch/mips/bcm63xx/nvram.c b/arch/mips/bcm63xx/nvram.c
index 4b50d40..36e74f9 100644
--- a/arch/mips/bcm63xx/nvram.c
+++ b/arch/mips/bcm63xx/nvram.c
@@ -16,25 +16,9 @@
 #include 
 #include 
 
+#include 
 #include 
 
-/*
- * 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
 
 static struct bcm963xx_nvram nvram;
@@ -47,17 +31,17 @@ void __init bcm63xx_nvram_init(void *addr)
u8 hcs_mac_addr[ETH_ALEN] = { 0x00, 0x10, 0x18, 0xff, 0xff, 0xff };
 
/* extract nvram data */
-   memcpy(, addr, sizeof(nvram));
+   memcpy(, addr, BCM963XX_NVRAM_V5_SIZE);
 
/* check checksum before using data */
if (nvram.version <= 4) {
-   check_len = offsetof(struct bcm963xx_nvram, reserved3);
-   expected_crc = nvram.checksum_old;
-   nvram.checksum_old = 0;
+   check_len = BCM963XX_NVRAM_V4_SIZE;
+   expected_crc = nvram.checksum_v4;
+   nvram.checksum_v4 = 0;
} else {
-   check_len = sizeof(nvram);
-   expected_crc = nvram.checksum_high;
-   nvram.checksum_high = 0;
+   check_len = BCM963XX_NVRAM_V5_SIZE;
+   expected_crc = nvram.checksum_v5;
+   nvram.checksum_v5 = 0;
}
 
crc = crc32_le(~0, (u8 *), check_len);
-- 
2.1.4

-- 
Simon Arlott
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH linux-next (v3) 2/3] MIPS: bcm63xx: nvram: Use nvram structure definition from header file

[Simon Arlott]

Use the common definition of the nvram structure from the header file
include/uapi/linux/bcm963xx_nvram.h instead of maintaining a separate
copy.

Read the version 5 size of nvram data from memory and then support the
version 4 and version 5 variants of nvram data checksums.

Signed-off-by: Simon Arlott 
---
Compile tested only (there is no support for brcmnand on mach-bcm63xx).

v3: No changes (reworded commit message).

v2: Use external struct bcm963xx_nvram definition for bcm963268part.

 arch/mips/bcm63xx/nvram.c | 32 
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/arch/mips/bcm63xx/nvram.c b/arch/mips/bcm63xx/nvram.c
index 4b50d40..36e74f9 100644
--- a/arch/mips/bcm63xx/nvram.c
+++ b/arch/mips/bcm63xx/nvram.c
@@ -16,25 +16,9 @@
 #include 
 #include 
 
+#include 
 #include 
 
-/*
- * 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
 
 static struct bcm963xx_nvram nvram;
@@ -47,17 +31,17 @@ void __init bcm63xx_nvram_init(void *addr)
u8 hcs_mac_addr[ETH_ALEN] = { 0x00, 0x10, 0x18, 0xff, 0xff, 0xff };
 
/* extract nvram data */
-   memcpy(, addr, sizeof(nvram));
+   memcpy(, addr, BCM963XX_NVRAM_V5_SIZE);
 
/* check checksum before using data */
if (nvram.version <= 4) {
-   check_len = offsetof(struct bcm963xx_nvram, reserved3);
-   expected_crc = nvram.checksum_old;
-   nvram.checksum_old = 0;
+   check_len = BCM963XX_NVRAM_V4_SIZE;
+   expected_crc = nvram.checksum_v4;
+   nvram.checksum_v4 = 0;
} else {
-   check_len = sizeof(nvram);
-   expected_crc = nvram.checksum_high;
-   nvram.checksum_high = 0;
+   check_len = BCM963XX_NVRAM_V5_SIZE;
+   expected_crc = nvram.checksum_v5;
+   nvram.checksum_v5 = 0;
}
 
crc = crc32_le(~0, (u8 *), check_len);
-- 
2.1.4

-- 
Simon Arlott
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/