diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-12-01 18:05:08 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-12-01 18:05:08 +0000 |
| commit | cb2d9fe2a91200f94a702e894e6a5d24a4aba020 (patch) | |
| tree | 0eb2b571d8b32bb9462941609ae0fad7a9dfbf63 | |
| parent | 3d36f4e3de17ca0e26af37d74392046cf4e0d7c2 (diff) | |
brcm47xx: deactivate mips wait instruction only for BCM4706
The wait instruction is only broken on the BCM4706 and not on the other
similar SoCs.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38979 3c298f89-4303-0410-b956-a3cf2f4a3e73
3 files changed, 27 insertions, 13 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch b/target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch index 7715cf2bbc..c585faf8bb 100644 --- a/target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch +++ b/target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch @@ -1,12 +1,26 @@ ---- a/arch/mips/kernel/idle.c -+++ b/arch/mips/kernel/idle.c -@@ -188,9 +188,6 @@ void __init check_wait(void) - break; +--- a/arch/mips/bcm47xx/setup.c ++++ b/arch/mips/bcm47xx/setup.c +@@ -35,6 +35,7 @@ + #include <asm/prom.h> + #include <asm/reboot.h> + #include <asm/time.h> ++#include <asm/idle.h> + #include <bcm47xx.h> + #include <bcm47xx_nvram.h> + #include <bcm47xx_board.h> +@@ -214,6 +215,15 @@ static void __init bcm47xx_register_bcma + panic("Failed to initialize BCMA bus (err %d)", err); - case CPU_74K: -- cpu_wait = r4k_wait; -- if ((c->processor_id & 0xff) >= PRID_REV_ENCODE_332(2, 1, 0)) -- cpu_wait = r4k_wait_irqoff; - break; + bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL); ++ ++ /* The BCM4706 has a problem with the CPU wait instruction. ++ * When r4k_wait or r4k_wait_irqoff is used will just hang and ++ * not return from a msleep(). Removing the cpu_wait ++ * functionality is a workaround for this problem. The BCM4716 ++ * does not have this problem. ++ */ ++ if (bcm47xx_bus.bcma.bus.chipinfo.id == BCMA_CHIP_ID_BCM4706) ++ cpu_wait = NULL; + } + #endif - case CPU_TX49XX: diff --git a/target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch b/target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch index 2ff649dde5..4cae1eac75 100644 --- a/target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch +++ b/target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch @@ -8,7 +8,7 @@ #include <asm/bootinfo.h> #include <asm/prom.h> #include <asm/reboot.h> -@@ -244,6 +245,33 @@ void __init plat_mem_setup(void) +@@ -254,6 +255,33 @@ void __init plat_mem_setup(void) mips_set_machine_name(bcm47xx_board_get_name()); } @@ -42,7 +42,7 @@ static int __init bcm47xx_register_bus_complete(void) { switch (bcm47xx_bus_type) { -@@ -258,6 +286,8 @@ static int __init bcm47xx_register_bus_c +@@ -268,6 +296,8 @@ static int __init bcm47xx_register_bus_c break; #endif } diff --git a/target/linux/brcm47xx/patches-3.10/980-wnr834b_no_cardbus_invariant.patch b/target/linux/brcm47xx/patches-3.10/980-wnr834b_no_cardbus_invariant.patch index 069a0fa7a2..f30a4fbd75 100644 --- a/target/linux/brcm47xx/patches-3.10/980-wnr834b_no_cardbus_invariant.patch +++ b/target/linux/brcm47xx/patches-3.10/980-wnr834b_no_cardbus_invariant.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c -@@ -121,6 +121,10 @@ static int bcm47xx_get_invariants(struct +@@ -122,6 +122,10 @@ static int bcm47xx_get_invariants(struct if (bcm47xx_nvram_getenv("cardbus", buf, sizeof(buf)) >= 0) iv->has_cardbus_slot = !!simple_strtoul(buf, NULL, 10); |