wrteei is only for booke. Use the standard mfmsr/ori/mtmsr
when non booke.

Reported-by: Jan-Benedict Glaw <jbg...@lug-owl.de>
Signed-off-by: Christophe Leroy <christophe.le...@csgroup.eu>
---
Not sure this is needed at all, the commit that introduced the code says it is 
for e500, but there's no such limitation in Kconfig. Maybe we should limit all 
the file to CONFIG_PPC_E500
---
 arch/powerpc/kernel/epapr_hcalls.S | 6 ++++++
 1 file changed, 6 insertions(+)

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))
-- 
2.38.1

Reply via email to