brcm47xx: fix reboot problem on BCM4705/BCM4785

This adds some code based on code from the Broadcom GPL tar to fix the
reboot problems on BCM4705/BCM4785. I tried rebooting my device for ~10
times and have never seen a problem. This reverts the changes in the
previous commit and adds the real fix as suggested by Rafał.

Setting bit 22 in Reg 22, sel 4 puts the BIU (Bus Interface Unit) into
async mode.

backport of: r42083

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 42086

diff --git a/target/linux/brcm47xx/patches-3.10/144-make-reboot-more-reliable.patch b/target/linux/brcm47xx/patches-3.10/144-make-reboot-more-reliable.patch
index 036de1da3c3c4067cd18977447e6b4a03e255de2..f1a343a0cc9f8ff15aa797f6a8a40a27f132f97d 100644 (file)
--- a/target/linux/brcm47xx/patches-3.10/144-make-reboot-more-reliable.patch
+++ b/target/linux/brcm47xx/patches-3.10/144-make-reboot-more-reliable.patch
@@ -1,17 +1,40 @@
+From 26db431400c336c4cc658cb4888bab18d254c64a Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Sat, 9 Aug 2014 00:00:09 +0200
+Subject: [PATCH] MIPS: BCM47XX: fix reboot problem on BCM4705/BCM4785
+
+This adds some code based on code from the Broadcom GPL tar to fix the
+reboot problems on BCM4705/BCM4785. I tried rebooting my device for ~10
+times and have never seen a problem. This reverts the changes in the
+previous commit and adds the real fix as suggested by Rafał.
+
+Setting bit 22 in Reg 22, sel 4 puts the BIU (Bus Interface Unit) into
+async mode.
+
+The previous try was this:
+commit 316cad5c1d4daee998cd1f83ccdb437f6f20d45c
+Author: Hauke Mehrtens <hauke@hauke-m.de>
+Date:   Mon Jul 28 23:53:57 2014 +0200
+
+    MIPS: BCM47XX: make reboot more relaiable
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 --- a/arch/mips/bcm47xx/setup.c
 +++ b/arch/mips/bcm47xx/setup.c
-@@ -55,12 +55,12 @@ static void bcm47xx_machine_restart(char
+@@ -55,7 +55,16 @@ static void bcm47xx_machine_restart(char
        switch (bcm47xx_bus_type) {
  #ifdef CONFIG_BCM47XX_SSB
        case BCM47XX_BUS_TYPE_SSB:
--              ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 1);
-+              ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 3);
++              if (bcm47xx_bus.bcma.bus.chipinfo.id == 0x4785)
++                      write_c0_diag4(1 << 22);
+               ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 1);
++              if (bcm47xx_bus.bcma.bus.chipinfo.id == 0x4785) {
++                      __asm__ __volatile__(
++                              ".set\tmips3\n\t"
++                              "sync\n\t"
++                              "wait\n\t"
++                              ".set\tmips0");
++              }
                break;
  #endif
  #ifdef CONFIG_BCM47XX_BCMA
-       case BCM47XX_BUS_TYPE_BCMA:
--              bcma_chipco_watchdog_timer_set(&bcm47xx_bus.bcma.bus.drv_cc, 1);
-+              bcma_chipco_watchdog_timer_set(&bcm47xx_bus.bcma.bus.drv_cc, 3);
-               break;
- #endif
-       }

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 3e1543b7f5ad934c9eb2576b8b6cfd61b4bf0809..622ac2993b7109c5916b870c48dc0fe0c51a3419 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
@@ -22,7 +22,7 @@ Acked-by: Rafa? Mi?ecki <zajec5@gmail.com>
  #include <bcm47xx.h>
  #include <bcm47xx_nvram.h>
  #include <bcm47xx_board.h>
-@@ -231,6 +232,31 @@ void __init plat_mem_setup(void)
+@@ -240,6 +241,31 @@ void __init plat_mem_setup(void)
        mips_set_machine_name(bcm47xx_board_get_name());
  }
  

diff --git a/target/linux/brcm47xx/patches-3.10/208-b44-use-fixed-PHY-device-if-we-do-not-find-any.patch b/target/linux/brcm47xx/patches-3.10/208-b44-use-fixed-PHY-device-if-we-do-not-find-any.patch
index 94f9875a25641415109e470cef2eabd8a8752fcf..ee2f58efb9efeca188d55ba64b8f2be3f9e1feae 100644 (file)
--- a/target/linux/brcm47xx/patches-3.10/208-b44-use-fixed-PHY-device-if-we-do-not-find-any.patch
+++ b/target/linux/brcm47xx/patches-3.10/208-b44-use-fixed-PHY-device-if-we-do-not-find-any.patch
@@ -30,7 +30,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  #include <linux/ssb/ssb.h>
  #include <linux/ssb/ssb_embedded.h>
  #include <linux/bcma/bcma_soc.h>
-@@ -257,6 +260,12 @@ static int __init bcm47xx_cpu_fixes(void
+@@ -266,6 +269,12 @@ static int __init bcm47xx_cpu_fixes(void
  }
  arch_initcall(bcm47xx_cpu_fixes);
  
@@ -43,7 +43,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static int __init bcm47xx_register_bus_complete(void)
  {
        switch (bcm47xx_bus_type) {
-@@ -275,6 +284,7 @@ static int __init bcm47xx_register_bus_c
+@@ -284,6 +293,7 @@ static int __init bcm47xx_register_bus_c
        bcm47xx_buttons_register();
        bcm47xx_leds_register();
        bcm47xx_workarounds();

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 7880ec8c365c7fc74b26af59e82566d1dc2461d8..20b8526689cbd7fee2485084b502a0812d26a78b 100644 (file)
--- 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>
-@@ -266,6 +267,33 @@ static struct fixed_phy_status bcm47xx_f
+@@ -275,6 +276,33 @@ static struct fixed_phy_status bcm47xx_f
        .duplex = DUPLEX_FULL,
  };
  
@@ -42,7 +42,7 @@
  static int __init bcm47xx_register_bus_complete(void)
  {
        switch (bcm47xx_bus_type) {
-@@ -285,6 +313,7 @@ static int __init bcm47xx_register_bus_c
+@@ -294,6 +322,7 @@ static int __init bcm47xx_register_bus_c
        bcm47xx_leds_register();
        bcm47xx_workarounds();
        fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status);

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 650f02f2a13ae0597a67b9d5689ffec25e68370d..8bab5f09bfab14091fa093ca81343f7d3a6ad264 100644 (file)
--- 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
-@@ -127,6 +127,10 @@ static int bcm47xx_get_invariants(struct
+@@ -136,6 +136,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);