Changeset f6cf76f in mainline for kernel/arch/amd64/src/interrupt.c

Timestamp:

2019-04-05T18:30:19Z (6 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.

File:

• kernel/arch/amd64/src/interrupt.c (modified) (4 diffs)

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