Changes in kernel/arch/ia32/src/smp/smp.c [b2fa1204:63e27ef] in mainline

File:

• kernel/arch/ia32/src/smp/smp.c (modified) (6 diffs)

kernel/arch/ia32/src/smp/smp.c

@@ -38 +38 @@
 #include <arch/smp/ap.h>
 #include <arch/boot/boot.h>
+#include <assert.h>
 #include <genarch/acpi/acpi.h>
 #include <genarch/acpi/madt.h>
@@ -45 +46 @@
 #include <func.h>
 #include <panic.h>
-#include <debug.h>
 #include <arch/asm.h>
 #include <mm/page.h>
@@ -53 +53 @@
 #include <mm/as.h>
 #include <log.h>
-#include <memstr.h>
+#include <mem.h>
 #include <arch/drivers/i8259.h>
+#include <cpu.h>
 
 #ifdef CONFIG_SMP
@@ -77 +78 @@
                 io_apic = (uint32_t *) km_map((uintptr_t) io_apic, PAGE_SIZE,
                     PAGE_WRITE | PAGE_NOT_CACHEABLE);
+        }
+}
+
+static void cpu_arch_id_init(void)
+{
+        assert(ops != NULL);
+        assert(cpus != NULL);
+        
+        for (unsigned int i = 0; i < config.cpu_count; ++i) {
+                cpus[i].arch.id = ops->cpu_apic_id(i);
         }
 }
@@ -91 +102 @@
         unsigned int i;
         
-        ASSERT(ops != NULL);
+        assert(ops != NULL);
+
+        /*
+         * SMP initialized, cpus array allocated. Assign each CPU its 
+         * physical APIC ID.
+         */
+        cpu_arch_id_init();
         
         /*
@@ -174 +191 @@
 int smp_irq_to_pin(unsigned int irq)
 {
-        ASSERT(ops != NULL);
+        assert(ops != NULL);
         return ops->irq_to_pin(irq);
 }