diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2014-08-08 23:10:16 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-08-08 23:10:16 +0000 |
| commit | 8b6e8e1b20a81b9a79f25c7922beb24e423bdbc9 (patch) | |
| tree | 3468069a9fc7711a6c93b436aa2642c448f14ecd /target/linux/brcm47xx | |
| parent | 4ab6f2b3898be4ca6532a37a5d33608fe4fa8227 (diff) | |
| download | master-187ad058-8b6e8e1b20a81b9a79f25c7922beb24e423bdbc9.tar.gz master-187ad058-8b6e8e1b20a81b9a79f25c7922beb24e423bdbc9.tar.bz2 master-187ad058-8b6e8e1b20a81b9a79f25c7922beb24e423bdbc9.zip | |
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.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42088 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx')
4 files changed, 36 insertions, 13 deletions
diff --git a/target/linux/brcm47xx/patches-3.14/144-make-reboot-more-reliable.patch b/target/linux/brcm47xx/patches-3.14/144-make-reboot-more-reliable.patch index 551c0fff72..7c30a9c54a 100644 --- a/target/linux/brcm47xx/patches-3.14/144-make-reboot-more-reliable.patch +++ b/target/linux/brcm47xx/patches-3.14/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 -@@ -59,12 +59,12 @@ static void bcm47xx_machine_restart(char +@@ -59,7 +59,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.14/153-MIPS-BCM47XX-Detect-more-then-128-MiB-of-RAM-HIGHMEM.patch b/target/linux/brcm47xx/patches-3.14/153-MIPS-BCM47XX-Detect-more-then-128-MiB-of-RAM-HIGHMEM.patch index ad0dd7de73..777e93bd5a 100644 --- a/target/linux/brcm47xx/patches-3.14/153-MIPS-BCM47XX-Detect-more-then-128-MiB-of-RAM-HIGHMEM.patch +++ b/target/linux/brcm47xx/patches-3.14/153-MIPS-BCM47XX-Detect-more-then-128-MiB-of-RAM-HIGHMEM.patch @@ -132,7 +132,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +#endif /* defined(CONFIG_BCM47XX_BCMA) && defined(CONFIG_HIGHMEM) */ --- a/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c -@@ -218,6 +218,9 @@ void __init plat_mem_setup(void) +@@ -227,6 +227,9 @@ void __init plat_mem_setup(void) bcm47xx_bus_type = BCM47XX_BUS_TYPE_BCMA; bcm47xx_register_bcma(); bcm47xx_set_system_type(bcm47xx_bus.bcma.bus.chipinfo.id); diff --git a/target/linux/brcm47xx/patches-3.14/830-huawei_e970_support.patch b/target/linux/brcm47xx/patches-3.14/830-huawei_e970_support.patch index 107cedc4e1..ee35eed6ad 100644 --- a/target/linux/brcm47xx/patches-3.14/830-huawei_e970_support.patch +++ b/target/linux/brcm47xx/patches-3.14/830-huawei_e970_support.patch @@ -8,7 +8,7 @@ #include <asm/bootinfo.h> #include <asm/idle.h> #include <asm/prom.h> -@@ -269,6 +270,33 @@ static struct fixed_phy_status bcm47xx_f +@@ -278,6 +279,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) { -@@ -288,6 +316,7 @@ static int __init bcm47xx_register_bus_c +@@ -297,6 +325,7 @@ static int __init bcm47xx_register_bus_c bcm47xx_workarounds(); fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status); diff --git a/target/linux/brcm47xx/patches-3.14/980-wnr834b_no_cardbus_invariant.patch b/target/linux/brcm47xx/patches-3.14/980-wnr834b_no_cardbus_invariant.patch index 650f02f2a1..8bab5f09bf 100644 --- a/target/linux/brcm47xx/patches-3.14/980-wnr834b_no_cardbus_invariant.patch +++ b/target/linux/brcm47xx/patches-3.14/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); |