Changeset 2a103b5 in mainline for kernel/arch/ia32/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/ia32/src

Files:

• drivers/i8254.c (modified) (1 diff)
• ia32.c (modified) (5 diffs)
• interrupt.c (modified) (8 diffs)
• smp/apic.c (modified) (5 diffs)
• smp/smp.c (modified) (1 diff)

kernel/arch/ia32/src/drivers/i8254.c

@@ -96 +96 @@
 {
         pio_write_8(CLK_PORT4, 0x36);
-        pic_disable_irqs(1 << IRQ_CLK);
+        i8259_disable_irqs(1 << IRQ_CLK);
         pio_write_8(CLK_PORT1, (CLK_CONST / HZ) & 0xf);
         pio_write_8(CLK_PORT1, (CLK_CONST / HZ) >> 8);
-        pic_enable_irqs(1 << IRQ_CLK);
+        i8259_enable_irqs(1 << IRQ_CLK);
 }
 

kernel/arch/ia32/src/ia32.c

@@ -58 +58 @@
 #include <genarch/multiboot/multiboot.h>
 #include <genarch/multiboot/multiboot2.h>
+#include <genarch/pic/pic_ops.h>
 #include <arch/pm.h>
 #include <arch/vreg.h>
@@ -112 +113 @@
                     (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;
         }
 }
@@ -194 +189 @@
                         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);
                 }
         }
@@ -220 +215 @@
                         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
@@ -231 +226 @@
 #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/ia32/src/interrupt.c

@@ -40 +40 @@
 #include <panic.h>
 #include <genarch/drivers/i8259/i8259.h>
+#include <genarch/pic/pic_ops.h>
 #include <halt.h>
 #include <cpu.h>
@@ -61 +62 @@
  */
 
-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)
@@ -88 +86 @@
             istate_from_uspace(istate) ? istate->esp :
             (uint32_t) &istate->esp);
-}
-
-static void trap_virtual_eoi(unsigned int inum)
-{
-        if (eoi_function)
-                eoi_function(inum);
-        else
-                panic("No eoi_function.");
-
 }
 
@@ -179 +168 @@
     istate_t *istate __attribute__((unused)))
 {
-        trap_virtual_eoi(0);
+        pic_ops->eoi(0);
         tlb_shootdown_ipi_recv();
 }
@@ -202 +191 @@
                 if (irq->preack) {
                         /* Send EOI before processing the interrupt */
-                        trap_virtual_eoi(inum);
+                        pic_ops->eoi(inum);
                         ack = true;
                 }
@@ -215 +204 @@
 
         if (!ack)
-                trap_virtual_eoi(inum);
+                pic_ops->eoi(inum);
 }
 
@@ -221 +210 @@
 {
         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,
@@ -264 +253 @@
 }
 
-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.");
-}
-
 /** @}
  */

kernel/arch/ia32/src/smp/apic.c

@@ -47 +47 @@
 #include <arch.h>
 #include <ddi/irq.h>
+#include <genarch/pic/pic_ops.h>
 
 #ifdef CONFIG_SMP
@@ -63 +64 @@
  */
 
+static const char *apic_get_name(void);
+static bool l_apic_is_spurious(unsigned int);
+static void l_apic_handle_spurious(unsigned int);
+
+pic_ops_t apic_pic_ops = {
+        .get_name = apic_get_name,
+        .enable_irqs = io_apic_enable_irqs,
+        .disable_irqs = io_apic_disable_irqs,
+        .eoi = l_apic_eoi,
+        .is_spurious = l_apic_is_spurious,
+        .handle_spurious = l_apic_handle_spurious,
+};
+
 /*
  * These variables either stay configured as initilalized, or are changed by
@@ -125 +139 @@
 #endif /* LAPIC_VERBOSE */
 
+const char *apic_get_name(void)
+{
+        return "apic";
+}
+
+bool l_apic_is_spurious(unsigned int n)
+{
+        return n == VECTOR_APIC_SPUR;
+}
+
+void l_apic_handle_spurious(unsigned int n)
+{
+}
+
 /** APIC spurious interrupt handler.
  *
@@ -134 +162 @@
     istate_t *istate __attribute__((unused)))
 {
-#ifdef CONFIG_DEBUG
-        log(LF_ARCH, LVL_DEBUG, "cpu%u: APIC spurious interrupt", CPU->id);
-#endif
 }
 
@@ -175 +200 @@
             (iroutine_t) apic_spurious);
 
-        enable_irqs_function = io_apic_enable_irqs;
-        disable_irqs_function = io_apic_disable_irqs;
-        eoi_function = l_apic_eoi;
-        irqs_info = "apic";
+        pic_ops = &apic_pic_ops;
 
         /*

kernel/arch/ia32/src/smp/smp.c

@@ -130 +130 @@
         pio_write_8((ioport8_t *) 0x71, 0xa);
 
-        pic_disable_irqs(0xffff);
+        i8259_disable_irqs(0xffff);
         apic_init();