Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 33 insertions, 7 deletions

diff --git a/arch/mips/loongson/common/reset.c b/arch/mips/loongson/common/reset.c
index 97e918251edd..9e10d6225d9b 100644
--- a/arch/mips/loongson/common/reset.c
+++ b/arch/mips/loongson/common/reset.c
@@ -6,8 +6,8 @@
  *
  * Copyright (C) 2007 Lemote, Inc. & Institute of Computing Technology
  * Author: Fuxin Zhang, zhangfx@lemote.com
- * Copyright (C) 2009 Lemote, Inc. & Institute of Computing Technology
- * Author: Zhangjin Wu, wuzj@lemote.com
+ * Copyright (C) 2009 Lemote, Inc.
+ * Author: Zhangjin Wu, wuzhangjin@gmail.com
  */
 #include <linux/init.h>
 #include <linux/pm.h>
@@ -16,27 +16,53 @@
 
 #include <loongson.h>
 
+static inline void loongson_reboot(void)
+{
+#ifndef CONFIG_CPU_JUMP_WORKAROUNDS
+        ((void (*)(void))ioremap_nocache(LOONGSON_BOOT_BASE, 4)) ();
+#else
+        void (*func)(void);
+
+        func = (void *)ioremap_nocache(LOONGSON_BOOT_BASE, 4);
+
+        __asm__ __volatile__(
+        "       .set    noat                                            \n"
+        "       jr      %[func]                                         \n"
+        "       .set    at                                              \n"
+        : /* No outputs */
+        : [func] "r" (func));
+#endif
+}
+
 static void loongson_restart(char *command)
 {
         /* do preparation for reboot */
         mach_prepare_reboot();
 
         /* reboot via jumping to boot base address */
-        ((void (*)(void))ioremap_nocache(BONITO_BOOT_BASE, 4)) ();
+        loongson_reboot();
 }
 
-static void loongson_halt(void)
+static void loongson_poweroff(void)
 {
         mach_prepare_shutdown();
-        while (1)
-                ;
+        unreachable();
+}
+
+static void loongson_halt(void)
+{
+        pr_notice("\n\n** You can safely turn off the power now **\n\n");
+        while (1) {
+                if (cpu_wait)
+                        cpu_wait();
+        }
 }
 
 static int __init mips_reboot_setup(void)
 {
         _machine_restart = loongson_restart;
         _machine_halt = loongson_halt;
-        pm_power_off = loongson_halt;
+        pm_power_off = loongson_poweroff;
 
         return 0;
 }