[PATCH] drivers/firmware/broadcom/bcm47xx_nvram.c: fix incorrect __ioread32_copy

From	Aaro Koskinen <aaro.koskinen@iki.fi>
Newsgroups	linux.kernel
Subject	[PATCH] drivers/firmware/broadcom/bcm47xx_nvram.c: fix incorrect __ioread32_copy
Date	2016-03-15 22:50 +0100
Message-ID	<rd50K-7UJ-3@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Commit 1f330c327900 ("drivers/firmware/broadcom/bcm47xx_nvram.c: use
__ioread32_copy() instead of open-coding") switched to use a generic
copy functions, but failed to notice that the header pointer is
updated between the two copies, resulting in bogus data being copied
in the latter one. Fix by keeping the old header pointer as references
to iomem should be fine.

The patch fixes totally broken networking on WRL54GL router (both LAN
and WLAN interfaces fail to probe).

Fixes: 1f330c327900 ("drivers/firmware/broadcom/bcm47xx_nvram.c: use __ioread32_copy() instead of open-coding")
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
 drivers/firmware/broadcom/bcm47xx_nvram.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmware/broadcom/bcm47xx_nvram.c
index 0c2f0a6..7fe5bf2 100644
--- a/drivers/firmware/broadcom/bcm47xx_nvram.c
+++ b/drivers/firmware/broadcom/bcm47xx_nvram.c
@@ -94,7 +94,6 @@ 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;
 	if (nvram_len > size) {
 		pr_err("The nvram size according to the header seems to be bigger than the partition on flash\n");
-- 
2.7.2

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] drivers/firmware/broadcom/bcm47xx_nvram.c: fix incorrect __ioread32_copy Aaro Koskinen <aaro.koskinen@iki.fi> - 2016-03-15 22:50 +0100
  Re: [PATCH] drivers/firmware/broadcom/bcm47xx_nvram.c: fix incorrect  __ioread32_copy Stephen Boyd <sboyd@codeaurora.org> - 2016-03-15 23:20 +0100
    Re: [PATCH] drivers/firmware/broadcom/bcm47xx_nvram.c: fix incorrect  __ioread32_copy Aaro Koskinen <aaro.koskinen@iki.fi> - 2016-03-15 23:50 +0100

csiph-web