4 files changed, 51 insertions, 28 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 12bf96334174..11bc17ce0ebf 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -91,6 +91,9 @@ config MACH_DECSTATION
         select BOOT_ELF32
         select CEVT_R4K
         select CSRC_R4K
+        select CPU_DADDI_WORKAROUNDS if 64BIT
+        select CPU_R4000_WORKAROUNDS if 64BIT
+        select CPU_R4400_WORKAROUNDS if 64BIT
         select DMA_NONCOHERENT
         select NO_IOPORT
         select IRQ_CPU
@@ -1606,6 +1609,19 @@ config GENERIC_CLOCKEVENTS_BROADCAST
         bool
 
 #
+# CPU non-features
+#
+config CPU_DADDI_WORKAROUNDS
+        bool
+
+config CPU_R4000_WORKAROUNDS
+        bool
+        select CPU_R4400_WORKAROUNDS
+
+config CPU_R4400_WORKAROUNDS
+        bool
+
+#
 # Use the generic interrupt handling code in kernel/irq/:
 #
 config GENERIC_HARDIRQS
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index a1f8d8b96b03..a49127af33c8 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -141,6 +141,10 @@ cflags-$(CONFIG_CPU_R8000)	+= -march=r8000 -Wa,--trap
 cflags-$(CONFIG_CPU_R10000)     += $(call cc-option,-march=r10000,-march=r8000) \
                         -Wa,--trap
 
+cflags-$(CONFIG_CPU_R4000_WORKAROUNDS)  += $(call cc-option,-mfix-r4000,)
+cflags-$(CONFIG_CPU_R4400_WORKAROUNDS)  += $(call cc-option,-mfix-r4400,)
+cflags-$(CONFIG_CPU_DADDI_WORKAROUNDS)  += $(call cc-option,-mno-daddi,)
+
 ifdef CONFIG_CPU_SB1
 ifdef CONFIG_SB1_PASS_1_WORKAROUNDS
 MODFLAGS        += -msb1-pass1-workarounds
@@ -602,9 +606,11 @@ ifdef CONFIG_64BIT
     endif
   endif
 
-  ifeq ($(KBUILD_SYM32), y)
-    ifeq ($(call cc-option-yn,-msym32), y)
-      cflags-y += -msym32 -DKBUILD_64BIT_SYM32
+  ifeq ($(KBUILD_SYM32)$(call cc-option-yn,-msym32), yy)
+    cflags-y += -msym32 -DKBUILD_64BIT_SYM32
+  else
+    ifeq ($(CONFIG_CPU_DADDI_WORKAROUNDS), y)
+      $(error CONFIG_CPU_DADDI_WORKAROUNDS unsupported without -msym32)
     endif
   endif
 endif
diff --git a/arch/mips/kernel/cpu-bugs64.c b/arch/mips/kernel/cpu-bugs64.c
index af78456d4138..417bb3e336ac 100644
--- a/arch/mips/kernel/cpu-bugs64.c
+++ b/arch/mips/kernel/cpu-bugs64.c
@@ -18,6 +18,15 @@
 #include <asm/mipsregs.h>
 #include <asm/system.h>
 
+static char bug64hit[] __initdata =
+        "reliable operation impossible!\n%s";
+static char nowar[] __initdata =
+        "Please report to <linux-mips@linux-mips.org>.";
+static char r4kwar[] __initdata =
+        "Enable CPU_R4000_WORKAROUNDS to rectify.";
+static char daddiwar[] __initdata =
+        "Enable CPU_DADDI_WORKAROUNDS to rectify.";
+
 static inline void align_mod(const int align, const int mod)
 {
         asm volatile(
@@ -155,13 +164,7 @@ static inline void check_mult_sh(void)
         }
 
         printk("no.\n");
-        panic("Reliable operation impossible!\n"
-#ifndef CONFIG_CPU_R4000
-              "Configure for R4000 to enable the workaround."
-#else
-              "Please report to <linux-mips@linux-mips.org>."
-#endif
-              );
+        panic(bug64hit, !R4000_WAR ? r4kwar : nowar);
 }
 
 static volatile int daddi_ov __initdata = 0;
@@ -233,15 +236,11 @@ static inline void check_daddi(void)
         }
 
         printk("no.\n");
-        panic("Reliable operation impossible!\n"
-#if !defined(CONFIG_CPU_R4000) && !defined(CONFIG_CPU_R4400)
-              "Configure for R4000 or R4400 to enable the workaround."
-#else
-              "Please report to <linux-mips@linux-mips.org>."
-#endif
-              );
+        panic(bug64hit, !DADDI_WAR ? daddiwar : nowar);
 }
 
+int daddiu_bug __initdata = -1;
+
 static inline void check_daddiu(void)
 {
         long v, w, tmp;
@@ -281,7 +280,9 @@ static inline void check_daddiu(void)
                 : "=&r" (v), "=&r" (w), "=&r" (tmp)
                 : "I" (0xffffffffffffdb9aUL), "I" (0x1234));
 
-        if (v == w) {
+        daddiu_bug = v != w;
+
+        if (!daddiu_bug) {
                 printk("no.\n");
                 return;
         }
@@ -303,18 +304,16 @@ static inline void check_daddiu(void)
         }
 
         printk("no.\n");
-        panic("Reliable operation impossible!\n"
-#if !defined(CONFIG_CPU_R4000) && !defined(CONFIG_CPU_R4400)
-              "Configure for R4000 or R4400 to enable the workaround."
-#else
-              "Please report to <linux-mips@linux-mips.org>."
-#endif
-              );
+        panic(bug64hit, !DADDI_WAR ? daddiwar : nowar);
 }
 
-void __init check_bugs64(void)
+void __init check_bugs64_early(void)
 {
         check_mult_sh();
-        check_daddi();
         check_daddiu();
 }
+
+void __init check_bugs64(void)
+{
+        check_daddi();
+}
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index f8a535afce39..7b4418dd5857 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -8,7 +8,7 @@
  * Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02, 03  Ralf Baechle
  * Copyright (C) 1996 Stoned Elipot
  * Copyright (C) 1999 Silicon Graphics, Inc.
- * Copyright (C) 2000 2001, 2002  Maciej W. Rozycki
+ * Copyright (C) 2000, 2001, 2002, 2007  Maciej W. Rozycki
  */
 #include <linux/init.h>
 #include <linux/ioport.h>
@@ -24,6 +24,7 @@
 
 #include <asm/addrspace.h>
 #include <asm/bootinfo.h>
+#include <asm/bugs.h>
 #include <asm/cache.h>
 #include <asm/cpu.h>
 #include <asm/sections.h>
@@ -561,6 +562,7 @@ void __init setup_arch(char **cmdline_p)
         }
 #endif
         cpu_report();
+        check_bugs_early();
 
 #if defined(CONFIG_VT)
 #if defined(CONFIG_VGA_CONSOLE)