From: Jojy G Varghese <jo...@juniper.net>
For E500MC and E5500, a machine check exception in pci(e) memory space
crashes the kernel.
Testing shows that the MCAR(U) register is zero on a MC exception for the
E5500 core. At the same time, DEAR register has been found to have the
address of the faulty load address during an MC exception for this core.
This fix changes the current behavior to fixup the result register
and instruction pointers in the case of a load operation on a faulty
PCI address.
The changes are:
- Added the hook to pci machine check handing to the e500mc machine check
exception handler.
- For the E5500 core, load faulting address from SPRN_DEAR register.
As mentioned above, this is necessary because the E5500 core does not
report the fault address in the MCAR register.
Cc: Scott Wood <scottw...@freescale.com>
Signed-off-by: Jojy G Varghese <jo...@juniper.net>
[Guenter Roeck: updated description]
Signed-off-by: Guenter Roeck <gro...@juniper.net>
Signed-off-by: Guenter Roeck <li...@roeck-us.net>
---
arch/powerpc/kernel/traps.c | 3 ++-
arch/powerpc/sysdev/fsl_pci.c | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 0dc43f9..ecb709b 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -494,7 +494,8 @@ int machine_check_e500mc(struct pt_regs *regs)
int recoverable = 1;
if (reason & MCSR_LD) {
- recoverable = fsl_rio_mcheck_exception(regs);
+ recoverable = fsl_rio_mcheck_exception(regs) ||
+ fsl_pci_mcheck_exception(regs);
if (recoverable == 1)
goto silent_out;
}
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index c507767..bdb956b 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -1021,6 +1021,11 @@ int fsl_pci_mcheck_exception(struct pt_regs *regs)
#endif
addr += mfspr(SPRN_MCAR);
+#ifdef CONFIG_E5500_CPU
+ if (mfspr(SPRN_EPCR) & SPRN_EPCR_ICM)
+ addr = PFN_PHYS(vmalloc_to_pfn((void *)mfspr(SPRN_DEAR)));
+#endif
+
if (is_in_pci_mem_space(addr)) {
if (user_mode(regs)) {
pagefault_disable();
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
