Skip to content

Commit 3c2ce49

Browse files
chleroympe
authored andcommitted
powerpc/epapr: Don't use wrteei on non booke
wrteei is only for booke. Use the standard mfmsr/ori/mtmsr when non booke. Reported-by: Jan-Benedict Glaw <[email protected]> Signed-off-by: Christophe Leroy <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/b29c7f1727433b003eae050e44072741c8ac223b.1671475543.git.christophe.leroy@csgroup.eu
1 parent bfb03af commit 3c2ce49

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

arch/powerpc/kernel/epapr_hcalls.S

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,13 @@ _GLOBAL(epapr_ev_idle)
2121
ori r4, r4,_TLF_NAPPING /* so when we take an exception */
2222
PPC_STL r4, TI_LOCAL_FLAGS(r2) /* it will return to our caller */
2323

24+
#ifdef CONFIG_BOOKE_OR_40x
2425
wrteei 1
26+
#else
27+
mfmsr r4
28+
ori r4, r4, MSR_EE
29+
mtmsr r4
30+
#endif
2531

2632
idle_loop:
2733
LOAD_REG_IMMEDIATE(r11, EV_HCALL_TOKEN(EV_IDLE))

0 commit comments

Comments
 (0)