Skip to contentSkip to conversation

Alchemy: fix reset for MTX-1 and XXS1500

PATCH Applied Florian Fainelli 3 participants 3 messages Feb 21, 2011 – Mar 14, 2011 MIPS

lore
Share & tools
lore

Florian Fainelli

author
#0 lore raw

PATCH 1/1 Alchemy: fix reset for MTX-1 and XXS1500

Since commit 32fd6901 (MIPS: Alchemy: get rid of common/reset.c) Alchemy-based boards use their own reset function. For MTX-1 and XXS1500, the reset function pokes at the BCSR.SYSTEM_RESET register, but this does not work. According to Bruno Randolf, this was not tested when written.

Previously, the generic au1000_restart() routine called the board specific reset function, which for MTX-1 and XXS1500 did not work, but finally made a jump to the reset vector, which really triggers a system restart. Fix reboot for both targets by jumping to the reset vector.

CC Bruno Randolf <[email protected]>
CC [email protected]
Signed-off-by Florian Fainelli <[email protected]>

---
Stable: 2.6.34+

arch/mips/alchemy/mtx-1/board_setup.c +2 -2
index 6398fa9..40b84b9 100644
@@ -54,8 +54,8 @@ int mtx1_pci_idsel(unsigned int devsel, int assert);
 
 static void mtx1_reset(char *c)
 {
-	/* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
-	au_writel(0x00000000, 0xAE00001C);
+	/* Jump to the reset vector */
+	__asm__ __volatile__("jr\t%0"::"r"(0xbfc00000));
 }
 
 static void mtx1_power_off(void)
arch/mips/alchemy/xxs1500/board_setup.c +2 -2
index b43c918..80c521e 100644
@@ -36,8 +36,8 @@
 
 static void xxs1500_reset(char *c)
 {
-	/* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
-	au_writel(0x00000000, 0xAE00001C);
+	/* Jump to the reset vector */
+	__asm__ __volatile__("jr\t%0"::"r"(0xbfc00000));
 }
 
 static void xxs1500_power_off(void)

--
1.7.1

Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines

Since commit 32fd6901 (MIPS: Alchemy: get rid of common/reset.c) Alchemy-based boards use their own reset function. For MTX-1 and XXS1500, the reset function pokes at the BCSR.SYSTEM_RESET register, but this does not work. According to Bruno Randolf, this was not tested when written.

Well, I don&#180;t know wether it was tested or not, but since it doesn&#180;t work i think we can assume it wasn&#180;t.

Quoted 44 lines

Previously, the generic au1000_restart() routine called the board specific reset function, which for MTX-1 and XXS1500 did not work, but finally made a jump to the reset vector, which really triggers a system restart. Fix reboot for both targets by jumping to the reset vector.

CC Bruno Randolf <[email protected]>
CC [email protected]
Signed-off-by Florian Fainelli <[email protected]>

---
Stable: 2.6.34+

arch/mips/alchemy/mtx-1/board_setup.c +2 -2
index 6398fa9..40b84b9 100644
@@ -54,8 +54,8 @@ int mtx1_pci_idsel(unsigned int devsel, int assert);
 
 static void mtx1_reset(char *c)
 {
-	/* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
-	au_writel(0x00000000, 0xAE00001C);
+	/* Jump to the reset vector */
+	__asm__ __volatile__("jr\t%0"::"r"(0xbfc00000));
 }
 
 static void mtx1_power_off(void)
arch/mips/alchemy/xxs1500/board_setup.c +2 -3
index b43c918..80c521e 100644
@@ -36,8 +36,8 @@
 
 static void xxs1500_reset(char *c)
 {
-	/* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
-	au_writel(0x00000000, 0xAE00001C);
+	/* Jump to the reset vector */
+	__asm__ __volatile__("jr\t%0"::"r"(0xbfc00000));
 }
 
 static void xxs1500_power_off(void)
--
Quoted 3 lines

1.7.1

Acked-by Bruno Randolf <[email protected]>