Changeset 203 for trunk/hal/x86_64/drivers/pic_apic.c

Timestamp:

Jul 13, 2017, 3:24:38 PM (7 years ago)

Author:

max@…

Message:

start moving the APIC code into the PIC driver

File:

• trunk/hal/x86_64/drivers/pic_apic.c (modified) (4 diffs)

trunk/hal/x86_64/drivers/pic_apic.c

@@ -27 +27 @@
 #include <vfs.h>
 
-void pic_apic_init( chdev_t * pic )
+#include <hal_internal.h>
+#include <hal_segmentation.h>
+#include <hal_apic.h>
+
+extern iopic_input_t iopic_input;
+
+static void
+idt_set_seg(struct idt_seg *seg, void *func, int ist, int type, int dpl, int sel)
 {
-        x86_panic((char *)__func__);
+        seg->gd_looffset = (uint64_t)func & 0xffff;
+        seg->gd_selector = sel;
+        seg->gd_ist = ist;
+        seg->gd_type = type;
+        seg->gd_dpl = dpl;
+        seg->gd_p = 1;
+        seg->gd_hioffset = (uint64_t)func >> 16;
+        seg->gd_zero = 0;
+        seg->gd_xx1 = 0;
+        seg->gd_xx2 = 0;
+        seg->gd_xx3 = 0;
+}
+
+/* -------------------------------------------------------------------------- */
+
+extern uint8_t *idtstore;
+
+void pic_apic_init(chdev_t *pic)
+{
+        /* XXX APIC already initialized earlier */
 }
 
@@ -37 +63 @@
 }
 
-void pic_apic_bind_irq( lid_t     lid,
-                          chdev_t * src_chdev )
+void pic_apic_bind_irq(lid_t lid, chdev_t *src_chdev)
 {
-        x86_panic((char *)__func__);
+        struct idt_seg seg, *idt;
+        void *isr;
+        int slot;
+
+        /* get the source chdev functional type, channel, and direction */
+        uint32_t func    = src_chdev->func;
+        uint32_t channel = src_chdev->channel;
+
+        /* get external IRQ index */
+        uint32_t irq_id;
+        if (func == DEV_FUNC_IOC)
+                irq_id = iopic_input.ioc[channel];
+        else if (func == DEV_FUNC_TXT)
+                irq_id = iopic_input.txt[channel];
+        else
+                assert(false, __FUNCTION__, "unsupported device\n");
+
+        /* get the ISR pointer */
+        isr = src_chdev->isr;
+
+        /* create the IDT entry, and register it */
+        idt_set_seg(&seg, isr, 0, SDT_SYS386IGT, SEL_KPL,
+            GDT_FIXED_SEL(GDT_KCODE_SEL, SEL_KPL));
+        slot = idt_slot_alloc();
+        idt = (struct idt_seg *)&idtstore;
+        memcpy(&idt[slot], &seg, sizeof(struct idt_seg));
+
+        /* Bind the IRQ line in IOAPIC */
+        hal_ioapic_bind_irq(irq_id, slot, lid);
+
+x86_printf("-> allocated %z\n", (uint64_t)slot);
 }
 
@@ -46 +101 @@
                             chdev_t * src_chdev )
 {
-        x86_panic((char *)__func__);
+        uint32_t func = src_chdev->func;
+        uint32_t channel = src_chdev->channel;
+        uint32_t irq_id;
+
+        /* get external IRQ index */
+        if (func == DEV_FUNC_IOC)
+                irq_id = iopic_input.ioc[channel];
+        else if (func == DEV_FUNC_TXT)
+                irq_id = iopic_input.txt[channel];
+        else
+                assert(false, __FUNCTION__, "unsupported device\n");
+
+        /* enable the line */
+        hal_ioapic_enable_irq(irq_id);
 }
 
@@ -53 +121 @@
 {
         x86_panic((char *)__func__);
+
+        uint32_t func = src_chdev->func;
+        uint32_t channel = src_chdev->channel;
+        uint32_t irq_id;
+
+        /* get external IRQ index */
+        if (func == DEV_FUNC_IOC)
+                irq_id = iopic_input.ioc[channel];
+        else if (func == DEV_FUNC_TXT)
+                irq_id = iopic_input.txt[channel];
+        else
+                assert(false, __FUNCTION__, "unsupported device\n");
+
+        /* disable the line */
+        hal_ioapic_disable_irq(irq_id);
 }