summaryrefslogtreecommitdiff
path: root/target/linux/brcm47xx/patches-2.6.33/920-cache-wround.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-05-07 11:48:15 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-05-07 11:48:15 +0000
commit50413a4e86234d14215bb52be0ccce63c34d5e6f (patch)
treeef1ee54e7289caf5594923ad9c7d2988705bd49a /target/linux/brcm47xx/patches-2.6.33/920-cache-wround.patch
parentfc23cd7aa9a29eef1c7e37fe12fcef5bbd3dc126 (diff)
brcm47xx: adjust the brcm4710 cache workaround code so that it does not break bcm4716 (patch by Bernhard Loos)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21395 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.33/920-cache-wround.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.33/920-cache-wround.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.33/920-cache-wround.patch b/target/linux/brcm47xx/patches-2.6.33/920-cache-wround.patch
index 3edf04bf05..c5441f9747 100644
--- a/target/linux/brcm47xx/patches-2.6.33/920-cache-wround.patch
+++ b/target/linux/brcm47xx/patches-2.6.33/920-cache-wround.patch
@@ -4,11 +4,11 @@
#ifdef CONFIG_BCM47XX
#include <asm/paccess.h>
#include <linux/ssb/ssb.h>
--#define BCM4710_DUMMY_RREG() ((void) *((u8 *) KSEG1ADDR(SSB_ENUM_BASE + SSB_IMSTATE)))
+-#define BCM4710_DUMMY_RREG() ((void) *((u8 *) KSEG1ADDR(SSB_ENUM_BASE)))
+#define BCM4710_DUMMY_RREG() bcm4710_dummy_rreg()
+
+static inline unsigned long bcm4710_dummy_rreg(void) {
-+ return (*(volatile unsigned long *)(KSEG1ADDR(SSB_ENUM_BASE + SSB_IMSTATE)));
++ return (*(volatile unsigned long *)(KSEG1ADDR(SSB_ENUM_BASE)));
+}
+
+#define BCM4710_FILL_TLB(addr) bcm4710_fill_tlb((void*)(addr))