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

Timestamp:

Jul 3, 2017, 5:21:06 PM (7 years ago)

Author:

max@…

Message:

start moving the APIC into the XCU driver

File:

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

trunk/hal/x86_64/core/hal_apic.c

@@ -114 +114 @@
 /* -------------------------------------------------------------------------- */
 
+size_t ioapic_pins __in_kdata = 0;
 paddr_t ioapic_pa __in_kdata = 0;
 vaddr_t ioapic_va __in_kdata = 0;
@@ -133 +134 @@
 #define IOREDTBL        0x10
 
-#define IOENTRY_DISABLE 0x10000
-
 void hal_ioapic_write(uint8_t reg, uint32_t val)
 {
@@ -155 +154 @@
 static void hal_ioapic_init()
 {
-        size_t i, pins;
         uint32_t ver;
+        size_t i;
 
         ioapic_va = hal_gpt_bootstrap_valloc(1); // XXX: should be shared
@@ -163 +162 @@
 
         ver = hal_ioapic_read(IOAPICVER);
-        pins = ((ver >> 16) & 0xFF) + 1;
+        ioapic_pins = ((ver >> 16) & 0xFF) + 1;
 
         /* Explicitly disable (mask) each vector */
-        for (i = 0; i < pins; i++) {
+        for (i = 0; i < ioapic_pins; i++) {
                 hal_ioapic_set_entry(i, IOENTRY_DISABLE);
         }
+
+        x86_printf("IOAPICPINS: #%z\n", ioapic_pins);
 
         /* Now, enable the keyboard */
@@ -205 +206 @@
         /* Initialize the LAPIC timer to the maximum value */
         hal_lapic_write(LAPIC_ICR_TIMER, 0xFFFFFFFF); 
+
+        /* Initialize the PIT */
+        hal_pit_init();
 
         pittick = hal_pit_timer_read() + 1;
@@ -239 +243 @@
  *  - APIC internal error (ERR)
  *  - Extended (Implementation dependent)
+ * Only the Spurious and APIC Timer interrupts are enabled.
  */
 static void hal_lapic_init()