1 files changed, 51 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.18/031-03-MIPS-BCM47XX-Use-helpers-for-reading-NVRAM-content.patch b/target/linux/brcm47xx/patches-3.18/031-03-MIPS-BCM47XX-Use-helpers-for-reading-NVRAM-content.patch
new file mode 100644
index 0000000..9c9865f
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.18/031-03-MIPS-BCM47XX-Use-helpers-for-reading-NVRAM-content.patch
@@ -0,0 +1,51 @@
+From 23d2bc42aceb829eaf90c694941e4523c22865e8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
+Date: Wed, 10 Dec 2014 11:49:53 +0100
+Subject: [PATCH] MIPS: BCM47XX: Use helpers for reading NVRAM content
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Also drop some unneeded memset-s.
+
+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+Cc: Hauke Mehrtens <hauke@hauke-m.de>
+Cc: Paul Walmsley <paul@pwsan.com>
+Cc: linux-mips@linux-mips.org
+Patchwork: https://patchwork.linux-mips.org/patch/8661/
+Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+---
+ arch/mips/bcm47xx/nvram.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+--- a/arch/mips/bcm47xx/nvram.c
++++ b/arch/mips/bcm47xx/nvram.c
+@@ -91,7 +91,6 @@ static int nvram_find_and_copy(void __io
+ 	return -ENXIO;
+ 
+ found:
+-
+ 	if (header->len > size)
+ 		pr_err("The nvram size accoridng to the header seems to be bigger than the partition on flash\n");
+ 	if (header->len > NVRAM_SPACE)
+@@ -101,10 +100,9 @@ found:
+ 	src = (u32 *) header;
+ 	dst = (u32 *) nvram_buf;
+ 	for (i = 0; i < sizeof(struct nvram_header); i += 4)
+-		*dst++ = *src++;
++		*dst++ = __raw_readl(src++);
+ 	for (; i < header->len && i < NVRAM_SPACE && i < size; i += 4)
+-		*dst++ = le32_to_cpu(*src++);
+-	memset(dst, 0x0, NVRAM_SPACE - i);
++		*dst++ = readl(src++);
+ 
+ 	return 0;
+ }
+@@ -165,7 +163,6 @@ static int nvram_init(void)
+ 			err = mtd_read(mtd, from, len, &bytes_read, dst);
+ 			if (err)
+ 				return err;
+-			memset(dst + bytes_read, 0x0, NVRAM_SPACE - bytes_read);
+ 
+ 			return 0;
+ 		}