Changeset 26678e5 in mainline

Timestamp:

2006-09-26T15:10:40Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

86b31ba9

Parents:

b44939b

Message:

Make SMP related parts of main.c more generic.
Move initialization of local APIC to architecture specific code.
Add arch_post_cpu_init() to support the above.

Location:

kernel

Files:

• Makefile (modified) (1 diff)
• arch/amd64/src/amd64.c (modified) (2 diffs)
• arch/ia32/include/smp/mps.h (modified) (1 diff)
• arch/ia32/src/ia32.c (modified) (2 diffs)
• arch/ia32/src/smp/mps.c (modified) (1 diff)
• arch/ia32/src/smp/smp.c (modified) (1 diff)
• arch/ia64/src/ia64.c (modified) (1 diff)
• arch/mips32/src/mips32.c (modified) (1 diff)
• arch/ppc32/src/ppc32.c (modified) (1 diff)
• arch/ppc64/src/ppc64.c (modified) (1 diff)
• arch/sparc64/src/sparc64.c (modified) (1 diff)
• arch/xen32/src/xen32.c (modified) (1 diff)
• generic/include/arch.h (modified) (1 diff)
• generic/include/smp/smp.h (modified) (1 diff)
• generic/src/main/kinit.c (modified) (2 diffs)
• generic/src/main/main.c (modified) (4 diffs)
• generic/src/smp/smp.c (added)

kernel/Makefile

@@ -192 +192 @@
         generic/src/synch/futex.c \
         generic/src/smp/ipi.c \
+        generic/src/smp/smp.c \
         generic/src/ipc/ipc.c \
         generic/src/ipc/sysipc.c \

kernel/arch/amd64/src/amd64.c

@@ -45 +45 @@
 #include <arch/drivers/i8254.h>
 #include <arch/drivers/i8259.h>
+
+#ifdef CONFIG_SMP
+#include <arch/smp/apic.h>
+#endif
 
 #include <arch/bios/bios.h>
@@ -157 +161 @@
 }
 
+void arch_post_cpu_init()
+{
+#ifdef CONFIG_SMP
+        if (config.cpu_active > 1) {
+                l_apic_init();
+                l_apic_debug();
+        }
+#endif
+}
+
 void arch_pre_smp_init(void)
 {

kernel/arch/ia32/include/smp/mps.h

@@ -121 +121 @@
 } __attribute__ ((packed));
 
-
-extern waitq_t ap_completion_wq;
-
 extern struct smp_config_operations mps_config_operations;
 
 extern void mps_init(void);
-extern void kmp(void *arg);
 
 #endif

kernel/arch/ia32/src/ia32.c

@@ -63 +63 @@
 #include <console/console.h>
 
+#ifdef CONFIG_SMP
+#include <arch/smp/apic.h>
+#endif
+
 void arch_pre_mm_init(void)
 {
@@ -98 +102 @@
                 zone_merge_all();
         }
+}
+
+void arch_post_cpu_init()
+{
+#ifdef CONFIG_SMP
+        if (config.cpu_active > 1) {
+                l_apic_init();
+                l_apic_debug();
+        }
+#endif
 }
 

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

@@ -85 +85 @@
 int l_intr_entry_cnt = 0;
 
-waitq_t ap_completion_wq;
-
 /*
  * Implementation of IA-32 SMP configuration interface.

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

@@ -105 +105 @@
         ASSERT(ops != NULL);
 
-        waitq_initialize(&ap_completion_wq);
-
         /*
          * We need to access data in frame 0.

kernel/arch/ia64/src/ia64.c

@@ -90 +90 @@
 }
 
+void arch_post_cpu_init(void)
+{
+}
+
 void arch_pre_smp_init(void)
 {

kernel/arch/mips32/src/mips32.c

@@ -132 +132 @@
 }
 
+void arch_post_cpu_init(void)
+{
+}
+
 void arch_pre_smp_init(void)
 {

kernel/arch/ppc32/src/ppc32.c

@@ -83 +83 @@
 }
 
+void arch_post_cpu_init(void)
+{
+}
+
 void arch_pre_smp_init(void)
 {

kernel/arch/ppc64/src/ppc64.c

@@ -76 +76 @@
 }
 
+void arch_post_cpu_init(void)
+{
+}
+
 void arch_pre_smp_init(void)
 {

kernel/arch/sparc64/src/sparc64.c

@@ -79 +79 @@
 }
 
+void arch_post_cpu_init(void)
+{
+}
+
 void arch_pre_smp_init(void)
 {

kernel/arch/xen32/src/xen32.c

@@ -152 +152 @@
 }
 
+void arch_post_cpu_init(void)
+{
+}
+
 void arch_pre_smp_init(void)
 {

kernel/generic/include/arch.h

@@ -76 +76 @@
 extern void arch_pre_mm_init(void);
 extern void arch_post_mm_init(void);
+extern void arch_post_cpu_init(void);
 extern void arch_pre_smp_init(void);
 extern void arch_post_smp_init(void);

kernel/generic/include/smp/smp.h

@@ -36 +36 @@
 #define KERN_SMP_H_
 
+#include <synch/waitq.h>
+
+extern waitq_t ap_completion_wq;
+
 #ifdef CONFIG_SMP
 extern void smp_init(void);
+extern void kmp(void *arg);
 #else
-#define smp_init()      ;
+#define smp_init()
 #endif /* CONFIG_SMP */
 

kernel/generic/src/main/kinit.c

@@ -64 +64 @@
 
 #ifdef CONFIG_SMP
-#include <arch/smp/mps.h>
+#include <smp/smp.h>
 #endif /* CONFIG_SMP */
 
@@ -95 +95 @@
 #ifdef CONFIG_SMP                       
         if (config.cpu_count > 1) {
+                waitq_initialize(&ap_completion_wq);
                 /*
                  * Create the kmp thread and wait for its completion.

kernel/generic/src/main/main.c

@@ -80 +80 @@
 #include <adt/btree.h>
 #include <console/klog.h>
-
-#ifdef CONFIG_SMP
-#include <arch/smp/apic.h>
-#include <arch/smp/mps.h>
-#endif /* CONFIG_SMP */
 #include <smp/smp.h>
 
@@ -272 +267 @@
  *
  * Executed by application processors, temporary stack
- * is at ctx.sp which was set during BP boot.
+ * is at ctx.sp which was set during BSP boot.
  * This function passes control directly to
  * main_ap_separated_stack().
@@ -283 +278 @@
         /*
          * Incrementing the active CPU counter will guarantee that the
-         * pm_init() will not attempt to build GDT and IDT tables again.
-         * Neither frame_init() will do the complete thing. Neither cpu_init()
-         * will do.
+         * *_init() functions can find out that they need to
+         * do initialization for AP only.
          */
         config.cpu_active++;
@@ -301 +295 @@
         
         cpu_init();
-        
         calibrate_delay_loop();
-
-        l_apic_init();
-        l_apic_debug();
+        arch_post_cpu_init();
 
         the_copy(THE, (the_t *) CPU->stack);