renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-18 10:34:24 +08:00
Code

powerpc/fsl_rio: move machine_check handler

Browse Source 
Add support for machine_check support into machine_check_e500 and
machine_check_e500mc.

Signed-off-by: Shaohui Xie <b21989@freescale.com>
Cc: Li Yang <leoli@freescale.com>
Cc: Roy Zang <tie-fei.zang@freescale.com>
Cc: Alexandre Bounine <alexandre.bounine@idt.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Shaohui Xie 2010-11-18 14:57:32 +08:00 committed by Kumar Gala
parent d08e44570e
commit cce1f106c6
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/include/asm/rio.h
View File

@ -14,5 +14,10 @@
#define ASM_PPC_RIO_H #define ASM_PPC_RIO_H
extern void platform_rio_init(void); extern void platform_rio_init(void);
#ifdef CONFIG_RAPIDIO
extern int fsl_rio_mcheck_exception(struct pt_regs *);
#else
static inline int fsl_rio_mcheck_exception(struct pt_regs *regs) {return 0; }
#endif
#endif /* ASM_PPC_RIO_H */ #endif /* ASM_PPC_RIO_H */

13
arch/powerpc/kernel/traps.c
View File

@ -55,6 +55,7 @@
#endif #endif
#include <asm/kexec.h> #include <asm/kexec.h>
#include <asm/ppc-opcode.h> #include <asm/ppc-opcode.h>
#include <asm/rio.h>
#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC) #if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
int (*__debugger)(struct pt_regs *regs) __read_mostly; int (*__debugger)(struct pt_regs *regs) __read_mostly;
@ -424,6 +425,12 @@ int machine_check_e500mc(struct pt_regs *regs)
unsigned long reason = mcsr; unsigned long reason = mcsr;
int recoverable = 1; 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("Machine check in kernel mode.\n");
printk("Caused by (from MCSR=%lx): ", reason); 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); reason & MCSR_MEA ? "Effective" : "Physical", addr);
} }
silent_out:
mtspr(SPRN_MCSR, mcsr); mtspr(SPRN_MCSR, mcsr);
return mfspr(SPRN_MCSR) == 0 && recoverable; 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); 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("Machine check in kernel mode.\n");
printk("Caused by (from MCSR=%lx): ", reason); printk("Caused by (from MCSR=%lx): ", reason);

15
arch/powerpc/sysdev/fsl_rio.c
View File

@ -260,9 +260,7 @@ struct rio_priv {
static void __iomem *rio_regs_win; static void __iomem *rio_regs_win;
#ifdef CONFIG_E500 #ifdef CONFIG_E500
static int (*saved_mcheck_exception)(struct pt_regs *regs); int fsl_rio_mcheck_exception(struct pt_regs *regs)
static int fsl_rio_mcheck_exception(struct pt_regs *regs)
{ {
const struct exception_table_entry *entry = NULL; const struct exception_table_entry *entry = NULL;
unsigned long reason = mfspr(SPRN_MCSR); unsigned long reason = mfspr(SPRN_MCSR);
@ -284,11 +282,9 @@ static int fsl_rio_mcheck_exception(struct pt_regs *regs)
} }
} }
if (saved_mcheck_exception) return 0;
return saved_mcheck_exception(regs);
else
return cur_cpu_spec->machine_check(regs);
} }
EXPORT_SYMBOL_GPL(fsl_rio_mcheck_exception);
#endif #endif
/** /**
@ -1538,11 +1534,6 @@ int fsl_rio_setup(struct platform_device *dev)
fsl_rio_doorbell_init(port); fsl_rio_doorbell_init(port);
fsl_rio_port_write_init(port); fsl_rio_port_write_init(port);
#ifdef CONFIG_E500
saved_mcheck_exception = ppc_md.machine_check_exception;
ppc_md.machine_check_exception = fsl_rio_mcheck_exception;
#endif
return 0; return 0;
err: err:
iounmap(priv->regs_win); iounmap(priv->regs_win);