Changeset f6cf76f in mainline for kernel/arch/ia32

Timestamp:

2019-04-05T18:30:19Z (7 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/arch/ia32

Files:

• include/arch/interrupt.h (modified) (2 diffs)
• src/interrupt.c (modified) (4 diffs)

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