Changeset 6a22fcb in mainline for arch/ia32/src

Timestamp:

2006-03-16T19:48:27Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

37c57f2

Parents:

b1fd4f0

Message:

Clear user address space when creating new page tables.
Fix mapping of l_apic and io_apic on amd64.

File:

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

arch/ia32/src/smp/smp.c

@@ -56 +56 @@
 void smp_init(void)
 {
+        int status;
+        __address l_apic_address, io_apic_address;
+
         if (acpi_madt) {
                 acpi_madt_parse();
@@ -65 +68 @@
         }
 
+        l_apic_address = PA2KA(PFN2ADDR(frame_alloc_rc(ONE_FRAME, FRAME_ATOMIC | FRAME_KA, &status)));
+        if (status != FRAME_OK)
+                panic("cannot allocate address for l_apic\n");
+
+        io_apic_address = PA2KA(PFN2ADDR(frame_alloc_rc(ONE_FRAME, FRAME_ATOMIC | FRAME_KA, &status)));
+        if (status != FRAME_OK)
+                panic("cannot allocate address for io_apic\n");
+
         if (config.cpu_count > 1) {             
-                page_mapping_insert(AS_KERNEL, (__address) l_apic, (__address) l_apic, 
+                page_mapping_insert(AS_KERNEL, l_apic_address, (__address) l_apic, 
                                   PAGE_NOT_CACHEABLE);
-                page_mapping_insert(AS_KERNEL, (__address) io_apic, (__address) io_apic,
+                page_mapping_insert(AS_KERNEL, io_apic_address, (__address) io_apic,
                                   PAGE_NOT_CACHEABLE);
+                                  
+                l_apic = (__u32 *) l_apic_address;
+                io_apic = (__u32 *) io_apic_address;
         }