diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-08-08 23:10:16 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-08-08 23:10:16 +0000 |
| commit | 47bab2b654d69ad3198479083854099971f6a607 (patch) | |
| tree | bb9fb17a5e975c53a1fdd06092e3127046be361e /target/linux/brcm47xx/patches-3.14/144-make-reboot-more-reliable.patch | |
| parent | 8af860e186d718701f78f28f4a8c9bde619eb273 (diff) | |
| download | master-31e0f0ae-47bab2b654d69ad3198479083854099971f6a607.tar.gz master-31e0f0ae-47bab2b654d69ad3198479083854099971f6a607.tar.bz2 master-31e0f0ae-47bab2b654d69ad3198479083854099971f6a607.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>
SVN-Revision: 42088
Diffstat (limited to 'target/linux/brcm47xx/patches-3.14/144-make-reboot-more-reliable.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.14/144-make-reboot-more-reliable.patch | 41 |
1 files changed, 32 insertions, 9 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 - } |