From: Nicholas Piggin <npiggin@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Nicholas Piggin <npiggin@gmail.com>,
Christian Zigotzky <chzigotzky@xenosoft.de>
Subject: [PATCH] powerpc/64e: Fix system call illegal mtmsrd instruction
Date: Tue, 6 Jul 2021 15:13:10 +1000 [thread overview]
Message-ID: <20210706051310.608992-1-npiggin@gmail.com> (raw)
BookE does not have mtmsrd, switch to use wrteei to enable MSR[EE].
Reported-by: Christian Zigotzky <chzigotzky@xenosoft.de>
Fixes: dd152f70bdc1 ("powerpc/64s: system call avoid setting MSR[RI] until we set MSR[EE]")
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
This wasn't caught by QEMU because it executes mtmsrd just fine on BookE
CPUs. Patching that reproduces the problem and verifies this fix.
arch/powerpc/kernel/interrupt_64.S | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/kernel/interrupt_64.S b/arch/powerpc/kernel/interrupt_64.S
index 4063e8a3f704..d4212d2ff0b5 100644
--- a/arch/powerpc/kernel/interrupt_64.S
+++ b/arch/powerpc/kernel/interrupt_64.S
@@ -311,9 +311,13 @@ END_BTB_FLUSH_SECTION
* trace_hardirqs_off().
*/
li r11,IRQS_ALL_DISABLED
- li r12,-1 /* Set MSR_EE and MSR_RI */
stb r11,PACAIRQSOFTMASK(r13)
+#ifdef CONFIG_PPC_BOOK3S
+ li r12,-1 /* Set MSR_EE and MSR_RI */
mtmsrd r12,1
+#else
+ wrteei 1
+#endif
/* Calling convention has r9 = orig r0, r10 = regs */
mr r9,r0
--
2.23.0
next reply other threads:[~2021-07-06 5:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-06 5:13 Nicholas Piggin [this message]
2021-07-06 10:52 ` [PATCH] powerpc/64e: Fix system call illegal mtmsrd instruction Michael Ellerman
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=20210706051310.608992-1-npiggin@gmail.com \
--to=npiggin@gmail.com \
--cc=chzigotzky@xenosoft.de \
--cc=linuxppc-dev@lists.ozlabs.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).