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

powerpc/64e: remove PACA_IRQ_EE_EDGE

Browse Source 
This is not used anywhere.

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-3-npiggin@gmail.com
This commit is contained in:
Nicholas Piggin
2020-09-15 21:46:47 +10:00
committed by Michael Ellerman
parent 2b48e96be2
commit 012a9a97a8
3 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/include/asm/hw_irq.h
View File

@@ -25,9 +25,8 @@
#define PACA_IRQ_DBELL 0x02 #define PACA_IRQ_DBELL 0x02
#define PACA_IRQ_EE 0x04 #define PACA_IRQ_EE 0x04
#define PACA_IRQ_DEC 0x08 /* Or FIT */ #define PACA_IRQ_DEC 0x08 /* Or FIT */
#define PACA_IRQ_EE_EDGE 0x10 /* BookE only */ #define PACA_IRQ_HMI 0x10
#define PACA_IRQ_HMI 0x20 #define PACA_IRQ_PMI 0x20
#define PACA_IRQ_PMI 0x40
/* /*
* Some soft-masked interrupts must be hard masked until they are replayed * Some soft-masked interrupts must be hard masked until they are replayed

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

@@ -988,7 +988,6 @@ kernel_dbg_exc:
.endm .endm
masked_interrupt_book3e_0x500: masked_interrupt_book3e_0x500:
// XXX When adding support for EPR, use PACA_IRQ_EE_EDGE
masked_interrupt_book3e PACA_IRQ_EE 1 masked_interrupt_book3e PACA_IRQ_EE 1
masked_interrupt_book3e_0x900: masked_interrupt_book3e_0x900:

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

@@ -181,16 +181,6 @@ notrace unsigned int __check_irq_replay(void)
return 0x500; return 0x500;
} }
/*
* Check if an EPR external interrupt happened this bit is typically
* set if we need to handle another "edge" interrupt from within the
* MPIC "EPR" handler.
*/
if (happened & PACA_IRQ_EE_EDGE) {
local_paca->irq_happened &= ~PACA_IRQ_EE_EDGE;
return 0x500;
}
if (happened & PACA_IRQ_DBELL) { if (happened & PACA_IRQ_DBELL) {
local_paca->irq_happened &= ~PACA_IRQ_DBELL; local_paca->irq_happened &= ~PACA_IRQ_DBELL;
return 0x280; return 0x280;
@@ -270,19 +260,6 @@ again:
hard_irq_disable(); hard_irq_disable();
} }
/*
* Check if an EPR external interrupt happened this bit is typically
* set if we need to handle another "edge" interrupt from within the
* MPIC "EPR" handler.
*/
if (IS_ENABLED(CONFIG_PPC_BOOK3E) && (happened & PACA_IRQ_EE_EDGE)) {
local_paca->irq_happened &= ~PACA_IRQ_EE_EDGE;
regs.trap = 0x500;
do_IRQ(&regs);
if (!(local_paca->irq_happened & PACA_IRQ_HARD_DIS))
hard_irq_disable();
}
if (IS_ENABLED(CONFIG_PPC_DOORBELL) && (happened & PACA_IRQ_DBELL)) { if (IS_ENABLED(CONFIG_PPC_DOORBELL) && (happened & PACA_IRQ_DBELL)) {
local_paca->irq_happened &= ~PACA_IRQ_DBELL; local_paca->irq_happened &= ~PACA_IRQ_DBELL;
if (IS_ENABLED(CONFIG_PPC_BOOK3E)) if (IS_ENABLED(CONFIG_PPC_BOOK3E))