[PATCH v1 5/5] powerpc/epapr: Don't use wrteei on non booke

Pali Rohár pali at kernel.org
Wed Dec 21 07:21:11 AEDT 2022


On Monday 19 December 2022 19:46:00 Christophe Leroy wrote:
> wrteei is only for booke. Use the standard mfmsr/ori/mtmsr
> when non booke.
> 
> Reported-by: Jan-Benedict Glaw <jbglaw at lug-owl.de>
> Signed-off-by: Christophe Leroy <christophe.leroy at 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

This ePAPR code is according to ePAPR v1.1. So it does not have to be
e500 specific. But is there anything else in this category?

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


More information about the Linuxppc-dev mailing list