From 50413a4e86234d14215bb52be0ccce63c34d5e6f Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 7 May 2010 11:48:15 +0000 Subject: 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 --- target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch | 2 +- target/linux/brcm47xx/patches-2.6.32/920-cache-wround.patch | 4 ++-- target/linux/brcm47xx/patches-2.6.33/150-cpu_fixes.patch | 2 +- target/linux/brcm47xx/patches-2.6.33/920-cache-wround.patch | 4 ++-- target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch | 2 +- target/linux/brcm47xx/patches-2.6.34/920-cache-wround.patch | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'target') diff --git a/target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch b/target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch index e6ac4c8e8..16bfd7fc6 100644 --- a/target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch +++ b/target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch @@ -7,7 +7,7 @@ +#ifdef CONFIG_BCM47XX +#include +#include -+#define BCM4710_DUMMY_RREG() ((void) *((u8 *) KSEG1ADDR(SSB_ENUM_BASE + SSB_IMSTATE))) ++#define BCM4710_DUMMY_RREG() ((void) *((u8 *) KSEG1ADDR(SSB_ENUM_BASE))) + +#define BCM4710_FILL_TLB(addr) (*(volatile unsigned long *)(addr)) +#define BCM4710_PROTECTED_FILL_TLB(addr) ({ unsigned long x; get_dbe(x, (volatile unsigned long *)(addr)); }) diff --git a/target/linux/brcm47xx/patches-2.6.32/920-cache-wround.patch b/target/linux/brcm47xx/patches-2.6.32/920-cache-wround.patch index 688d3e138..7b889d899 100644 --- a/target/linux/brcm47xx/patches-2.6.32/920-cache-wround.patch +++ b/target/linux/brcm47xx/patches-2.6.32/920-cache-wround.patch @@ -4,11 +4,11 @@ #ifdef CONFIG_BCM47XX #include #include --#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)) diff --git a/target/linux/brcm47xx/patches-2.6.33/150-cpu_fixes.patch b/target/linux/brcm47xx/patches-2.6.33/150-cpu_fixes.patch index 419861444..c073b3663 100644 --- a/target/linux/brcm47xx/patches-2.6.33/150-cpu_fixes.patch +++ b/target/linux/brcm47xx/patches-2.6.33/150-cpu_fixes.patch @@ -7,7 +7,7 @@ +#ifdef CONFIG_BCM47XX +#include +#include -+#define BCM4710_DUMMY_RREG() ((void) *((u8 *) KSEG1ADDR(SSB_ENUM_BASE + SSB_IMSTATE))) ++#define BCM4710_DUMMY_RREG() ((void) *((u8 *) KSEG1ADDR(SSB_ENUM_BASE))) + +#define BCM4710_FILL_TLB(addr) (*(volatile unsigned long *)(addr)) +#define BCM4710_PROTECTED_FILL_TLB(addr) ({ unsigned long x; get_dbe(x, (volatile unsigned long *)(addr)); }) 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 3edf04bf0..c5441f974 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 #include --#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)) diff --git a/target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch b/target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch index 56fdbbc62..f9fb25e71 100644 --- a/target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch +++ b/target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch @@ -7,7 +7,7 @@ +#ifdef CONFIG_BCM47XX +#include +#include -+#define BCM4710_DUMMY_RREG() ((void) *((u8 *) KSEG1ADDR(SSB_ENUM_BASE + SSB_IMSTATE))) ++#define BCM4710_DUMMY_RREG() ((void) *((u8 *) KSEG1ADDR(SSB_ENUM_BASE))) + +#define BCM4710_FILL_TLB(addr) (*(volatile unsigned long *)(addr)) +#define BCM4710_PROTECTED_FILL_TLB(addr) ({ unsigned long x; get_dbe(x, (volatile unsigned long *)(addr)); }) diff --git a/target/linux/brcm47xx/patches-2.6.34/920-cache-wround.patch b/target/linux/brcm47xx/patches-2.6.34/920-cache-wround.patch index a308335b5..6291a222d 100644 --- a/target/linux/brcm47xx/patches-2.6.34/920-cache-wround.patch +++ b/target/linux/brcm47xx/patches-2.6.34/920-cache-wround.patch @@ -4,11 +4,11 @@ #ifdef CONFIG_BCM47XX #include #include --#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)) -- cgit v1.2.3