Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c675c7db authored Oct 07, 2014 by Mahesh Salgaonkar Committed by Michael Ellerman Oct 10, 2014

powerpc/book3s: Don't clear MSR_RI in hmi handler.



In HMI interrupt handler we don't touch SRR0/SRR1, instead we touch
HSRR0/HSRR1. Hence we don't need to clear MSR_RI bit.

Signed-off-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

parent 1028ccf5

arch/powerpc/kernel/exceptions-64s.S

+0 −5

Original line number	Diff line number	Diff line
		@@ -1270,11 +1270,6 @@ hmi_exception_early:
		addi r3,r1,STACK_FRAME_OVERHEAD
		bl hmi_exception_realmode
		/* Windup the stack. */
		/* Clear MSR_RI before setting SRR0 and SRR1. */
		li r0,MSR_RI
		mfmsr r9 /* get MSR value */
		andc r9,r9,r0
		mtmsrd r9,1 /* Clear MSR_RI */
		/* Move original HSRR0 and HSRR1 into the respective regs */
		ld r9,_MSR(r1)
		mtspr SPRN_HSRR1,r9