Changes in kernel/arch/ia32/src/smp/smp.c [99718a2e:fe32163] in mainline

File:

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

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

@@ -62 +62 @@
 void smp_init(void)
 {
+        uintptr_t l_apic_address;
+        uintptr_t io_apic_address;
+        
         if (acpi_madt) {
                 acpi_madt_parse();
@@ -72 +75 @@
         }
         
+        l_apic_address = (uintptr_t) frame_alloc(ONE_FRAME,
+            FRAME_ATOMIC | FRAME_KA);
+        if (!l_apic_address)
+                panic("Cannot allocate address for l_apic.");
+        
+        io_apic_address = (uintptr_t) frame_alloc(ONE_FRAME,
+            FRAME_ATOMIC | FRAME_KA);
+        if (!io_apic_address)
+                panic("Cannot allocate address for io_apic.");
+        
         if (config.cpu_count > 1) {
-                l_apic = (uint32_t *) hw_map((uintptr_t) l_apic, PAGE_SIZE);
-                io_apic = (uint32_t *) hw_map((uintptr_t) io_apic, PAGE_SIZE);
+                page_table_lock(AS_KERNEL, true);
+                page_mapping_insert(AS_KERNEL, l_apic_address,
+                    (uintptr_t) l_apic, PAGE_NOT_CACHEABLE | PAGE_WRITE);
+                page_mapping_insert(AS_KERNEL, io_apic_address,
+                    (uintptr_t) io_apic, PAGE_NOT_CACHEABLE | PAGE_WRITE);
+                page_table_unlock(AS_KERNEL, true);
+                
+                l_apic = (uint32_t *) l_apic_address;
+                io_apic = (uint32_t *) io_apic_address;
         }
 }
@@ -113 +133 @@
         apic_init();
         
+        uint8_t apic = l_apic_id();
+        
         for (i = 0; i < config.cpu_count; i++) {
                 /*
@@ -126 +148 @@
                         continue;
                 
-                if (ops->cpu_apic_id(i) == bsp_l_apic) {
-                        printf("kmp: bad processor entry #%u, will not send IPI "
-                            "to myself\n", i);
+                if (ops->cpu_apic_id(i) == apic) {
+                        printf("%s: bad processor entry #%u, will not send IPI "
+                            "to myself\n", __FUNCTION__, i);
                         continue;
                 }