Changes in kernel/arch/amd64/src/interrupt.c [2a103b5:d19b3fc] in mainline

File:

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

kernel/arch/amd64/src/interrupt.c

@@ -37 +37 @@
 #include <log.h>
 #include <panic.h>
-#include <genarch/drivers/i8259/i8259.h>
-#include <genarch/pic/pic_ops.h>
+#include <arch/drivers/i8259.h>
 #include <halt.h>
 #include <cpu.h>
@@ -58 +57 @@
  * Interrupt and exception dispatching.
  */
-pic_ops_t *pic_ops = NULL;
+
+void (*disable_irqs_function)(uint16_t irqmask) = NULL;
+void (*enable_irqs_function)(uint16_t irqmask) = NULL;
+void (*eoi_function)(void) = NULL;
+const char *irqs_info = NULL;
 
 void istate_decode(istate_t *istate)
@@ -86 +89 @@
             "r14=%0#18" PRIx64 "\tr15=%0#18" PRIx64 "\n",
             istate->r12, istate->r13, istate->r14, istate->r15);
+}
+
+static void trap_virtual_eoi(void)
+{
+        if (eoi_function)
+                eoi_function();
+        else
+                panic("No eoi_function.");
+
 }
 
@@ -145 +157 @@
 static void tlb_shootdown_ipi(unsigned int n, istate_t *istate)
 {
-        pic_ops->eoi(0);
+        trap_virtual_eoi();
         tlb_shootdown_ipi_recv();
 }
@@ -160 +172 @@
         bool ack = false;
         assert(inum < IRQ_COUNT);
-        assert(inum != IRQ_PIC1);
+        assert((inum != IRQ_PIC_SPUR) && (inum != IRQ_PIC1));
 
         irq_t *irq = irq_dispatch_and_lock(inum);
@@ -170 +182 @@
                 if (irq->preack) {
                         /* Send EOI before processing the interrupt */
-                        pic_ops->eoi(inum);
+                        trap_virtual_eoi();
                         ack = true;
                 }
@@ -176 +188 @@
                 irq_spinlock_unlock(&irq->lock, false);
         } else {
+                /*
+                 * Spurious interrupt.
+                 */
 #ifdef CONFIG_DEBUG
-                log(LF_ARCH, LVL_DEBUG, "cpu%u: unhandled IRQ %u", CPU->id,
-                    inum);
+                log(LF_ARCH, LVL_DEBUG, "cpu%u: spurious interrupt (inum=%u)",
+                    CPU->id, inum);
 #endif
         }
 
         if (!ack)
-                pic_ops->eoi(inum);
-}
-
-static void pic_spurious(unsigned int n, istate_t *istate)
-{
-        unsigned int inum = n - IVT_IRQBASE;
-        if (!pic_ops->is_spurious(inum)) {
-                /* This is actually not a spurious IRQ, so proceed as usual. */
-                irq_interrupt(n, istate);
-                return;
-        }
-        pic_ops->handle_spurious(n);
-#ifdef CONFIG_DEBUG
-        log(LF_ARCH, LVL_DEBUG, "cpu%u: PIC spurious interrupt %u", CPU->id,
-            inum);
-#endif
+                trap_virtual_eoi();
 }
 
@@ -209 +209 @@
 
         for (i = 0; i < IRQ_COUNT; i++) {
-                if ((i != IRQ_PIC0_SPUR) && (i != IRQ_PIC1_SPUR) &&
-                    (i != IRQ_PIC1))
+                if ((i != IRQ_PIC_SPUR) && (i != IRQ_PIC1))
                         exc_register(IVT_IRQBASE + i, "irq", true,
                             (iroutine_t) irq_interrupt);
@@ -219 +218 @@
         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
@@ -230 +225 @@
 }
 
+void trap_virtual_enable_irqs(uint16_t irqmask)
+{
+        if (enable_irqs_function)
+                enable_irqs_function(irqmask);
+        else
+                panic("No enable_irqs_function.");
+}
+
+void trap_virtual_disable_irqs(uint16_t irqmask)
+{
+        if (disable_irqs_function)
+                disable_irqs_function(irqmask);
+        else
+                panic("No disable_irqs_function.");
+}
+
 /** @}
  */