powerpc/64e: remove PACA_IRQ_EE_EDGE

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

diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h
index 538698f..2034f95 100644 (file)
--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
@@ -25,9 +25,8 @@
 #define PACA_IRQ_DBELL         0x02
 #define PACA_IRQ_EE            0x04
 #define PACA_IRQ_DEC           0x08 /* Or FIT */
-#define PACA_IRQ_EE_EDGE       0x10 /* BookE only */
-#define PACA_IRQ_HMI           0x20
-#define PACA_IRQ_PMI           0x40
+#define PACA_IRQ_HMI           0x10
+#define PACA_IRQ_PMI           0x20
 
 /*
  * Some soft-masked interrupts must be hard masked until they are replayed

diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
index d9ed794..ca444ca 100644 (file)
--- a/arch/powerpc/kernel/exceptions-64e.S
+++ b/arch/powerpc/kernel/exceptions-64e.S
@@ -988,7 +988,6 @@ kernel_dbg_exc:
 .endm
 
 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_0x900:

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 3fdad93..736a6b5 100644 (file)
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -181,16 +181,6 @@ notrace unsigned int __check_irq_replay(void)
                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) {
                local_paca->irq_happened &= ~PACA_IRQ_DBELL;
                return 0x280;
@@ -270,19 +260,6 @@ again:
                        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)) {
                local_paca->irq_happened &= ~PACA_IRQ_DBELL;
                if (IS_ENABLED(CONFIG_PPC_BOOK3E))