Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753242AbbLJXEh (ORCPT ); Thu, 10 Dec 2015 18:04:37 -0500 Received: from proxima.lp0.eu ([81.2.80.65]:56977 "EHLO proxima.lp0.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750715AbbLJXEg (ORCPT ); Thu, 10 Dec 2015 18:04:36 -0500 From: Simon Arlott Subject: [PATCH linux-next (v2) 1/3] MIPS: bcm963xx: Add nvram structure To: David Woodhouse , Brian Norris , Florian Fainelli , Ralf Baechle , Kevin Cernekee Cc: Linux Kernel Mailing List , MTD Maling List , Jonas Gorski , bcm-kernel-feedback-list , MIPS Mailing List , linux-api@vger.kernel.org Message-ID: <566A04FB.7000104@simon.arlott.org.uk> Date: Thu, 10 Dec 2015 23:04:27 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2249 Lines: 80 The BCM963xx has multiple nvram variants across different SoCs with additional checksum fields added whenever the size of the nvram was extended. Signed-off-by: Simon Arlott --- 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 diff --git a/MAINTAINERS b/MAINTAINERS index 1354720..5d2272c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/include/uapi/linux/bcm963xx_nvram.h b/include/uapi/linux/bcm963xx_nvram.h new file mode 100644 index 0000000..470a4b9 --- /dev/null +++ b/include/uapi/linux/bcm963xx_nvram.h @@ -0,0 +1,39 @@ +#ifndef _UAPI__LINUX_BCM963XX_NVRAM_H__ +#define _UAPI__LINUX_BCM963XX_NVRAM_H__ + +#include +#include +#include + +#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__ */ -- 2.1.4 -- Simon Arlott -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/