leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/64e: remove 64s specific interrupt soft-mask code

Browse Source 
Since the assembly soft-masking code was moved to 64e specific, there
are some 64s specific interrupt types still there. Remove them.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200915114650.3980244-4-npiggin@gmail.com
This commit is contained in:
Nicholas Piggin 2020-09-15 21:46:48 +10:00 committed by Michael Ellerman
parent 012a9a97a8
commit 903dd1ff45
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/powerpc/kernel/exceptions-64e.S
View File

@ -1302,16 +1302,6 @@ fast_exception_return:
addi r3,r1,STACK_FRAME_OVERHEAD; addi r3,r1,STACK_FRAME_OVERHEAD;
bl do_IRQ bl do_IRQ
b ret_from_except b ret_from_except
1: cmpwi cr0,r3,0xf00
bne 1f
addi r3,r1,STACK_FRAME_OVERHEAD;
bl performance_monitor_exception
b ret_from_except
1: cmpwi cr0,r3,0xe60
bne 1f
addi r3,r1,STACK_FRAME_OVERHEAD;
bl handle_hmi_exception
b ret_from_except
1: cmpwi cr0,r3,0x900 1: cmpwi cr0,r3,0x900
bne 1f bne 1f
addi r3,r1,STACK_FRAME_OVERHEAD; addi r3,r1,STACK_FRAME_OVERHEAD;

2
arch/powerpc/kernel/irq.c
View File

@ -113,7 +113,7 @@ static inline notrace int decrementer_check_overflow(void)
#ifdef CONFIG_PPC_BOOK3E #ifdef CONFIG_PPC_BOOK3E
/* This is called whenever we are re-enabling interrupts /* This is called whenever we are re-enabling interrupts
* and returns either 0 (nothing to do) or 500/900/280/a00/e80 if * and returns either 0 (nothing to do) or 500/900/280 if
* there's an EE, DEC or DBELL to generate. * there's an EE, DEC or DBELL to generate.
* *
* This is called in two contexts: From arch_local_irq_restore() * This is called in two contexts: From arch_local_irq_restore()