MIPS: bcm963xx: Add nvram structure
Subsystems (3)
PATCH 1/3 MIPS: bcm963xx: Add nvram structure
The BCM963xx has multiple nvram variants across different SoCs with additional checksum fields added whenever the size of the nvram was extended.
---
v2: Use external struct bcm963xx_nvram definition for bcm963268part.
MAINTAINERS | 1 + include/uapi/linux/bcm963xx_nvram.h | 39 +++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 include/uapi/linux/bcm963xx_nvram.h
MAINTAINERS +1 -0
@@ -2396,6 +2396,7 @@ F: drivers/irqchip/irq-brcmstb* F: drivers/power/bcm6358* F: drivers/reset/bcm/reset-bcm6345* F: include/linux/bcm63xx_wdt.h +F: include/uapi/linux/bcm963xx_nvram.h BROADCOM TG3 GIGABIT ETHERNET DRIVER M: Prashant Sreedharan <prashant-dY08KVG/lbpWk0Htik3J/[email protected]>
include/uapi/linux/bcm963xx_nvram.h new file +39 -0
@@ -0,0 +1,39 @@ +#ifndef _UAPI__LINUX_BCM963XX_NVRAM_H__ +#define _UAPI__LINUX_BCM963XX_NVRAM_H__ + +#include <linux/sizes.h> +#include <linux/types.h> +#include <linux/if_ether.h> + +#define BCM963XX_NVRAM_V4_SIZE 300 +#define BCM963XX_NVRAM_V5_SIZE (1 * SZ_1K) +#define BCM963XX_NVRAM_V6_SIZE BCM963XX_NVRAM_V5_SIZE +#define BCM963XX_NVRAM_V7_SIZE (3 * SZ_1K) + +#define BCM963XX_NVRAM_NR_PARTS 5 + +struct bcm963xx_nvram { +u32 version; +char bootline[256 ]; +char name[16 ]; +u32 main_tp_number; +u32 psi_size; +u32 mac_addr_count; +u8 mac_addr_base[ETH_ALEN ]; +u8 __reserved1[2 ]; +u32 checksum_v4; + +u8 __reserved2[292 ]; +u32 nand_part_offset[BCM963XX_NVRAM_NR_PARTS ]; +u32 nand_part_size[BCM963XX_NVRAM_NR_PARTS ]; +u8 __reserved3[388 ]; +union { +u32 checksum_v5; +u32 checksum_v6; + }; + +u8 __reserved4[2044 ]; +u32 checksum_v7; +} __packed; + +#endif /* _UAPI__LINUX_BCM963XX_NVRAM_H__ */
Signature · 4 lines
2.1.4 -- Simon Arlott
PATCH 2/3 MIPS: bcm63xx: Use common nvram structure definition
Use an external common definition of the nvram structure.
---
Compile tested only (there is no support for brcmnand on mach-bcm63xx).
v2: Use external struct bcm963xx_nvram definition for bcm963268part.
arch/mips/bcm63xx/nvram.c | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-)
arch/mips/bcm63xx/nvram.c +8 -24
@@ -16,25 +16,9 @@#include <linux/kernel.h> #include <linux/if_ether.h> +#include <uapi/linux/bcm963xx_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 64static 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 (&nvram, addr,sizeof (nvram)); +memcpy (&nvram, 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 *)&nvram, check_len);
Signature · 4 lines
2.1.4 -- Simon Arlott
PATCH 3/3 mtd: part: Add BCM962368 CFE partitioning support
In reply to Simon ArlottAdd partitioning support for BCM963268 boards with CFE bootloaders. The following partitions are defined:
"boot": CFE and nvram data "rootfs": Currently selected rootfs "data": Configuration data
"rootfs1_update": Container for the whole flash area used
for the first rootfs to allow it to be updated.
"rootfs2_update": Container for the whole flash area used
for the second rootfs to allow it to be updated.
"rootfs_other": The other (not currently selected) rootfs
Example:
[ 1.904302] nand: device found, Manufacturer ID: 0xc2, Chip ID: 0xf1 [ 1.911000] nand: Macronix NAND 128MiB 3,3V 8-bit [ 1.915855] nand: 128 MiB, SLC, erase size: 128 KiB, page size: 2048, OOB size: 64 [ 1.923797] bcm6368_nand 10000200.nand: detected 128MiB total, 128KiB blocks, 2KiB pages, 16B OOB, 8-bit, Hamming ECC [ 1.936994] Bad block table found at page 65472, version 0x01 [ 1.944121] Bad block table found at page 65408, version 0x01 [ 1.951166] nand_read_bbt: bad block at 0x000007480000 [ 1.990043] bcm963268part: rootfs1: CFE boot tag found at 0x20000 with version 6, board type 963168VX and sequence number 2 [ 2.003060] bcm963268part: rootfs2: CFE boot tag found at 0x4000000 with version 6, board type 963168VX and sequence number 1 [ 2.015159] bcm963268part: CFE bootline selected latest image rootfs1 [ 2.022080] 6 bcm963268part partitions found on MTD device brcmnand.0 [ 2.042659] Creating 6 MTD partitions on "brcmnand.0": [ 2.048025] 0x000000000000-0x000000020000 : "boot" [ 2.062134] 0x000000040000-0x000001120000 : "rootfs" [ 2.077632] 0x000007b00000-0x000007f00000 : "data" [ 2.091363] 0x000000020000-0x000003ac0000 : "rootfs1_update" [ 2.106228] 0x000004000000-0x000007ac0000 : "rootfs2_update" [ 2.121093] 0x000004020000-0x000005060000 : "rootfs_other"
The nvram contains the offset and size of the boot, rootfs1, rootfs2 and data partitions. The presence of CFE and nvram is verified by reading from the boot partition which is assumed to be at offset 0 and the process aborts if the nvram read indicates that this is not the case.
There is bcm_tag information at the start of each rootfs that is used to determine which rootfs is newer and what its real offset/size is.
The CFE bootline is used to select a rootfs.
---
v2: Use external struct bcm963xx_nvram definition for bcm963268part.
Removed support for the nand partition number field, it's not a standard Broadcom field (was added by MitraStar Technology Corp.).
drivers/mtd/Kconfig | 21 +++ drivers/mtd/Makefile | 1 + drivers/mtd/bcm963268part.c | 326 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 348 insertions(+) create mode 100644 drivers/mtd/bcm963268part.c
drivers/mtd/Kconfig +21 -0
@@ -148,6 +148,27 @@ config MTD_BCM63XX_PARTS This provides partions parsing for BCM63xx devices with CFE bootloaders. +config MTD_BCM963268_PARTS + tristate "BCM963268 CFE partitioning support" + depends on BMIPS_GENERIC + select CRC32 + help + This provides partitions parsing for BCM963268 boards with CFE + bootloaders. The following partitions are defined: + "boot": CFE and nvram data + "rootfs": Currently selected rootfs + "data": Configuration data + "rootfs1_update": Container for the whole flash area used + for the first rootfs to allow it to be + updated. + "rootfs2_update": Container for the whole flash area used + for the second rootfs to allow it to be + updated. + "rootfs_other": The other (not currently selected) rootfs + + A decision is made regarding which of the two rootfs is to be + used based on the nvram data. + config MTD_BCM47XX_PARTS tristate "BCM47XX partitioning support" depends on BCM47XX || ARCH_BCM_5301X
drivers/mtd/Makefile +1 -0
@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o obj-$(CONFIG_MTD_AFS_PARTS) += afs.o obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o +obj-$(CONFIG_MTD_BCM963268_PARTS) += bcm963268part.o obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o # 'Users' - code which presents functionality to userspace.
drivers/mtd/bcm963268part.c new file +326 -0
326 lines not on this page · raw message
Signature · 4 lines
2.1.4 -- Simon Arlott
Re: [PATCH linux-next (v2) 3/3] mtd: part: Add BCM962368 CFE partitioning support
Quoted 62 lines · Simon Arlott
Add partitioning support for BCM963268 boards with CFE bootloaders. The following partitions are defined:
"boot": CFE and nvram data "rootfs": Currently selected rootfs "data": Configuration data"
rootfs1_update": Container for the whole flash area used
for the first rootfs to allow it to be updated.
"rootfs2_update": Container for the whole flash area used
for the second rootfs to allow it to be updated.
"rootfs_other": The other (not currently selected) rootfsExample:
[ 1.904302] nand: device found, Manufacturer ID: 0xc2, Chip ID: 0xf1 [ 1.911000] nand: Macronix NAND 128MiB 3,3V 8-bit [ 1.915855] nand: 128 MiB, SLC, erase size: 128 KiB, page size: 2048, OOB size: 64 [ 1.923797] bcm6368_nand 10000200.nand: detected 128MiB total, 128KiB blocks, 2KiB pages, 16B OOB, 8-bit, Hamming ECC [ 1.936994] Bad block table found at page 65472, version 0x01 [ 1.944121] Bad block table found at page 65408, version 0x01 [ 1.951166] nand_read_bbt: bad block at 0x000007480000 [ 1.990043] bcm963268part: rootfs1: CFE boot tag found at 0x20000 with version 6, board type 963168VX and sequence number 2 [ 2.003060] bcm963268part: rootfs2: CFE boot tag found at 0x4000000 with version 6, board type 963168VX and sequence number 1 [ 2.015159] bcm963268part: CFE bootline selected latest image rootfs1 [ 2.022080] 6 bcm963268part partitions found on MTD device brcmnand.0 [ 2.042659] Creating 6 MTD partitions on "brcmnand.0": [ 2.048025] 0x000000000000-0x000000020000 : "boot" [ 2.062134] 0x000000040000-0x000001120000 : "rootfs" [ 2.077632] 0x000007b00000-0x000007f00000 : "data" [ 2.091363] 0x000000020000-0x000003ac0000 : "rootfs1_update" [ 2.106228] 0x000004000000-0x000007ac0000 : "rootfs2_update" [ 2.121093] 0x000004020000-0x000005060000 : "rootfs_other"The nvram contains the offset and size of the boot, rootfs1, rootfs2 and data partitions. The presence of CFE and nvram is verified by reading from the boot partition which is assumed to be at offset 0 and the process aborts if the nvram read indicates that this is not the case.
There is
bcm_taginformation at the start of each rootfs that is used to determine which rootfs is newer and what its real offset/size is.The CFE bootline is used to select a rootfs.
Signed-off-by Simon Arlott <[email protected]>---
v2: Use external structbcm963xx_nvramdefinition for bcm963268part.Removed support for the nand partition number field, it's not a standard Broadcom field (was added by MitraStar Technology Corp.).
drivers/mtd/Kconfig | 21 +++ drivers/mtd/Makefile | 1 + drivers/mtd/bcm963268part.c | 326 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 348 insertions(+) create mode 100644 drivers/mtd/bcm963268part.cdrivers/mtd/Kconfig +0
-0
drivers/mtd/Kconfig config MTD_BCM63XX_PARTS · line 153
Quoted 6 lines
drivers/mtd/Kconfig +3
-0@@ -148,6 +148,27 @@ config MTD_BCM63XX_PARTS This provides partions parsing for BCM63xx devices with CFE bootloaders. +config MTD_BCM963268_PARTS + tristate "BCM963268 CFE partitioning support" + depends on BMIPS_GENERIC
It'd be nice if this didn't hard-depend on MIPS. Can we do COMPILE_TEST?
Quoted 39 lines
drivers/mtd/Kconfig +18
-0+ select CRC32 + help + This provides partitions parsing for BCM963268 boards with CFE + bootloaders. The following partitions are defined: + "boot": CFE and nvram data + "rootfs": Currently selected rootfs + "data": Configuration data + "rootfs1_update": Container for the whole flash area used + for the first rootfs to allow it to be + updated. + "rootfs2_update": Container for the whole flash area used + for the second rootfs to allow it to be + updated. + "rootfs_other": The other (not currently selected) rootfs + + A decision is made regarding which of the two rootfs is to be + used based on the nvram data. + config MTD_BCM47XX_PARTS tristate "BCM47XX partitioning support" depends on BCM47XX || ARCH_BCM_5301Xdrivers/mtd/Makefile +1
-0@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o obj-$(CONFIG_MTD_AFS_PARTS) += afs.o obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o +obj-$(CONFIG_MTD_BCM963268_PARTS) += bcm963268part.o obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o # 'Users' - code which presents functionality to userspace.drivers/mtd/bcm963268part.c new file +0
-0@@ -0,0 +1,326 @@
...
Quoted 25 lines
drivers/mtd/bcm963268part.c new file +25
-0+static bool bcm963268_parse_rootfs_tag (struct mtd_info *master, +const char *name,loff_t rootfs_part,u64 *rootfs_offset, +u64 *rootfs_size,unsigned int *rootfs_sequence) +{ +struct bcm_tag *buf; +int ret; +size_t retlen; +u32 computed_crc; +bool rootfs_ok = false; + + *rootfs_offset =0 ; + *rootfs_size =0 ; + *rootfs_sequence =0 ; + + buf =vmalloc (sizeof (struct bcm_tag )); +if (!buf) + goto out; + + ret =mtd_read (master, rootfs_part,sizeof (*buf), &retlen, (void *)buf); +if (ret <0 ) + goto out; + +if (retlen !=sizeof (*buf)) + goto out; +
drivers/mtd/bcm963268part.c line 164
Quoted 10 lines
drivers/mtd/bcm963268part.c new file +10
-0+ computed_crc =crc32_le (IMAGETAG_CRC_START , (u8 *)buf, + offsetof(struct bcm_tag , header_crc)); +if (computed_crc == buf->header_crc) { +char *board_id = &buf->board_id[0 ]; +char *tag_version = &buf->tag_version[0 ]; + +/* Get rootfs offset and size from tag data */ +kstrtou64 (buf->flash_image_start,10 , rootfs_offset); +kstrtou64 (buf->root_length,10 , rootfs_size); +kstrtouint (buf->dual_image,10 , rootfs_sequence);
drivers/mtd/bcm963268part.c: In function 'bcm963268_parse_rootfs_tag':drivers/mtd/bcm963268part.c:186:12: warning: ignoring return value of 'kstrtou64', declared with attribute warn_unused_result [-Wunused-result] drivers/mtd/bcm963268part.c:187:12: warning: ignoring return value of 'kstrtou64', declared with attribute warn_unused_result [-Wunused-result] drivers/mtd/bcm963268part.c:188:13: warning: ignoring return value of 'kstrtouint', declared with attribute warn_unused_result [-Wunused-result]
Fixing these warnings should improve your robustness against malformed input.
Quoted 12 lines
drivers/mtd/bcm963268part.c new file +12
-0+ +pr_info ("%s: CFE boot tag found at 0x%llx with version %s, board type %s and sequence number %u\n" , + name, rootfs_part, tag_version, board_id, + *rootfs_sequence); + +/* Adjust for flash offset */ + *rootfs_offset -=BCM63XX_EXTENDED_SIZE ; + +/* Remove bcm_tag data from length */ + *rootfs_size -= *rootfs_offset - rootfs_part; + + rootfs_ok = true;
drivers/mtd/bcm963268part.c line 186
Quoted 10 lines
drivers/mtd/bcm963268part.c new file +10
-0+ }else { +pr_warn ("%s: CFE boot tag at 0x%llx CRC invalid (expected %08x, actual %08x)\n" , + name, rootfs_part, buf->header_crc, computed_crc); + goto out; + } + +out: +vfree (buf); +return rootfs_ok; +}
Brian