Changeset 163

Timestamp:

Jul 7, 2017, 2:46:34 PM (7 years ago)

Author:

max@…

Message:

handle the LAPIC override, and count the number of CPUs

File:

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

trunk/hal/x86_64/core/hal_acpi.c

@@ -107 +107 @@
 static void hal_acpi_parse_madt(madt_t *madt)
 {
+        madt_lapic_override_t *override;
         void *ptr, *end;
         subheader_t *sub;
+        size_t ncpu = 0;
 
         extern paddr_t lapic_pa;
@@ -120 +122 @@
                 if (sub->Type == ACPI_MADT_TYPE_IO_APIC) {
                         hal_acpi_parse_ioapic((madt_ioapic_t *)sub);
+                } else if (sub->Type == ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE) {
+                        override = (madt_lapic_override_t *)sub;
+                        lapic_pa = (paddr_t)override->Address;
+                        x86_printf("-> found LAPIC override\n");
+                } else if (sub->Type == ACPI_MADT_TYPE_LOCAL_APIC) {
+                        ncpu++;
                 }
-                // XXX: handle lapic override
+
                 ptr += sub->Length;
         }
 
         x86_printf("-> LAPIC address: %Z\n", lapic_pa);
+        x86_printf("-> number of CPUs: %z\n", ncpu);
 }