Changeset acee917 in mainline

Timestamp:

2009-01-04T22:51:09Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

59b2adb

Parents:

0e56eb1a

Message:

Do not compile unnecessary code when CONFIG_SMP is not configured on ia64.

Location:

kernel/arch/ia64/src

Files:

• smp/smp.c (modified) (5 diffs)
• start.S (modified) (14 diffs)

kernel/arch/ia64/src/smp/smp.c

@@ -74 +74 @@
 static void ipi_broadcast_arch_all(int ipi)
 {
-        int id,eid;
+        int id, eid;
         int myid, myeid;
         
@@ -88 +88 @@
 void ipi_broadcast_arch(int ipi )
 {
-        int id,eid;
-        int myid,myeid;
+        int id, eid;
+        int myid, myeid;
         
         myid = ia64_get_cpu_id();
@@ -107 +107 @@
         
         /*
-         * If we have not system prepared by hello, we are not able to start
+         * If we have not got system prepared by hello, we are not able to start
          * AP's. This means we are running on a simulator.
          */
@@ -130 +130 @@
 void kmp(void *arg __attribute__((unused)))
 {
-        int id,eid;
+        int id, eid;
         int myid, myeid;
         
@@ -166 +166 @@
 #endif
 
-
-#ifndef CONFIG_SMP
-
-/* This is just a hack for linking with assembler - may be removed in future. */
-void main_ap(void);
-void main_ap(void)
-{
-        while(1)
-                ;
-}
-
-#endif
-
 /** @}
  */

kernel/arch/ia64/src/start.S

@@ -50 +50 @@
         .auto
 
+#ifdef CONFIG_SMP
         # Identify self(CPU) in OS structures by ID / EID
 
@@ -60 +61 @@
         add r8 = r8, r9
         st1 [r8] = r10
+#endif
 
         mov psr.l = r0
@@ -80 +82 @@
         mov cr.ifa = r8
 
-        mov r11 = cr.itir ;;
-        movl r10 = (KERNEL_PAGE_WIDTH << PS_SHIFT);;
-        or r10 = r10, r11 ;;
-        mov cr.itir = r10;;
+        mov r11 = cr.itir
+        movl r10 = (KERNEL_PAGE_WIDTH << PS_SHIFT)
+        or r10 = r10, r11
+        mov cr.itir = r10
 
         movl r10 = (KERNEL_TRANSLATION_I)
@@ -96 +98 @@
         itr.d dtr[r7] = r10
 
-        mov r11 = cr.itir ;;
-        movl r10 = ~0xfc;;
-        and r10 = r10, r11 ;;
-        movl r11 = (IO_PAGE_WIDTH << PS_SHIFT);;
-        or r10 = r10, r11 ;;
-        mov cr.itir = r10;;
+        mov r11 = cr.itir
+        movl r10 = ~0xfc
+        and r10 = r10, r11
+        movl r11 = (IO_PAGE_WIDTH << PS_SHIFT)
+        or r10 = r10, r11
+        mov cr.itir = r10
 
         movl r7 = 2
@@ -111 +113 @@
         # Setup mapping for fimware arrea (also SAPIC)
 
-        mov r11 = cr.itir ;;
-        movl r10 = ~0xfc;;
-        and r10 = r10, r11 ;;
-        movl r11 = (FW_PAGE_WIDTH << PS_SHIFT);;
-        or r10 = r10, r11 ;;
-        mov cr.itir = r10;;
+        mov r11 = cr.itir
+        movl r10 = ~0xfc
+        and r10 = r10, r11
+        movl r11 = (FW_PAGE_WIDTH << PS_SHIFT)
+        or r10 = r10, r11
+        mov cr.itir = r10
 
         movl r7 = 3
@@ -143 +145 @@
          * fill the upper half word of PSR.
          */
-        rfi;;
+        rfi ;;
 
 
@@ -156 +158 @@
         bsw.1
 
+#ifdef CONFIG_SMP
         # Am I BSP or AP?
-        movl r20 = bsp_started;;
-        ld8 r20 = [r20];;
-        cmp.eq p3, p2 = r20, r0;;
+        movl r20 = bsp_started ;;
+        ld8 r20 = [r20] ;;
+        cmp.eq p3, p2 = r20, r0 ;;
+#else
+        cmp.eq p3, p2 = r0, r0 ;;       /* you are BSP */
+#endif  /* CONFIG_SMP */
         
         # Initialize register stack
@@ -196 +202 @@
         srlz.d ;;
 
+#ifdef CONFIG_SMP
 (p2)    movl r18 = main_ap ;;
 (p2)    mov b1 = r18 ;;
@@ -201 +208 @@
 
         # Mark that BSP is on
-        mov r20=1;;
-        movl r21=bsp_started;;
-        st8 [r21]=r20;;
+        mov r20 = 1 ;;
+        movl r21 = bsp_started ;;
+        st8 [r21] = r20 ;;
+#endif
 
         br.call.sptk.many b0 = arch_pre_main
@@ -213 +221 @@
 0:
         br 0b
+
+#ifdef CONFIG_SMP
+
 .align 4096
-
 kernel_image_ap_start:
         .auto
@@ -230 +240 @@
         
         # Wait for wakeup synchro signal (#3 in cpu_by_id_eid_list)
+        
 kernel_image_ap_start_loop:
         movl r11 = kernel_image_ap_start_loop
@@ -235 +246 @@
         mov b1 = r11 
 
-        ld1 r20 = [r8];;
-        movl r21 = 3;;
-        cmp.eq p2, p3 = r20, r21;;
+        ld1 r20 = [r8] ;;
+        movl r21 = 3 ;;
+        cmp.eq p2, p3 = r20, r21 ;;
 (p3)    br.call.sptk.many b0 = b1
 
@@ -245 +256 @@
         br.call.sptk.many b0 = b1
 
-
 .align 16
 .global bsp_started
@@ -256 +266 @@
 .space 65536
 
+#endif  /* CONFIG_SMP */