[RFC PATCH v1 16/16] powerpc/32: don't do syscall stuff in transfer_to_handler on non BOOKE
From: Christophe Leroy <hidden>
Date: 2019-02-08 12:53:00
Also in:
lkml
Subsystem:
linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Michael Ellerman, Linus Torvalds
As syscalls are now handled via a fast entry path, syscall related actions can be removed from the generic transfer_to_handler path. Signed-off-by: Christophe Leroy <redacted> --- arch/powerpc/kernel/entry_32.S | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 0927d5ff1e79..85f1fc88c237 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S@@ -211,7 +211,9 @@ transfer_to_handler_cont: */ tophys(r12, r1) lwz r12,_MSR(r12) +#ifdef CONFIG_BOOKE /* to be removed once BOOKE uses fast syscall entry */ xor r12,r10,r12 +#endif andi. r12,r12,MSR_EE bne 1f
@@ -252,8 +254,10 @@ reenable_mmu: * the rest is restored from the exception frame. */ +#ifdef CONFIG_BOOKE /* to be removed once BOOKE uses fast syscall entry */ /* Are we enabling or disabling interrupts ? */ andi. r0,r10,MSR_EE +#endif stwu r1,-32(r1) stw r9,8(r1)
@@ -262,7 +266,9 @@ reenable_mmu: stw r4,20(r1) stw r5,24(r1) +#ifdef CONFIG_BOOKE /* to be removed once BOOKE uses fast syscall entry */ bne- 0f +#endif /* If we are disabling interrupts (normal case), simply log it with * lockdep
@@ -282,6 +288,7 @@ reenable_mmu: mtlr r9 bctr /* jump to handler */ +#ifdef CONFIG_BOOKE /* to be removed once BOOKE uses fast syscall entry */ /* If we are enabling interrupt, this is a syscall. They shouldn't * happen while interrupts are disabled, so let's do a warning here. */
@@ -294,6 +301,7 @@ reenable_mmu: ori r10,r10,MSR_EE mtmsr r10 b 2b +#endif #endif /* CONFIG_TRACE_IRQFLAGS */ #if defined (CONFIG_PPC_BOOK3S_32) || defined(CONFIG_E500)
--
2.13.3