Changeset 199 for trunk/hal/x86_64/core/hal_apic.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_apic.c (modified) (2 diffs)

trunk/hal/x86_64/core/hal_apic.c

@@ -298 +298 @@
         size_t i;
 
-        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);
-
         ver = hal_ioapic_read(IOAPICVER);
         ioapic_pins = ((ver >> 16) & 0xFF) + 1;
@@ -389 +385 @@
 static void hal_lapic_init()
 {
-        lapic_va = hal_gpt_bootstrap_valloc(1); // XXX: should be shared
-
         if ((rdmsr(MSR_APICBASE) & APICBASE_PHYSADDR) != lapic_pa) {
                 x86_panic("APICBASE and ACPI don't match!\n");
         }
         wrmsr(MSR_APICBASE, lapic_pa | APICBASE_EN);
-
-        hal_gpt_enter(lapic_va, lapic_pa, PG_V|PG_KW|PG_NX|PG_N);
 
         hal_lapic_write(LAPIC_TPR, 0);