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

Commit 572177d7 authored by Tiejun Chen's avatar Tiejun Chen Committed by Benjamin Herrenschmidt
Browse files

powerpc/book3e: Disable interrupt after preempt_schedule_irq 



In preempt case current arch_local_irq_restore() from
preempt_schedule_irq() may enable hard interrupt but we really
should disable interrupts when we return from the interrupt,
and so that we don't get interrupted after loading SRR0/1.

Signed-off-by: default avatarTiejun Chen <tiejun.chen@windriver.com>
CC: <stable@vger.kernel.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 46ed7a76

arch/powerpc/kernel/entry_64.S

+13 −0
Original line number Diff line number Diff line
@@ -664,6 +664,19 @@ resume_kernel: 
	ld	r4,TI_FLAGS(r9)

	andi.	r0,r4,_TIF_NEED_RESCHED

	bne	1b



	/*

	 * arch_local_irq_restore() from preempt_schedule_irq above may

	 * enable hard interrupt but we really should disable interrupts

	 * when we return from the interrupt, and so that we don't get

	 * interrupted after loading SRR0/1.

	 */

#ifdef CONFIG_PPC_BOOK3E

	wrteei	0

#else

	ld	r10,PACAKMSR(r13) /* Get kernel MSR without EE */

	mtmsrd	r10,1		  /* Update machine state */

#endif /* CONFIG_PPC_BOOK3E */

#endif /* CONFIG_PREEMPT */



	.globl	fast_exc_return_irq