diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2017-09-20 20:05:24 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-09-20 20:05:24 +1000 |
| commit | b134165eadd6dd07c49f8db40b218185ca3130b0 (patch) | |
| tree | a6271c7d5567f946e574b2dd0b26f06c3a331987 /arch | |
| parent | 5d298baa41883fc421acfd932799c0f4177249ae (diff) | |
| parent | a4e89ffb59235fd11d27107dea3efa4562ac0a12 (diff) | |
| download | linux-0-day-b134165eadd6dd07c49f8db40b218185ca3130b0.tar.gz linux-0-day-b134165eadd6dd07c49f8db40b218185ca3130b0.tar.xz | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into fixes
Merge one commit from Scott which I missed while away.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index ec74e203ee04e..13c9dcdcba692 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -437,6 +437,7 @@ static inline int check_io_access(struct pt_regs *regs) int machine_check_e500mc(struct pt_regs *regs) { unsigned long mcsr = mfspr(SPRN_MCSR); + unsigned long pvr = mfspr(SPRN_PVR); unsigned long reason = mcsr; int recoverable = 1; @@ -478,8 +479,15 @@ int machine_check_e500mc(struct pt_regs *regs) * may still get logged and cause a machine check. We should * only treat the non-write shadow case as non-recoverable. */ - if (!(mfspr(SPRN_L1CSR2) & L1CSR2_DCWS)) - recoverable = 0; + /* On e6500 core, L1 DCWS (Data cache write shadow mode) bit + * is not implemented but L1 data cache always runs in write + * shadow mode. Hence on data cache parity errors HW will + * automatically invalidate the L1 Data Cache. + */ + if (PVR_VER(pvr) != PVR_VER_E6500) { + if (!(mfspr(SPRN_L1CSR2) & L1CSR2_DCWS)) + recoverable = 0; + } } if (reason & MCSR_L2MMU_MHIT) { |