diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-27 09:58:22 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-27 09:58:22 +1000 |
| commit | 9693ebd4815eefa2b7c8fcc699061a0c8da0c1e7 (patch) | |
| tree | cd8d8919c18528c26aa78291833b3551c4d33a35 /arch/powerpc/kernel | |
| parent | 3fb7933850faf1017c59a675e895ed8f27fef4be (diff) | |
| parent | 6ff31453161e8614e8ba3b360f8d883a27230e0c (diff) | |
| download | op-kernel-dev-9693ebd4815eefa2b7c8fcc699061a0c8da0c1e7.zip op-kernel-dev-9693ebd4815eefa2b7c8fcc699061a0c8da0c1e7.tar.gz | |
Merge remote branch 'kumar/merge' into merge
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index b13306b..0ff4ab9 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -55,6 +55,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; @@ -424,6 +425,12 @@ int machine_check_e500mc(struct pt_regs *regs) unsigned long reason = mcsr; int recoverable = 1; + if (reason & MCSR_BUS_RBERR) { + 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); @@ -499,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; } @@ -507,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); |
