brcm47xx: deactivate mips wait instruction only for BCM4706

[openwrt.git] / target / linux / brcm47xx / patches-3.10 / 170-fix-74k-cpu.patch

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 7715cf2..c585faf 100644 (file)
--- 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: