Changeset 2a103b5 in mainline for kernel/arch/amd64/src

Timestamp:

2019-06-09T11:31:38Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c48de91

Parents:

b401b33

Message:

Introduce PIC operations indirection mechanism

Some architectures switch from one interrupt controller implementation
to another during runtime. By providing a cleaner indirection mechanism,
it is possible e.g. for the ia32 IRQ 7 handler to distinguish i8259
spurious interrupts from actual IRQ 7 device interrupts, even when the
i8259 interrupt controller is no longer active.

Location:

kernel/arch/amd64/src

Files:

• amd64.c (modified) (5 diffs)
• interrupt.c (modified) (8 diffs)

kernel/arch/amd64/src/amd64.c

@@ -60 +60 @@
 #include <arch/vreg.h>
 #include <arch/kseg.h>
+#include <genarch/pic/pic_ops.h>
 
 #ifdef CONFIG_SMP
@@ -123 +124 @@
                     (i8259_t *) I8259_PIC1_BASE, IVT_IRQBASE);
 
-                /*
-                 * Set the enable/disable IRQs handlers.
-                 * Set the End-of-Interrupt handler.
-                 */
-                enable_irqs_function = pic_enable_irqs;
-                disable_irqs_function = pic_disable_irqs;
-                eoi_function = pic_eoi;
-                irqs_info = "i8259";
+                /* Set PIC operations. */
+                pic_ops = &i8259_pic_ops;
         }
 }
@@ -209 +204 @@
                         indev_t *kbrd = kbrd_wire(kbrd_instance, sink);
                         i8042_wire(i8042_instance, kbrd);
-                        trap_virtual_enable_irqs(1 << IRQ_KBD);
-                        trap_virtual_enable_irqs(1 << IRQ_MOUSE);
+                        pic_ops->enable_irqs(1 << IRQ_KBD);
+                        pic_ops->enable_irqs(1 << IRQ_MOUSE);
                 }
         }
@@ -235 +230 @@
                         indev_t *srln = srln_wire(srln_instance, sink);
                         ns16550_wire(ns16550_instance, srln);
-                        trap_virtual_enable_irqs(1 << IRQ_NS16550);
+                        pic_ops->enable_irqs(1 << IRQ_NS16550);
                 }
 #endif
@@ -246 +241 @@
 #endif
 
-        if (irqs_info != NULL)
-                sysinfo_set_item_val(irqs_info, NULL, true);
+        sysinfo_set_item_val(pic_ops->get_name(), NULL, true);
 }
 

kernel/arch/amd64/src/interrupt.c

@@ -38 +38 @@
 #include <panic.h>
 #include <genarch/drivers/i8259/i8259.h>
+#include <genarch/pic/pic_ops.h>
 #include <halt.h>
 #include <cpu.h>
@@ -57 +58 @@
  * Interrupt and exception dispatching.
  */
-
-void (*disable_irqs_function)(uint16_t irqmask) = NULL;
-void (*enable_irqs_function)(uint16_t irqmask) = NULL;
-void (*eoi_function)(unsigned int) = NULL;
-const char *irqs_info = NULL;
+pic_ops_t *pic_ops = NULL;
 
 void istate_decode(istate_t *istate)
@@ -89 +86 @@
             "r14=%0#18" PRIx64 "\tr15=%0#18" PRIx64 "\n",
             istate->r12, istate->r13, istate->r14, istate->r15);
-}
-
-static void trap_virtual_eoi(unsigned int irq)
-{
-        if (eoi_function)
-                eoi_function(irq);
-        else
-                panic("No eoi_function.");
-
 }
 
@@ -157 +145 @@
 static void tlb_shootdown_ipi(unsigned int n, istate_t *istate)
 {
-        trap_virtual_eoi(0);
+        pic_ops->eoi(0);
         tlb_shootdown_ipi_recv();
 }
@@ -182 +170 @@
                 if (irq->preack) {
                         /* Send EOI before processing the interrupt */
-                        trap_virtual_eoi(inum);
+                        pic_ops->eoi(inum);
                         ack = true;
                 }
@@ -195 +183 @@
 
         if (!ack)
-                trap_virtual_eoi(inum);
+                pic_ops->eoi(inum);
 }
 
@@ -201 +189 @@
 {
         unsigned int inum = n - IVT_IRQBASE;
-        if (!pic_is_spurious(inum)) {
+        if (!pic_ops->is_spurious(inum)) {
                 /* This is actually not a spurious IRQ, so proceed as usual. */
                 irq_interrupt(n, istate);
                 return;
         }
-        pic_handle_spurious(n);
+        pic_ops->handle_spurious(n);
 #ifdef CONFIG_DEBUG
         log(LF_ARCH, LVL_DEBUG, "cpu%u: PIC spurious interrupt %u", CPU->id,
@@ -242 +230 @@
 }
 
-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.");
-}
-
 /** @}
  */