MIPS: Alchemy: Fix reset for MTX-1 and XXS1500 [Linux 2.6.38]

This Linux kernel change "MIPS: Alchemy: Fix reset for MTX-1 and XXS1500" is included in the Linux 2.6.38 release. This change is authored by Florian Fainelli <florian [at] openwrt.org> on Mon Feb 21 14:28:02 2011 +0100. The commit for this change in Linux stable tree is 9ced975 (patch).

MIPS: 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.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2093/
Acked-by: Bruno Randolf <br1@einfach.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

There are 8 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 arch/mips/alchemy/mtx-1/board_setup.c   | 4 ++--
 arch/mips/alchemy/xxs1500/board_setup.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/mips/alchemy/mtx-1/board_setup.c b/arch/mips/alchemy/mtx-1/board_setup.c
index 6398fa9..40b84b9 100644
--- a/arch/mips/alchemy/mtx-1/board_setup.c
+++ b/arch/mips/alchemy/mtx-1/board_setup.c
@@ -54,8 +54,8 @@

 static void mtx1_reset(char *c)
 {
-   /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
-   au_writel(0x00000000, 0xAE00001C);
+   /* Jump to the reset vector */
+   __asm__ __volatile__("jrt%0"::"r"(0xbfc00000));
 }

 static void mtx1_power_off(void)
diff --git a/arch/mips/alchemy/xxs1500/board_setup.c b/arch/mips/alchemy/xxs1500/board_setup.c
index b43c918..80c521e 100644
--- a/arch/mips/alchemy/xxs1500/board_setup.c
+++ b/arch/mips/alchemy/xxs1500/board_setup.c
@@ -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__("jrt%0"::"r"(0xbfc00000));
 }

 static void xxs1500_power_off(void)

Leave a Reply

Your email address will not be published. Required fields are marked *