Commit 014b2e89 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc/rtas: Leave MSR[RI] enabled over RTAS call 



PAPR specifies that RTAS may be called with MSR[RI] enabled if the
calling context is recoverable, and RTAS will manage RI as necessary.
Call the rtas entry point with RI enabled, and add a check to ensure
the caller has RI enabled.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20220308135047.478297-10-npiggin@gmail.com
parent 5c86bd02

arch/powerpc/kernel/rtas_entry.S

+2 −9
Original line number Diff line number Diff line
@@ -122,15 +122,8 @@ __enter_rtas: 
rtas_return_loc:

	FIXUP_ENDIAN



	/*

	 * Clear RI and set SF before anything.

	 */

	mfmsr	r6

	li	r0,MSR_RI

	andc	r6,r6,r0

	sldi	r0,r0,(MSR_SF_LG - MSR_RI_LG)

	or	r6,r6,r0

	sync

	/* Set SF before anything. */

	LOAD_REG_IMMEDIATE(r6, MSR_KERNEL & ~(MSR_IR|MSR_DR))

	mtmsrd	r6



	/* relocation is off at this point */