Changeset 7d365305 in mainline

Timestamp:

2005-07-20T11:26:40Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

59532eb

Parents:

0970f43

Message:

Initialize kmp_completion_wq during configuration via ACPI MADT.
Move some generic SMP configuration code from mps.c to smp.c.

Location:

arch/ia32/src

Files:

• acpi/madt.c (modified) (3 diffs)
• smp/mps.c (modified) (3 diffs)
• smp/smp.c (modified) (1 diff)

arch/ia32/src/acpi/madt.c

@@ -33 +33 @@
 #include <arch/smp/apic.h>
 #include <arch/smp/smp.h>
-#include <mm/page.h>
 #include <panic.h>
 #include <debug.h>
@@ -112 +111 @@
         struct madt_apic_header *end = (struct madt_apic_header *) (((__u8 *) acpi_madt) + acpi_madt->header.length);
         struct madt_apic_header *h = &acpi_madt->apic_header[0];
-        __u8 prev_type = 0; /* used to detect incosecutive entries */
+        __u8 prev_type = 0; /* used to detect inconsecutive entries */
 
 
@@ -178 +177 @@
                 madt_io_apic_entries = ioa;
                 io_apic = (__u32 *) ioa->io_apic_address;
-                map_page_to_frame((__address) io_apic, (__address) io_apic, PAGE_NOT_CACHEABLE, 0);
         }
         else {

arch/ia32/src/smp/mps.c

@@ -38 +38 @@
 #include <arch/types.h>
 #include <typedefs.h>
-#include <mm/page.h>
 #include <cpu.h>
 #include <arch/asm.h>
@@ -203 +202 @@
                 config.cpu_count = configure_via_default(fs->config_type);
 
-        if (config.cpu_count > 1) {
-                map_page_to_frame((__address) l_apic, (__address) l_apic, PAGE_NOT_CACHEABLE, 0);
-        }               
-        
-        
-        /*
-         * Must be initialized outside the kmp thread, since it is waited
-         * on before the kmp thread is created.
-         */
-        waitq_initialize(&kmp_completion_wq);
         return;
 }
@@ -344 +333 @@
         }
         
-        map_page_to_frame((__address) ioa->io_apic, (__address) ioa->io_apic, PAGE_NOT_CACHEABLE, 0);
-        
         io_apic = ioa->io_apic;
 }

arch/ia32/src/smp/smp.c

@@ -58 +58 @@
                 ops = &mps_config_operations;
         }
+
+        if (config.cpu_count > 1) {
+                map_page_to_frame((__address) l_apic, (__address) l_apic, PAGE_NOT_CACHEABLE, 0);
+                map_page_to_frame((__address) io_apic, (__address) io_apic, PAGE_NOT_CACHEABLE, 0);
+        }
+
+        /* 
+         * Must be initialized outside the kmp thread, since it is waited
+         * on before the kmp thread is created.
+         */
+        waitq_initialize(&kmp_completion_wq);
+
 }