All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nicholas Piggin <npiggin@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>,
	Ganesh Goudar <ganeshgr@linux.ibm.com>,
	Nicholas Piggin <npiggin@gmail.com>
Subject: [PATCH v3 03/15] powerpc/64s/exceptions: Change irq reconcile for NMIs from reusing _DAR to RESULT
Date: Tue,  7 Apr 2020 15:16:24 +1000	[thread overview]
Message-ID: <20200407051636.648369-4-npiggin@gmail.com> (raw)
In-Reply-To: <20200407051636.648369-1-npiggin@gmail.com>

A spare interrupt stack slot is needed to save irq state when
reconciling NMIs (sreset and decrementer soft-nmi). _DAR is used
for this, but we want to reconcile machine checks as well, which
do use _DAR. Switch to using RESULT instead, as it's used by
system calls.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 arch/powerpc/kernel/exceptions-64s.S | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 3322000316ab..a42b73efb1a9 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -939,13 +939,13 @@ EXC_COMMON_BEGIN(system_reset_common)
 	 * the right thing. We do not want to reconcile because that goes
 	 * through irq tracing which we don't want in NMI.
 	 *
-	 * Save PACAIRQHAPPENED to _DAR (otherwise unused), and set HARD_DIS
+	 * Save PACAIRQHAPPENED to RESULT (otherwise unused), and set HARD_DIS
 	 * as we are running with MSR[EE]=0.
 	 */
 	li	r10,IRQS_ALL_DISABLED
 	stb	r10,PACAIRQSOFTMASK(r13)
 	lbz	r10,PACAIRQHAPPENED(r13)
-	std	r10,_DAR(r1)
+	std	r10,RESULT(r1)
 	ori	r10,r10,PACA_IRQ_HARD_DIS
 	stb	r10,PACAIRQHAPPENED(r13)
 
@@ -966,7 +966,7 @@ EXC_COMMON_BEGIN(system_reset_common)
 	/*
 	 * Restore soft mask settings.
 	 */
-	ld	r10,_DAR(r1)
+	ld	r10,RESULT(r1)
 	stb	r10,PACAIRQHAPPENED(r13)
 	ld	r10,SOFTE(r1)
 	stb	r10,PACAIRQSOFTMASK(r13)
@@ -2743,7 +2743,7 @@ EXC_COMMON_BEGIN(soft_nmi_common)
 	li	r10,IRQS_ALL_DISABLED
 	stb	r10,PACAIRQSOFTMASK(r13)
 	lbz	r10,PACAIRQHAPPENED(r13)
-	std	r10,_DAR(r1)
+	std	r10,RESULT(r1)
 	ori	r10,r10,PACA_IRQ_HARD_DIS
 	stb	r10,PACAIRQHAPPENED(r13)
 
@@ -2757,7 +2757,7 @@ EXC_COMMON_BEGIN(soft_nmi_common)
 	/*
 	 * Restore soft mask settings.
 	 */
-	ld	r10,_DAR(r1)
+	ld	r10,RESULT(r1)
 	stb	r10,PACAIRQHAPPENED(r13)
 	ld	r10,SOFTE(r1)
 	stb	r10,PACAIRQSOFTMASK(r13)
-- 
2.23.0


  parent reply	other threads:[~2020-04-07  5:26 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-07  5:16 [PATCH v3 00/15] powerpc/64: machine check and system reset fixes Nicholas Piggin
2020-04-07  5:16 ` [PATCH v3 01/15] powerpc/64s/exception: Fix machine check no-loss idle wakeup Nicholas Piggin
2020-04-07  5:16 ` [PATCH v3 02/15] powerpc/64s/exceptions: Fix in_mce accounting in unrecoverable path Nicholas Piggin
2020-04-07  5:16 ` Nicholas Piggin [this message]
2020-04-07  5:16 ` [PATCH v3 04/15] powerpc/64s/exceptions: machine check reconcile irq state Nicholas Piggin
2020-04-07  5:16 ` [PATCH v3 05/15] powerpc/pseries/ras: avoid calling rtas_token in NMI paths Nicholas Piggin
2020-04-07  5:42   ` Christophe Leroy
2020-04-07  5:16 ` [PATCH v3 06/15] powerpc/pseries/ras: FWNMI_VALID off by one Nicholas Piggin
2020-04-07  5:16 ` [PATCH v3 07/15] powerpc/pseries/ras: fwnmi avoid modifying r3 in error case Nicholas Piggin
2020-04-07  5:16 ` [PATCH v3 08/15] powerpc/pseries/ras: fwnmi sreset should not interlock Nicholas Piggin
2020-04-07  5:41   ` Christophe Leroy
2020-04-07  5:16 ` [PATCH v3 09/15] powerpc/pseries: limit machine check stack to 4GB Nicholas Piggin
2020-04-07  5:38   ` Christophe Leroy
2020-04-07  5:16 ` [PATCH v3 10/15] powerpc/pseries: machine check use rtas_call_unlocked with args on stack Nicholas Piggin
2020-04-07  5:16 ` [PATCH v3 11/15] powerpc/64s: machine check interrupt update NMI accounting Nicholas Piggin
2020-04-07  5:37   ` Christophe Leroy
2020-05-06  3:50     ` Nicholas Piggin
2020-04-12  8:46   ` kbuild test robot
2020-04-12  8:46     ` kbuild test robot
2020-04-07  5:16 ` [PATCH v3 12/15] powerpc: ftrace_enabled helper Nicholas Piggin
2020-04-07  5:45   ` Christophe Leroy
2020-04-07  5:16 ` [PATCH v3 13/15] powerpc/64s: machine check do not trace real-mode handler Nicholas Piggin
2020-04-07  5:45   ` Christophe Leroy
2020-04-07  5:16 ` [PATCH v3 14/15] powerpc/64s: system reset do not trace Nicholas Piggin
2020-04-07  5:45   ` Christophe Leroy
2020-04-07  5:16 ` [PATCH v3 15/15] powerpc: make unrecoverable NMIs die instead of panic Nicholas Piggin
2020-04-07  5:46   ` Christophe Leroy

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=20200407051636.648369-4-npiggin@gmail.com \
    --to=npiggin@gmail.com \
    --cc=ganeshgr@linux.ibm.com \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mahesh@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.