diff options
| author |  Christophe Leroy <christophe.leroy@csgroup.eu>
| 2022-12-19 19:46:00 +0100 |
|---|---|---|
| committer |  Michael Ellerman <mpe@ellerman.id.au>
| 2023-02-17 22:07:04 +1100 |
| commit | 3c2ce4912a6f44dfb11bc5d241b13e9f5d79078b (patch) | |
| tree | 0fdc270476b7571e2a50289e6c7ce3adb599d03d /arch/powerpc | |
| parent | powerpc: Pass correct CPU reference to assembler (diff) | |
| download | linux-3c2ce4912a6f44dfb11bc5d241b13e9f5d79078b.tar.gz linux-3c2ce4912a6f44dfb11bc5d241b13e9f5d79078b.tar.bz2 linux-3c2ce4912a6f44dfb11bc5d241b13e9f5d79078b.zip | |
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 <jbglaw@lug-owl.de>
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/b29c7f1727433b003eae050e44072741c8ac223b.1671475543.git.christophe.leroy@csgroup.eu
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/epapr_hcalls.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/epapr_hcalls.S b/arch/powerpc/kernel/epapr_hcalls.S index 69a912550577..033116e465d0 100644 --- a/arch/powerpc/kernel/epapr_hcalls.S +++ b/arch/powerpc/kernel/epapr_hcalls.S @@ -21,7 +21,13 @@ _GLOBAL(epapr_ev_idle) ori r4, r4,_TLF_NAPPING /* so when we take an exception */ PPC_STL r4, TI_LOCAL_FLAGS(r2) /* it will return to our caller */ +#ifdef CONFIG_BOOKE_OR_40x wrteei 1 +#else + mfmsr r4 + ori r4, r4, MSR_EE + mtmsr r4 +#endif idle_loop: LOAD_REG_IMMEDIATE(r11, EV_HCALL_TOKEN(EV_IDLE)) |