Changeset fd67c9f in mainline for kernel/arch

Timestamp:

2019-04-06T08:10:27Z (7 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

Location:

kernel/arch

Files:

• amd64/src/interrupt.c (modified) (3 diffs)
• ia32/src/interrupt.c (modified) (3 diffs)
• mips32/include/arch/mach/malta/malta.h (modified) (1 diff)
• mips32/src/mach/malta/malta.c (modified) (2 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
 }

kernel/arch/ia32/src/interrupt.c

@@ -192 +192 @@
         bool ack = false;
         assert(inum < IRQ_COUNT);
-        assert(inum != IRQ_PIC0_SPUR);
-        assert(inum != IRQ_PIC1_SPUR);
         assert(inum != IRQ_PIC1);
 
@@ -210 +208 @@
                 irq_spinlock_unlock(&irq->lock, false);
         } else {
-                /*
-                 * Spurious interrupt.
-                 */
 #ifdef CONFIG_DEBUG
-                printf("cpu%u: spurious interrupt (inum=%u)\n", CPU->id, inum);
+                log(LF_ARCH, LVL_DEBUG, "cpu%u: unhandled IRQ %u", CPU->id,
+                    inum);
 #endif
         }
@@ -224 +220 @@
 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
 }

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.
-                 */
+        if (pic_is_spurious(isa_irq)) {
+                pic_handle_spurious(isa_irq);
 #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, isa_irq);
                 return;
 #endif
@@ -91 +88 @@
         } else {
 #ifdef CONFIG_DEBUG
-                log(LF_ARCH, LVL_DEBUG, "cpu%u: spurious IRQ (irq=%u)",
+                log(LF_ARCH, LVL_DEBUG, "cpu%u: unhandled IRQ (irq=%u)",
                     CPU->id, isa_irq);
 #endif