Date: Wed, 16 Mar 2016 00:42:13 +0200
From: Aaro Koskinen <aaro.koskinen@iki.fi>
To: Stephen Boyd <sboyd@codeaurora.org>
Cc: =?utf-8?B?UmFmYcWCIE1pxYJlY2tp?= <zajec5@gmail.com>,
        Andrew Morton <akpm@linux-foundation.org>, linux-mips@linux-mips.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] drivers/firmware/broadcom/bcm47xx_nvram.c: fix incorrect
 __ioread32_copy
Message-ID: <20160315224213.GC10851@raspberrypi.musicnaut.iki.fi>
References: <1458078386-30254-1-git-send-email-aaro.koskinen@iki.fi>
 <20160315221324.GI25972@codeaurora.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20160315221324.GI25972@codeaurora.org>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1404
Lines: 36

Hi,

On Tue, Mar 15, 2016 at 03:13:24PM -0700, Stephen Boyd wrote:
> Ah sorry. That was a stupid mistake. But it might be bad to
> access header->len now because that's still some device memory
> and not the copy of the memory into ram anymore. How about
> this patch instead? Commit text and authorship can be the same as
> the original patch.
> 
> ---8<----
> diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmware/broadcom/bcm47xx_nvram.c
> index 0c2f0a61b0ea..0b631e5b5b84 100644
> --- a/drivers/firmware/broadcom/bcm47xx_nvram.c
> +++ b/drivers/firmware/broadcom/bcm47xx_nvram.c
> @@ -94,15 +94,14 @@ static int nvram_find_and_copy(void __iomem *iobase, u32 lim)
>  
>  found:
>  	__ioread32_copy(nvram_buf, header, sizeof(*header) / 4);
> -	header = (struct nvram_header *)nvram_buf;
> -	nvram_len = header->len;
> +	nvram_len = ((struct nvram_header *)(nvram_buf))->len;
>  	if (nvram_len > size) {
>  		pr_err("The nvram size according to the header seems to be bigger than the partition on flash\n");
>  		nvram_len = size;
>  	}
>  	if (nvram_len >= NVRAM_SPACE) {
>  		pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
> -		       header->len, NVRAM_SPACE - 1);
> +		       nvram_len, NVRAM_SPACE - 1);

I'm OK with this as well; I'll test this on my router (just to be sure :))
and send a v2.

Thanks,

A.