2014-08-08 23:10:16 +00:00
|
|
|
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>
|
2014-07-07 20:12:40 +00:00
|
|
|
--- a/arch/mips/bcm47xx/setup.c
|
|
|
|
|
+++ b/arch/mips/bcm47xx/setup.c
|
2014-08-08 23:10:16 +00:00
|
|
|
@@ -59,7 +59,16 @@ static void bcm47xx_machine_restart(char
|
2014-07-07 20:12:40 +00:00
|
|
|
switch (bcm47xx_bus_type) {
|
|
|
|
|
#ifdef CONFIG_BCM47XX_SSB
|
|
|
|
|
case BCM47XX_BUS_TYPE_SSB:
|
2014-08-14 21:21:27 +00:00
|
|
|
+ if (bcm47xx_bus.ssb.chip_id == 0x4785)
|
2014-08-08 23:10:16 +00:00
|
|
|
+ write_c0_diag4(1 << 22);
|
|
|
|
|
ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 1);
|
2014-08-14 21:21:27 +00:00
|
|
|
+ if (bcm47xx_bus.ssb.chip_id == 0x4785) {
|
2014-08-08 23:10:16 +00:00
|
|
|
+ __asm__ __volatile__(
|
|
|
|
|
+ ".set\tmips3\n\t"
|
|
|
|
|
+ "sync\n\t"
|
|
|
|
|
+ "wait\n\t"
|
|
|
|
|
+ ".set\tmips0");
|
|
|
|
|
+ }
|
2014-07-07 20:12:40 +00:00
|
|
|
break;
|
|
|
|
|
#endif
|
|
|
|
|
#ifdef CONFIG_BCM47XX_BCMA
|
