From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 11 Dec 2015 22:56:21 +0100 (CET) Received: from proxima.lp0.eu ([81.2.80.65]:54019 "EHLO proxima.lp0.eu" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S27008262AbbLKV4U1meyc (ORCPT ); Fri, 11 Dec 2015 22:56:20 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=fire.lp0.eu; s=exim; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:MIME-Version:Date:Message-ID:From:Cc:References:To:Subject; bh=pOvvj9qEgpE5ATDrTqHgQceXIYEF7wMhIboyggqPnbs=; b=Zk7YJLYh/S3PuSz+Rt0l1qI8VHoUNQRe9PKuzFcnh30gNC/iH/FMLAgLu55nRFhB0/XaSjU9EIUC2qA6bC51N6xscVqC92rRMnWziQ4m6J4VGMW3fsOq9nz2cL4MGrlug2F7SqhooVTRVayhCQ0bkOVxwnqCNxJPvw+MaWIN60Gfb0cgzF6+GUJtCaXwgBCJGgLMwM3/WGPxORzRgNUUEFmD2LWs3iSE6uZg1Ekk/2FU+0xq7WzlJDkRx4qY0Aj7ozzotHppyo3yzDK18UWbPu7HtC2w1a9YBGdGpNT83qM9jwI0AM0qK+MpfHH936iPxv2cF0ow5K4nfV025DNOlA==; Received: from redrum.lp0.eu ([2001:8b0:ffea:0:2e0:81ff:fe4d:2bec]:35158 ident=simon) by proxima.lp0.eu ([2001:8b0:ffea:0:205:b4ff:fe12:530]:465) with esmtpsav (UNKNOWN:DHE-RSA-AES256-SHA:256/CN=Simon Arlott) id 1a7Vfm-0005Cz-4H (Exim); Fri, 11 Dec 2015 21:56:19 +0000 Subject: [PATCH linux-next (v3) 2/3] MIPS: bcm63xx: nvram: Use nvram structure definition from header file To: David Woodhouse , Brian Norris , Florian Fainelli , Ralf Baechle , Kevin Cernekee References: <566B460F.1040603@simon.arlott.org.uk> Cc: Linux Kernel Mailing List , MTD Maling List , Jonas Gorski , bcm-kernel-feedback-list , MIPS Mailing List , linux-api@vger.kernel.org From: Simon Arlott Message-ID: <566B4681.7030904@simon.arlott.org.uk> Date: Fri, 11 Dec 2015 21:56:17 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <566B460F.1040603@simon.arlott.org.uk> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 50554 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: simon@fire.lp0.eu Precedence: bulk List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: linux-mips X-List-ID: linux-mips List-subscribe: List-owner: List-post: List-archive: X-list: linux-mips 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(&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); -- 2.1.4 -- Simon Arlott