Changeset f6cf76f in mainline

Timestamp:

2019-04-05T18:30:19Z (5 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

29beac8

Parents:

f4bb404

Message:

Move PIC spurious IRQ handling into arch code

As each architecture or even machine does IRQs differently, the genarch
i8259 driver cannot register the PIC spurious IRQ interrupt itself.

Location:

kernel

Files:

• arch/amd64/include/arch/interrupt.h (modified) (2 diffs)
• arch/amd64/src/interrupt.c (modified) (4 diffs)
• arch/ia32/include/arch/interrupt.h (modified) (2 diffs)
• arch/ia32/src/interrupt.c (modified) (4 diffs)
• arch/mips32/include/arch/mach/malta/malta.h (modified) (1 diff)
• arch/mips32/src/mach/malta/malta.c (modified) (1 diff)
• genarch/src/drivers/i8259/i8259.c (modified) (3 diffs)

kernel/arch/amd64/include/arch/interrupt.h

@@ -61 +61 @@
 /* NS16550 at COM1 */
 #define IRQ_NS16550   4
-#define IRQ_PIC_SPUR  7
+#define IRQ_PIC0_SPUR 7
 #define IRQ_MOUSE     12
+#define IRQ_PIC1_SPUR 15
 
 /* This one must have four least significant bits set to ones */
@@ -77 +78 @@
 #define VECTOR_PF                 (IVT_EXCBASE + EXC_PF)
 #define VECTOR_CLK                (IVT_IRQBASE + IRQ_CLK)
-#define VECTOR_PIC_SPUR           (IVT_IRQBASE + IRQ_PIC_SPUR)
+#define VECTOR_PIC0_SPUR          (IVT_IRQBASE + IRQ_PIC0_SPUR)
+#define VECTOR_PIC1_SPUR          (IVT_IRQBASE + IRQ_PIC1_SPUR)
 #define VECTOR_SYSCALL            IVT_FREEBASE
 #define VECTOR_TLB_SHOOTDOWN_IPI  (IVT_FREEBASE + 1)

kernel/arch/amd64/src/interrupt.c

@@ -172 +172 @@
         bool ack = false;
         assert(inum < IRQ_COUNT);
-        assert((inum != IRQ_PIC_SPUR) && (inum != IRQ_PIC1));
+        assert(inum != IRQ_PIC0_SPUR);
+        assert(inum != IRQ_PIC1_SPUR);
+        assert(inum != IRQ_PIC1);
 
         irq_t *irq = irq_dispatch_and_lock(inum);
@@ -201 +203 @@
 }
 
+static void pic_spurious(unsigned int n, istate_t *istate)
+{
+        /*
+         * XXX: Examine ISR to figure out whether this is indeed a spurious
+         *      or actual IRQ.
+         */
+#ifdef CONFIG_DEBUG
+        log(LF_ARCH, LVL_DEBUG, "cpu%u: PIC spurious interrupt", CPU->id);
+#endif
+}
+
 void interrupt_init(void)
 {
@@ -209 +222 @@
 
         for (i = 0; i < IRQ_COUNT; i++) {
-                if ((i != IRQ_PIC_SPUR) && (i != IRQ_PIC1))
+                if ((i != IRQ_PIC0_SPUR) && (i != IRQ_PIC1_SPUR)
+                    && (i != IRQ_PIC1))
                         exc_register(IVT_IRQBASE + i, "irq", true,
                             (iroutine_t) irq_interrupt);
@@ -218 +232 @@
         exc_register(VECTOR_SS, "ss_fault", true, (iroutine_t) ss_fault);
         exc_register(VECTOR_GP, "gp_fault", true, (iroutine_t) gp_fault);
+        exc_register(VECTOR_PIC0_SPUR, "pic0_spurious", true,
+            (iroutine_t) pic_spurious);
+        exc_register(VECTOR_PIC1_SPUR, "pic1_spurious", true,
+            (iroutine_t) pic_spurious);
 
 #ifdef CONFIG_SMP

kernel/arch/ia32/include/arch/interrupt.h

@@ -63 +63 @@
 /* NS16550 at COM1 */
 #define IRQ_NS16550   4
-#define IRQ_PIC_SPUR  7
+#define IRQ_PIC0_SPUR 7
 #define IRQ_MOUSE     12
+#define IRQ_PIC1_SPUR 15
 
 /* This one must have four least significant bits set to ones */
@@ -81 +82 @@
 #define VECTOR_XM                 (IVT_EXCBASE + EXC_XM)
 #define VECTOR_CLK                (IVT_IRQBASE + IRQ_CLK)
-#define VECTOR_PIC_SPUR           (IVT_IRQBASE + IRQ_PIC_SPUR)
+#define VECTOR_PIC0_SPUR          (IVT_IRQBASE + IRQ_PIC0_SPUR)
+#define VECTOR_PIC1_SPUR          (IVT_IRQBASE + IRQ_PIC1_SPUR)
 #define VECTOR_SYSCALL            IVT_FREEBASE
 #define VECTOR_TLB_SHOOTDOWN_IPI  (IVT_FREEBASE + 1)

kernel/arch/ia32/src/interrupt.c

@@ -192 +192 @@
         bool ack = false;
         assert(inum < IRQ_COUNT);
-        assert((inum != IRQ_PIC_SPUR) && (inum != IRQ_PIC1));
+        assert(inum != IRQ_PIC0_SPUR);
+        assert(inum != IRQ_PIC1_SPUR);
+        assert(inum != IRQ_PIC1);
 
         irq_t *irq = irq_dispatch_and_lock(inum);
@@ -220 +222 @@
 }
 
+static void pic_spurious(unsigned int n, istate_t *istate)
+{
+        /*
+         * XXX: Examine ISR to figure out whether this is indeed a spurious
+         *      or actual IRQ.
+         */
+#ifdef CONFIG_DEBUG
+        log(LF_ARCH, LVL_DEBUG, "cpu%u: PIC spurious interrupt", CPU->id);
+#endif
+}
+
 void interrupt_init(void)
 {
@@ -228 +241 @@
 
         for (i = 0; i < IRQ_COUNT; i++) {
-                if ((i != IRQ_PIC_SPUR) && (i != IRQ_PIC1))
+                if ((i != IRQ_PIC0_SPUR) && (i != IRQ_PIC1_SPUR) &&
+                    (i != IRQ_PIC1))
                         exc_register(IVT_IRQBASE + i, "irq", true,
                             (iroutine_t) irq_interrupt);
@@ -239 +253 @@
         exc_register(VECTOR_GP, "gp_fault", true, (iroutine_t) gp_fault);
         exc_register(VECTOR_XM, "simd_fp", true, (iroutine_t) simd_fp_exception);
+        exc_register(VECTOR_PIC0_SPUR, "pic0_spurious", true,
+            (iroutine_t) pic_spurious);
+        exc_register(VECTOR_PIC1_SPUR, "pic1_spurious", true,
+            (iroutine_t) pic_spurious);
 
 #ifdef CONFIG_SMP

kernel/arch/mips32/include/arch/mach/malta/malta.h

@@ -45 +45 @@
 
 #define PIC0_BASE               (MALTA_PCI_BASE + 0x20)
+#define PIC0_SPURIOUS_IRQ       7
 #define PIC1_BASE               (MALTA_PCI_BASE + 0xa0)
+#define PIC1_SPURIOUS_IRQ       15
 
 #define ISA_IRQ_COUNT           16

kernel/arch/mips32/src/mach/malta/malta.c

@@ -74 +74 @@
 {
         uint8_t isa_irq = host2uint32_t_le(pio_read_32(GT64120_PCI0_INTACK));
+        if (isa_irq == PIC0_SPURIOUS_IRQ || isa_irq == PIC1_SPURIOUS_IRQ) {
+                /*
+                 * XXX: Examine ISR to figure out whether this is indeed a
+                 *      spurious or actual IRQ.
+                 */
+#ifdef CONFIG_DEBUG
+                log(LF_ARCH, LVL_DEBUG, "cpu%u: PIC spurious interrupt",
+                    CPU->id);
+                return;
+#endif
+        }
         irq_t *irq = irq_dispatch_and_lock(isa_irq);
         if (irq) {

kernel/genarch/src/drivers/i8259/i8259.c

@@ -43 +43 @@
 #include <interrupt.h>
 
-static void pic_spurious(unsigned int n, istate_t *istate);
-
 // XXX: need to change pic_* API to get rid of these
 static i8259_t *saved_pic0;
@@ -78 +76 @@
         /* ICW4: i8086 mode */
         pio_write_8(&pic1->port2, 1);
-
-        /*
-         * Register interrupt handler for the PIC spurious interrupt.
-         *
-         * XXX: This is currently broken. Both IRQ 7 and IRQ 15 can be spurious
-         *      or can be actual interrupts. This needs to be detected when
-         *      the interrupt happens by inspecting ISR.
-         */
-        exc_register(irq0_int + 7, "pic_spurious", false,
-            (iroutine_t) pic_spurious);
 
         pic_disable_irqs(0xffff);               /* disable all irq's */
@@ -130 +118 @@
 }
 
-void pic_spurious(unsigned int n __attribute__((unused)), istate_t *istate __attribute__((unused)))
-{
-#ifdef CONFIG_DEBUG
-        log(LF_ARCH, LVL_DEBUG, "cpu%u: PIC spurious interrupt", CPU->id);
-#endif
-}
-
 /** @}
  */