brcm47xx: fix reboot problem on BCM4705/BCM4785

[openwrt/svn-archive/archive.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 c585faf8bb74d5178eced3209cc608938648b961..2cdd887a182fc58fb945fa10abd8307e38971e06 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,6 +1,20 @@
+From fb143ba7f7cd215bc2fc34a478c4c0b6dc56e537 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Mon, 6 Jan 2014 14:51:59 +0100
+Subject: [PATCH] MIPS: BCM47XX: fix position of cpu_wait disabling
+
+The disabling of cpu_wait was done too early, before the detection was
+done. This moves the code to a position where it actually works.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+Acked-by: Rafa? Mi?ecki <zajec5@gmail.com>
+---
+ arch/mips/bcm47xx/setup.c |   34 +++++++++++++++++++++++++---------
+ 1 file changed, 25 insertions(+), 9 deletions(-)
+
 --- a/arch/mips/bcm47xx/setup.c
 +++ b/arch/mips/bcm47xx/setup.c
-@@ -35,6 +35,7 @@
+@@ -37,6 +37,7 @@
  #include <asm/prom.h>
  #include <asm/reboot.h>
  #include <asm/time.h>
@@ -8,19 +22,35 @@
  #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);
- 
-       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;
+@@ -243,6 +244,31 @@ void __init plat_mem_setup(void)
+       mips_set_machine_name(bcm47xx_board_get_name());
  }
- #endif
  
++static int __init bcm47xx_cpu_fixes(void)
++{
++      switch (bcm47xx_bus_type) {
++#ifdef CONFIG_BCM47XX_SSB
++      case BCM47XX_BUS_TYPE_SSB:
++              /* Nothing to do */
++              break;
++#endif
++#ifdef CONFIG_BCM47XX_BCMA
++      case BCM47XX_BUS_TYPE_BCMA:
++              /* 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;
++              break;
++#endif
++      }
++      return 0;
++}
++arch_initcall(bcm47xx_cpu_fixes);
++
+ static int __init bcm47xx_register_bus_complete(void)
+ {
+       switch (bcm47xx_bus_type) {