From: Nicholas Piggin <npiggin@gmail•com>
To: linuxppc-dev@ozlabs•org
Cc: Nicholas Piggin <npiggin@gmail•com>,
Mahesh Salgaonkar <mahesh@linux•vnet.ibm.com>,
"Shreyas B . Prabhu" <shreyas@linux•vnet.ibm.com>,
Stewart Smith <stewart@linux•vnet.ibm.com>
Subject: [PATCH 1/2] powerpc/pseries: PACA save area fix for general exception vs MCE
Date: Wed, 10 Aug 2016 20:48:42 +1000 [thread overview]
Message-ID: <1470826123-14699-2-git-send-email-npiggin@gmail.com> (raw)
In-Reply-To: <1470826005-14520-1-git-send-email-npiggin@gmail.com>
MCE must not use PACA_EXGEN. When a general exception enables MSR_RI,
that means SPRN_SRR[01] and SPRN_SPRG are no longer used. However the
PACA save area is still in use.
---
arch/powerpc/kernel/exceptions-64s.S | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 694def6..4174c4e 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -984,14 +984,14 @@ ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_RADIX)
machine_check_common:
mfspr r10,SPRN_DAR
- std r10,PACA_EXGEN+EX_DAR(r13)
+ std r10,PACA_EXMC+EX_DAR(r13)
mfspr r10,SPRN_DSISR
- stw r10,PACA_EXGEN+EX_DSISR(r13)
+ stw r10,PACA_EXMC+EX_DSISR(r13)
EXCEPTION_PROLOG_COMMON(0x200, PACA_EXMC)
FINISH_NAP
RECONCILE_IRQ_STATE(r10, r11)
- ld r3,PACA_EXGEN+EX_DAR(r13)
- lwz r4,PACA_EXGEN+EX_DSISR(r13)
+ ld r3,PACA_EXMC+EX_DAR(r13)
+ lwz r4,PACA_EXMC+EX_DSISR(r13)
std r3,_DAR(r1)
std r4,_DSISR(r1)
bl save_nvgprs
--
2.8.1
next prev parent reply other threads:[~2016-08-10 10:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-10 10:46 [RFC][PATCH 0/2] powerpc/pseries machine check reentrancy fixes Nicholas Piggin
2016-08-10 10:48 ` Nicholas Piggin [this message]
2016-08-11 6:45 ` [PATCH 1/2] powerpc/pseries: PACA save area fix for general exception vs MCE Mahesh Jagannath Salgaonkar
2016-08-10 10:48 ` [PATCH 2/2] powerpc/pseries: PACA save area fix for MCE " Nicholas Piggin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1470826123-14699-2-git-send-email-npiggin@gmail.com \
--to=npiggin@gmail$(echo .)com \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=mahesh@linux$(echo .)vnet.ibm.com \
--cc=shreyas@linux$(echo .)vnet.ibm.com \
--cc=stewart@linux$(echo .)vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox