Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (408 commits)
  [POWERPC] Add memchr() to the bootwrapper
  [POWERPC] Implement logging of unhandled signals
  [POWERPC] Add legacy serial support for OPB with flattened device tree
  [POWERPC] Use 1TB segments
  [POWERPC] XilinxFB: Allow fixed framebuffer base address
  [POWERPC] XilinxFB: Add support for custom screen resolution
  [POWERPC] XilinxFB: Use pdata to pass around framebuffer parameters
  [POWERPC] PCI: Add 64-bit physical address support to setup_indirect_pci
  [POWERPC] 4xx: Kilauea defconfig file
  [POWERPC] 4xx: Kilauea DTS
  [POWERPC] 4xx: Add AMCC Kilauea eval board support to platforms/40x
  [POWERPC] 4xx: Add AMCC 405EX support to cputable.c
  [POWERPC] Adjust TASK_SIZE on ppc32 systems to 3GB that are capable
  [POWERPC] Use PAGE_OFFSET to tell if an address is user/kernel in SW TLB handlers
  [POWERPC] 85xx: Enable FP emulation in MPC8560 ADS defconfig
  [POWERPC] 85xx: Killed <asm/mpc85xx.h>
  [POWERPC] 85xx: Add cpm nodes for 8541/8555 CDS
  [POWERPC] 85xx: Convert mpc8560ads to the new CPM binding.
  [POWERPC] mpc8272ads: Remove muram from the CPM reg property.
  [POWERPC] Make clockevents work on PPC601 processors
  ...

Fixed up conflict in Documentation/powerpc/booting-without-of.txt manually.

1 files changed, 52 insertions, 45 deletions

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index d8502e377518..bf9e39c6e296 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -172,11 +172,21 @@ int die(const char *str, struct pt_regs *regs, long err)
 void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr)
 {
         siginfo_t info;
+        const char fmt32[] = KERN_INFO "%s[%d]: unhandled signal %d " \
+                        "at %08lx nip %08lx lr %08lx code %x\n";
+        const char fmt64[] = KERN_INFO "%s[%d]: unhandled signal %d " \
+                        "at %016lx nip %016lx lr %016lx code %x\n";
 
         if (!user_mode(regs)) {
                 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);
+                }
 
         memset(&info, 0, sizeof(info));
         info.si_signo = signr;
@@ -324,47 +334,10 @@ static inline int check_io_access(struct pt_regs *regs)
 #define clear_single_step(regs) ((regs)->msr &= ~MSR_SE)
 #endif
 
-/*
- * This is "fall-back" implementation for configurations
- * which don't provide platform-specific machine check info
- */
-void __attribute__ ((weak))
-platform_machine_check(struct pt_regs *regs)
-{
-}
-
-void machine_check_exception(struct pt_regs *regs)
+static int generic_machine_check_exception(struct pt_regs *regs)
 {
-        int recover = 0;
         unsigned long reason = get_mc_reason(regs);
 
-        /* See if any machine dependent calls */
-        if (ppc_md.machine_check_exception)
-                recover = ppc_md.machine_check_exception(regs);
-
-        if (recover)
-                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 */
-        bad_page_fault(regs, regs->dar, SIGBUS);
-        return;
-#endif
-
-        if (debugger_fault_handler(regs)) {
-                regs->msr |= MSR_RI;
-                return;
-        }
-
-        if (check_io_access(regs))
-                return;
-
 #if defined(CONFIG_4xx) && !defined(CONFIG_440A)
         if (reason & ESR_IMCP) {
                 printk("Instruction");
@@ -480,11 +453,41 @@ void machine_check_exception(struct pt_regs *regs)
         }
 #endif /* CONFIG_4xx */
 
-        /*
-         * Optional platform-provided routine to print out
-         * additional info, e.g. bus error registers.
-         */
-        platform_machine_check(regs);
+        return 0;
+}
+
+void machine_check_exception(struct pt_regs *regs)
+{
+        int recover = 0;
+
+        /* See if any machine dependent calls */
+        if (ppc_md.machine_check_exception)
+                recover = ppc_md.machine_check_exception(regs);
+        else
+                recover = generic_machine_check_exception(regs);
+
+        if (recover)
+                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 */
+        bad_page_fault(regs, regs->dar, SIGBUS);
+        return;
+#endif
+
+        if (debugger_fault_handler(regs)) {
+                regs->msr |= MSR_RI;
+                return;
+        }
+
+        if (check_io_access(regs))
+                return;
 
         if (debugger_fault_handler(regs))
                 return;
@@ -913,7 +916,9 @@ void SoftwareEmulation(struct pt_regs *regs)
 {
         extern int do_mathemu(struct pt_regs *);
         extern int Soft_emulate_8xx(struct pt_regs *);
+#if defined(CONFIG_MATH_EMULATION) || defined(CONFIG_8XX_MINIMAL_FPEMU)
         int errcode;
+#endif
 
         CHECK_FULL_REGS(regs);
 
@@ -943,7 +948,7 @@ void SoftwareEmulation(struct pt_regs *regs)
                 return;
         }
 
-#else
+#elif defined(CONFIG_8XX_MINIMAL_FPEMU)
         errcode = Soft_emulate_8xx(regs);
         switch (errcode) {
         case 0:
@@ -956,6 +961,8 @@ void SoftwareEmulation(struct pt_regs *regs)
                 _exception(SIGSEGV, regs, SEGV_MAPERR, regs->nip);
                 return;
         }
+#else
+        _exception(SIGILL, regs, ILL_ILLOPC, regs->nip);
 #endif
 }
 #endif /* CONFIG_8xx */