Changeset 137 for trunk/hal/x86_64/core/hal_apic.c

Timestamp:

Jul 4, 2017, 10:17:44 AM (7 years ago)

Author:

max@…

Message:

improve the APIC implementation

File:

• trunk/hal/x86_64/core/hal_apic.c (modified) (4 diffs)

trunk/hal/x86_64/core/hal_apic.c

@@ -132 +132 @@
 #define IOAPICVER       0x01
 #define IOAPICARB       0x02
+
 #define IOREDTBL        0x10
+#       define IOREDTBL_DEL_FIXED       0x000
+#       define IOREDTBL_DEL_LOPRI       0x100
+#       define IOREDTBL_DEL_SMI         0x200
+#       define IOREDTBL_DEL_NMI         0x400
+#       define IOREDTBL_DEL_INIT        0x500
+#       define IOREDTBL_DEL_EXTINT      0x700
+#       define IOREDTBL_DEM_PHYS        0x000
+#       define IOREDTBL_DEM_LOGIC       0x800
+#       define IOREDTBL_DES_SHIFT       56
+#       define IOREDTBL_MSK             0x10000
 
 void hal_ioapic_write(uint8_t reg, uint32_t val)
@@ -146 +157 @@
 }
 
-void hal_ioapic_set_entry(uint8_t index, uint64_t data)
-{
+void hal_ioapic_disable_entry(uint8_t index)
+{
+        const uint64_t data = IOREDTBL_MSK;
+
         hal_ioapic_write(IOREDTBL + index * 2, (uint32_t)(data & 0xFFFFFFFF));
         hal_ioapic_write(IOREDTBL + index * 2 + 1, (uint32_t)(data >> 32));
 }
 
+void hal_ioapic_set_entry(uint8_t index, uint8_t vec, uint8_t dest)
+{
+        const uint64_t data = ((uint64_t)dest << IOREDTBL_DES_SHIFT) |
+            IOREDTBL_DEM_PHYS | IOREDTBL_DEL_FIXED | vec;
+
+        hal_ioapic_write(IOREDTBL + index * 2, (uint32_t)(data & 0xFFFFFFFF));
+        hal_ioapic_write(IOREDTBL + index * 2 + 1, (uint32_t)(data >> 32));
+}
+
 static void hal_ioapic_init()
 {
@@ -166 +188 @@
         /* Explicitly disable (mask) each vector */
         for (i = 0; i < ioapic_pins; i++) {
-                hal_ioapic_set_entry(i, IOENTRY_DISABLE);
+                hal_ioapic_disable_entry(i);
         }
 
@@ -172 +194 @@
 
         /* Now, enable the keyboard */
-        hal_ioapic_set_entry(IRQ_KEYBOARD, IOAPIC_KEYBOARD_VECTOR);
+        hal_ioapic_set_entry(IRQ_KEYBOARD, IOAPIC_KEYBOARD_VECTOR, 0);
 }