powerpc/e500mc: Implement machine check handler.
PATCH v2 1/1 powerpc/e500mc: Implement machine check handler.
From: Scott Wood <[email protected]>
Most of the MSCR bit assigments are different in e500mc versus e500, and they are now write-one-to-clear.
Some e500mc machine check conditions are made recoverable (as long as they aren't stuck on), most notably L1 instruction cache parity errors.
---
* Fix build error
arch/powerpc/include/asm/cputable.h | 1 + arch/powerpc/include/asm/reg_booke.h | 33 +++++++++---- arch/powerpc/kernel/cputable.c | 2 +- arch/powerpc/kernel/traps.c | 88 +++++++++++++++++++++++++++++++++- 4 files changed, 112 insertions(+), 12 deletions(-)
arch/powerpc/include/asm/cputable.h +1 -0
@@ -70,6 +70,7 @@ struct pt_regs;extern int machine_check_generic (struct pt_regs *regs);extern int machine_check_4xx (struct pt_regs *regs);extern int machine_check_440A (struct pt_regs *regs); +extern int machine_check_e500mc (struct pt_regs *regs);extern int machine_check_e500 (struct pt_regs *regs);extern int machine_check_e200 (struct pt_regs *regs);
arch/powerpc/include/asm/reg_booke.h +23 -10
@@ -4,6 +4,12 @@* are not true Book E PowerPCs, they borrowed a number of features * before Book E was finalized, and are included here as well. Unfortunatly, * they sometimes used different locations than true Book E CPUs did. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License version 2 +* as published by the Free Software Foundation. +* +* Copyright 2009-2010 Freescale Semiconductor, Inc. */ #ifdef __KERNEL__#ifndef __ASM_POWERPC_REG_BOOKE_H__
@@ -88,6 +94,7 @@#define SPRN_IVOR35 0x213/* Interrupt Vector Offset Register 35 */ #define SPRN_IVOR36 0x214/* Interrupt Vector Offset Register 36 */ #define SPRN_IVOR37 0x215/* Interrupt Vector Offset Register 37 */ +#define SPRN_MCARU 0x239/* Machine Check Address Register Upper */ #define SPRN_MCSRR0 0x23A/* Machine Check Save and Restore Register 0 */ #define SPRN_MCSRR1 0x23B/* Machine Check Save and Restore Register 1 */ #define SPRN_MCSR 0x23C/* Machine Check Status Register */
@@ -192,8 +199,11 @@#define MCSR_IMPE 0x00800000/* Imprecise Machine Check Exception */ #ifdef CONFIG_E500 +/* All e500 */ #define MCSR_MCP 0x80000000UL/* Machine Check Input Pin */ #define MCSR_ICPERR 0x40000000UL/* I-Cache Parity Error */ + +/* e500v1/v2 */ #define MCSR_DCP_PERR 0x20000000UL/* D-Cache Push Parity Error */ #define MCSR_DCPERR 0x10000000UL/* D-Cache Parity Error */ #define MCSR_BUS_IAERR 0x00000080UL/* Instruction Address Error */
@@ -205,12 +215,20 @@#define MCSR_BUS_IPERR 0x00000002UL/* Instruction 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) +/* e500mc */ +#define MCSR_DCPERR_MC 0x20000000UL/* D-Cache Parity Error */ +#define MCSR_L2MMU_MHIT 0x04000000UL/* Hit on multiple TLB entries */ +#define MCSR_NMI 0x00100000UL/* Non-Maskable Interrupt */ +#define MCSR_MAV 0x00080000UL/* MCAR address valid */ +#define MCSR_MEA 0x00040000UL/* MCAR is effective address */ +#define MCSR_IF 0x00010000UL/* Instruction Fetch */ +#define MCSR_LD 0x00008000UL/* Load */ +#define MCSR_ST 0x00004000UL/* Store */ +#define MCSR_LDG 0x00002000UL/* Guarded Load */ +#define MCSR_TLBSYNC 0x00000002UL/* Multiple tlbsyncs detected */ +#define MCSR_BSL2_ERR 0x00000001UL/* Backside L2 cache error */ #endif +#ifdef CONFIG_E200 #define MCSR_MCP 0x80000000UL/* Machine Check Input Pin */ #define MCSR_CP_PERR 0x20000000UL/* Cache Push Parity Error */
@@ -221,11 +239,6 @@#define MCSR_BUS_DRERR 0x00000008UL/* Read Bus Error on data load */ #define MCSR_BUS_WRERR 0x00000004UL/* Write Bus Error on buffered 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 /* Bit definitions for the DBSR. */
arch/powerpc/kernel/cputable.c +1 -1
@@ -1811,7 +1811,7 @@ static struct cpu_spec __initdata cpu_specs[] = { .oprofile_cpu_type = "ppc/e500mc", .oprofile_type = PPC_OPROFILE_FSL_EMB, .cpu_setup = __setup_cpu_e500mc, - .machine_check = machine_check_e500, + .machine_check = machine_check_e500mc, .platform = "ppce500mc", }, {/* default match */
arch/powerpc/kernel/traps.c +87 -1
105 lines not on this page · raw message
Signature · 1 line
1.6.0.6
Kumar Gala
AppliedQuoted 7 lines · Kumar Gala
From: Scott Wood <[email protected]>
=20
Most of the MSCR bit assigments are different in e500mc versus e500, and they are now write-one-to-clear.
=20
Some e500mc machine check conditions are made recoverable (as long as they aren't stuck on), most notably L1 instruction cache parity =
errors.
Quoted 10 lines
=20
Signed-off-by Scott Wood <[email protected]>Signed-off-by Kumar Gala <[email protected]>---
* Fix build error
=20arch/powerpc/include/asm/cputable.h | 1 + arch/powerpc/include/asm/reg_booke.h | 33 +++++++++---- arch/powerpc/kernel/cputable.c | 2 +- arch/powerpc/kernel/traps.c | 88 =
+++++++++++++++++++++++++++++++++-
Quoted 1 line
4 files changed, 112 insertions(+), 12 deletions(-)
applied to next
- k=