Changeset 199 for trunk/hal/x86_64/core/hal_init.c

Timestamp:

Jul 13, 2017, 12:54:18 PM (7 years ago)

Author:

max@…

Message:

map the LAPIC and IOAPIC in a separate function

File:

• trunk/hal/x86_64/core/hal_init.c (modified) (2 diffs)

trunk/hal/x86_64/core/hal_init.c

@@ -239 +239 @@
 /* -------------------------------------------------------------------------- */
 
+static void apic_map()
+{
+        extern vaddr_t lapic_va, ioapic_va;
+        extern paddr_t lapic_pa, ioapic_pa;
+
+        lapic_va = hal_gpt_bootstrap_valloc(1); // XXX: should be shared
+        hal_gpt_enter(lapic_va, lapic_pa, PG_V|PG_KW|PG_NX|PG_N);
+
+        ioapic_va = hal_gpt_bootstrap_valloc(1); // XXX: should be shared
+        hal_gpt_enter(ioapic_va, ioapic_pa, PG_V|PG_KW|PG_NX|PG_N);
+}
+
 void init_x86_64(paddr_t firstpa)
 {
@@ -272 +284 @@
         hal_gpt_bootstrap_reset();
         x86_printf("[+] hal_gpt_bootstrap_reset called\n");
+
+        apic_map();
+        x86_printf("[+] apic_map called\n");
 
         hal_apic_init();