1 files changed, 55 insertions, 26 deletions

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index a45a63c3a0c7..1a0141426cda 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -34,6 +34,7 @@
 #include <linux/bug.h>
 #include <linux/kdebug.h>
 #include <linux/debugfs.h>
+#include <linux/ratelimit.h>
 
 #include <asm/emulated_ops.h>
 #include <asm/pgtable.h>
@@ -55,6 +56,7 @@
 #endif
 #include <asm/kexec.h>
 #include <asm/ppc-opcode.h>
+#include <asm/rio.h>
 
 #if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
 int (*__debugger)(struct pt_regs *regs) __read_mostly;
@@ -143,7 +145,6 @@ int die(const char *str, struct pt_regs *regs, long err)
 #endif
                 printk("%s\n", ppc_md.name ? ppc_md.name : "");
 
-                sysfs_printk_last_file();
                 if (notify_die(DIE_OOPS, str, regs, err, 255,
                                SIGSEGV) == NOTIFY_STOP)
                         return 1;
@@ -197,12 +198,11 @@ void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr)
                 if (die("Exception in kernel mode", regs, signr))
                         return;
         } else if (show_unhandled_signals &&
-                    unhandled_signal(current, signr) &&
-                    printk_ratelimit()) {
-                        printk(regs->msr & MSR_SF ? fmt64 : fmt32,
-                                current->comm, current->pid, signr,
-                                addr, regs->nip, regs->link, code);
-                }
+                   unhandled_signal(current, signr)) {
+                printk_ratelimited(regs->msr & MSR_64BIT ? fmt64 : fmt32,
+                                   current->comm, current->pid, signr,
+                                   addr, regs->nip, regs->link, code);
+        }
 
         memset(&info, 0, sizeof(info));
         info.si_signo = signr;
@@ -221,7 +221,7 @@ void system_reset_exception(struct pt_regs *regs)
         }
 
 #ifdef CONFIG_KEXEC
-        cpu_set(smp_processor_id(), cpus_in_sr);
+        cpumask_set_cpu(smp_processor_id(), &cpus_in_sr);
 #endif
 
         die("System Reset", regs, SIGABRT);
@@ -425,6 +425,12 @@ int machine_check_e500mc(struct pt_regs *regs)
         unsigned long reason = mcsr;
         int recoverable = 1;
 
+        if (reason & MCSR_LD) {
+                recoverable = fsl_rio_mcheck_exception(regs);
+                if (recoverable == 1)
+                        goto silent_out;
+        }
+
         printk("Machine check in kernel mode.\n");
         printk("Caused by (from MCSR=%lx): ", reason);
 
@@ -500,6 +506,7 @@ int machine_check_e500mc(struct pt_regs *regs)
                        reason & MCSR_MEA ? "Effective" : "Physical", addr);
         }
 
+silent_out:
         mtspr(SPRN_MCSR, mcsr);
         return mfspr(SPRN_MCSR) == 0 && recoverable;
 }
@@ -508,6 +515,11 @@ int machine_check_e500(struct pt_regs *regs)
 {
         unsigned long reason = get_mc_reason(regs);
 
+        if (reason & MCSR_BUS_RBERR) {
+                if (fsl_rio_mcheck_exception(regs))
+                        return 1;
+        }
+
         printk("Machine check in kernel mode.\n");
         printk("Caused by (from MCSR=%lx): ", reason);
 
@@ -538,6 +550,11 @@ int machine_check_e500(struct pt_regs *regs)
 
         return 0;
 }
+
+int machine_check_generic(struct pt_regs *regs)
+{
+        return 0;
+}
 #elif defined(CONFIG_E200)
 int machine_check_e200(struct pt_regs *regs)
 {
@@ -621,12 +638,6 @@ void machine_check_exception(struct pt_regs *regs)
         if (recover > 0)
                 return;
 
-        if (user_mode(regs)) {
-                regs->msr |= MSR_RI;
-                _exception(SIGBUS, regs, BUS_ADRERR, regs->nip);
-                return;
-        }
-
 #if defined(CONFIG_8xx) && defined(CONFIG_PCI)
         /* the qspan pci read routines can cause machine checks -- Cort
          *
@@ -638,16 +649,12 @@ void machine_check_exception(struct pt_regs *regs)
         return;
 #endif
 
-        if (debugger_fault_handler(regs)) {
-                regs->msr |= MSR_RI;
+        if (debugger_fault_handler(regs))
                 return;
-        }
 
         if (check_io_access(regs))
                 return;
 
-        if (debugger_fault_handler(regs))
-                return;
         die("Machine check", regs, SIGBUS);
 
         /* Must die if the interrupt is not recoverable */
@@ -914,6 +921,26 @@ static int emulate_instruction(struct pt_regs *regs)
                 return emulate_isel(regs, instword);
         }
 
+#ifdef CONFIG_PPC64
+        /* Emulate the mfspr rD, DSCR. */
+        if (((instword & PPC_INST_MFSPR_DSCR_MASK) == PPC_INST_MFSPR_DSCR) &&
+                        cpu_has_feature(CPU_FTR_DSCR)) {
+                PPC_WARN_EMULATED(mfdscr, regs);
+                rd = (instword >> 21) & 0x1f;
+                regs->gpr[rd] = mfspr(SPRN_DSCR);
+                return 0;
+        }
+        /* Emulate the mtspr DSCR, rD. */
+        if (((instword & PPC_INST_MTSPR_DSCR_MASK) == PPC_INST_MTSPR_DSCR) &&
+                        cpu_has_feature(CPU_FTR_DSCR)) {
+                PPC_WARN_EMULATED(mtdscr, regs);
+                rd = (instword >> 21) & 0x1f;
+                mtspr(SPRN_DSCR, regs->gpr[rd]);
+                current->thread.dscr_inherit = 1;
+                return 0;
+        }
+#endif
+
         return -EINVAL;
 }
 
@@ -964,7 +991,7 @@ void __kprobes program_check_exception(struct pt_regs *regs)
          * ESR_DST (!?) or 0.  In the process of chasing this with the
          * hardware people - not sure if it can happen on any illegal
          * instruction or only on FP instructions, whether there is a
-         * pattern to occurences etc. -dgibson 31/Mar/2003 */
+         * pattern to occurrences etc. -dgibson 31/Mar/2003 */
         switch (do_mathemu(regs)) {
         case 0:
                 emulate_single_step(regs);
@@ -1315,9 +1342,8 @@ void altivec_assist_exception(struct pt_regs *regs)
         } else {
                 /* didn't recognize the instruction */
                 /* XXX quick hack for now: set the non-Java bit in the VSCR */
-                if (printk_ratelimit())
-                        printk(KERN_ERR "Unrecognized altivec instruction "
-                               "in %s at %lx\n", current->comm, regs->nip);
+                printk_ratelimited(KERN_ERR "Unrecognized altivec instruction "
+                                   "in %s at %lx\n", current->comm, regs->nip);
                 current->thread.vscr.u[3] |= 0x10000;
         }
 }
@@ -1511,15 +1537,18 @@ struct ppc_emulated ppc_emulated = {
 #ifdef CONFIG_VSX
         WARN_EMULATED_SETUP(vsx),
 #endif
+#ifdef CONFIG_PPC64
+        WARN_EMULATED_SETUP(mfdscr),
+        WARN_EMULATED_SETUP(mtdscr),
+#endif
 };
 
 u32 ppc_warn_emulated;
 
 void ppc_warn_emulated_print(const char *type)
 {
-        if (printk_ratelimit())
-                pr_warning("%s used emulated %s instruction\n", current->comm,
-                           type);
+        pr_warn_ratelimited("%s used emulated %s instruction\n", current->comm,
+                            type);
 }
 
 static int __init ppc_warn_emulated_init(void)