Commit 86d7a9a9 authored by Becky Bruce's avatar Becky Bruce Committed by Kumar Gala

[POWERPC] Fix FSL BookE machine check reporting

Reserved MCSR bits on FSL BookE parts may have spurious values
when mcheck occurs.  Mask these off when printing the MCSR to
avoid confusion.  Also, get rid of the MCSR_GL_CI bit defined
for e500 - this bit doesn't actually have any meaning.
Signed-off-by: default avatarBecky Bruce <becky.bruce@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent b66510cb
...@@ -299,7 +299,7 @@ static inline int check_io_access(struct pt_regs *regs) ...@@ -299,7 +299,7 @@ static inline int check_io_access(struct pt_regs *regs)
#ifndef CONFIG_FSL_BOOKE #ifndef CONFIG_FSL_BOOKE
#define get_mc_reason(regs) ((regs)->dsisr) #define get_mc_reason(regs) ((regs)->dsisr)
#else #else
#define get_mc_reason(regs) (mfspr(SPRN_MCSR)) #define get_mc_reason(regs) (mfspr(SPRN_MCSR) & MCSR_MASK)
#endif #endif
#define REASON_FP ESR_FP #define REASON_FP ESR_FP
#define REASON_ILLEGAL (ESR_PIL | ESR_PUO) #define REASON_ILLEGAL (ESR_PIL | ESR_PUO)
...@@ -414,8 +414,6 @@ void machine_check_exception(struct pt_regs *regs) ...@@ -414,8 +414,6 @@ void machine_check_exception(struct pt_regs *regs)
printk("Data Cache Push Parity Error\n"); printk("Data Cache Push Parity Error\n");
if (reason & MCSR_DCPERR) if (reason & MCSR_DCPERR)
printk("Data Cache Parity Error\n"); printk("Data Cache Parity Error\n");
if (reason & MCSR_GL_CI)
printk("Guarded Load or Cache-Inhibited stwcx.\n");
if (reason & MCSR_BUS_IAERR) if (reason & MCSR_BUS_IAERR)
printk("Bus - Instruction Address Error\n"); printk("Bus - Instruction Address Error\n");
if (reason & MCSR_BUS_RAERR) if (reason & MCSR_BUS_RAERR)
......
...@@ -223,7 +223,6 @@ ...@@ -223,7 +223,6 @@
#define MCSR_ICPERR 0x40000000UL /* I-Cache Parity Error */ #define MCSR_ICPERR 0x40000000UL /* I-Cache Parity Error */
#define MCSR_DCP_PERR 0x20000000UL /* D-Cache Push Parity Error */ #define MCSR_DCP_PERR 0x20000000UL /* D-Cache Push Parity Error */
#define MCSR_DCPERR 0x10000000UL /* D-Cache Parity Error */ #define MCSR_DCPERR 0x10000000UL /* D-Cache Parity Error */
#define MCSR_GL_CI 0x00010000UL /* Guarded Load or Cache-Inhibited stwcx. */
#define MCSR_BUS_IAERR 0x00000080UL /* Instruction Address Error */ #define MCSR_BUS_IAERR 0x00000080UL /* Instruction Address Error */
#define MCSR_BUS_RAERR 0x00000040UL /* Read Address Error */ #define MCSR_BUS_RAERR 0x00000040UL /* Read Address Error */
#define MCSR_BUS_WAERR 0x00000020UL /* Write Address Error */ #define MCSR_BUS_WAERR 0x00000020UL /* Write Address Error */
...@@ -232,6 +231,12 @@ ...@@ -232,6 +231,12 @@
#define MCSR_BUS_WBERR 0x00000004UL /* Write Data Bus Error */ #define MCSR_BUS_WBERR 0x00000004UL /* Write Data Bus Error */
#define MCSR_BUS_IPERR 0x00000002UL /* Instruction parity Error */ #define MCSR_BUS_IPERR 0x00000002UL /* Instruction parity Error */
#define MCSR_BUS_RPERR 0x00000001UL /* Read parity Error */ #define MCSR_BUS_RPERR 0x00000001UL /* Read parity Error */
/* e500 parts may set unused bits in MCSR; mask these off */
#define MCSR_MASK (MCSR_MCP | MCSR_ICPERR | MCSR_DCP_PERR | \
MCSR_DCPERR | MCSR_BUS_IAERR | MCSR_BUS_RAERR | \
MCSR_BUS_WAERR | MCSR_BUS_IBERR | MCSR_BUS_RBERR | \
MCSR_BUS_WBERR | MCSR_BUS_IPERR | MCSR_BUS_RPERR)
#endif #endif
#ifdef CONFIG_E200 #ifdef CONFIG_E200
#define MCSR_MCP 0x80000000UL /* Machine Check Input Pin */ #define MCSR_MCP 0x80000000UL /* Machine Check Input Pin */
...@@ -243,6 +248,11 @@ ...@@ -243,6 +248,11 @@
#define MCSR_BUS_DRERR 0x00000008UL /* Read Bus Error on data load */ #define MCSR_BUS_DRERR 0x00000008UL /* Read Bus Error on data load */
#define MCSR_BUS_WRERR 0x00000004UL /* Write Bus Error on buffered #define MCSR_BUS_WRERR 0x00000004UL /* Write Bus Error on buffered
store or cache line push */ store or cache line push */
/* e200 parts may set unused bits in MCSR; mask these off */
#define MCSR_MASK (MCSR_MCP | MCSR_CP_PERR | MCSR_CPERR | \
MCSR_EXCP_ERR | MCSR_BUS_IRERR | MCSR_BUS_DRERR | \
MCSR_BUS_WRERR)
#endif #endif
/* Bit definitions for the DBSR. */ /* Bit definitions for the DBSR. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment