Skip to content

Commit

Permalink
powerpc/64e: Fix system call illegal mtmsrd instruction
Browse files Browse the repository at this point in the history
BookE does not have mtmsrd, switch to use wrteei to enable MSR[EE].

Fixes: dd152f7 ("powerpc/64s: system call avoid setting MSR[RI] until we set MSR[EE]")
Reported-by: Christian Zigotzky <chzigotzky@xenosoft.de>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210706051310.608992-1-npiggin@gmail.com
  • Loading branch information
npiggin authored and mpe committed Jul 6, 2021
1 parent 3f60160 commit 1df3af6
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion arch/powerpc/kernel/interrupt_64.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1df3af6

Please sign in to comment.