Changeset 0c3e63f in mainline

Timestamp:

2010-06-30T20:21:53Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0a79ad9

Parents:

c6c49de

Message:

map Local APIC and I/O APIC using hw_map()

File:

• kernel/arch/ia32/src/smp/smp.c (modified) (2 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();
@@ -75 +72 @@
         }
         
-        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) {
-                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;
+                l_apic = (uint32_t *) hw_map((uintptr_t) l_apic, PAGE_SIZE);
+                io_apic = (uint32_t *) hw_map((uintptr_t) io_apic, PAGE_SIZE);
         }
 }