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

Timestamp:

2019-04-06T08:10:27Z (5 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

534bcdf

Parents:

ef56a43

Message:

Handle PIC spurious IRQs with care

File:

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

kernel/arch/amd64/src/interrupt.c

@@ -172 +172 @@
         bool ack = false;
         assert(inum < IRQ_COUNT);
-        assert(inum != IRQ_PIC0_SPUR);
-        assert(inum != IRQ_PIC1_SPUR);
         assert(inum != IRQ_PIC1);
 
@@ -190 +188 @@
                 irq_spinlock_unlock(&irq->lock, false);
         } else {
-                /*
-                 * Spurious interrupt.
-                 */
 #ifdef CONFIG_DEBUG
-                log(LF_ARCH, LVL_DEBUG, "cpu%u: spurious interrupt (inum=%u)",
-                    CPU->id, inum);
+                log(LF_ARCH, LVL_DEBUG, "cpu%u: unhandled IRQ %u", CPU->id,
+                    inum);
 #endif
         }
@@ -205 +200 @@
 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.
-         */
+        unsigned int inum = n - IVT_IRQBASE;
+        if (!pic_is_spurious(inum)) {
+                /* This is actually not a spurious IRQ, so proceed as usual. */
+                irq_interrupt(n, istate);
+                return;
+        }
+        pic_handle_spurious(n);
 #ifdef CONFIG_DEBUG
-        log(LF_ARCH, LVL_DEBUG, "cpu%u: PIC spurious interrupt", CPU->id);
+        log(LF_ARCH, LVL_DEBUG, "cpu%u: PIC spurious interrupt %u", CPU->id,
+            inum);
 #endif
 }