Changeset f6b5593 in mainline for kernel/arch/ia64/src/start.S

Timestamp:

2009-09-21T11:53:03Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4098e38

Parents:

2f636b6 (diff), c1618ed (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/ia64/src/start.S (modified) (15 diffs)

kernel/arch/ia64/src/start.S

@@ -32 +32 @@
 #include <mm/asid.h>
 
-#define RR_MASK (0xFFFFFFFF00000002)
-#define RID_SHIFT       8
-#define PS_SHIFT        2
-
-#define KERNEL_TRANSLATION_I    0x0010000000000661
-#define KERNEL_TRANSLATION_D    0x0010000000000661
-#define KERNEL_TRANSLATION_VIO  0x0010000000000671
-#define KERNEL_TRANSLATION_IO   0x00100FFFFC000671 
-#define KERNEL_TRANSLATION_FW   0x00100000F0000671 
+#define RR_MASK    (0xFFFFFFFF00000002)
+#define RID_SHIFT  8
+#define PS_SHIFT   2
+
+#define KERNEL_TRANSLATION_I    0x0010000000000661
+#define KERNEL_TRANSLATION_D    0x0010000000000661
+#define KERNEL_TRANSLATION_VIO  0x0010000000000671
+#define KERNEL_TRANSLATION_IO   0x00100FFFFC000671
+#define KERNEL_TRANSLATION_FW   0x00100000F0000671
 
 .section K_TEXT_START, "ax"
@@ -49 +49 @@
 kernel_image_start:
         .auto
-
+        
 #ifdef CONFIG_SMP
         # Identify self(CPU) in OS structures by ID / EID
-
+        
         mov r9 = cr64
         mov r10 = 1
@@ -62 +62 @@
         st1 [r8] = r10
 #endif
-
+        
         mov psr.l = r0
         srlz.i
         srlz.d
-
+        
         # Fill TR.i and TR.d using Region Register #VRN_KERNEL
-
+        
         movl r8 = (VRN_KERNEL << VRN_SHIFT)
         mov r9 = rr[r8]
-
+        
         movl r10 = (RR_MASK)
         and r9 = r10, r9
         movl r10 = ((RID_KERNEL << RID_SHIFT) | (KERNEL_PAGE_WIDTH << PS_SHIFT))
-        or  r9 = r10, r9
-
+        or r9 = r10, r9
+        
         mov rr[r8] = r9
-
+        
         movl r8 = (VRN_KERNEL << VRN_SHIFT)
         mov cr.ifa = r8
-
+        
         mov r11 = cr.itir
         movl r10 = (KERNEL_PAGE_WIDTH << PS_SHIFT)
         or r10 = r10, r11
         mov cr.itir = r10
-
+        
         movl r10 = (KERNEL_TRANSLATION_I)
         itr.i itr[r0] = r10
         movl r10 = (KERNEL_TRANSLATION_D)
         itr.d dtr[r0] = r10
-
+        
         movl r7 = 1
         movl r8 = (VRN_KERNEL << VRN_SHIFT) | VIO_OFFSET
@@ -97 +97 @@
         movl r10 = (KERNEL_TRANSLATION_VIO)
         itr.d dtr[r7] = r10
-
+        
         mov r11 = cr.itir
         movl r10 = ~0xfc
@@ -104 +104 @@
         or r10 = r10, r11
         mov cr.itir = r10
-
+        
         movl r7 = 2
         movl r8 = (VRN_KERNEL << VRN_SHIFT) | IO_OFFSET
@@ -110 +110 @@
         movl r10 = (KERNEL_TRANSLATION_IO)
         itr.d dtr[r7] = r10
-
-        # Setup mapping for fimware arrea (also SAPIC)
-
+        
+        # Setup mapping for firmware area (also SAPIC)
+        
         mov r11 = cr.itir
         movl r10 = ~0xfc
@@ -119 +119 @@
         or r10 = r10, r11
         mov cr.itir = r10
-
+        
         movl r7 = 3
         movl r8 = (VRN_KERNEL << VRN_SHIFT) | FW_OFFSET
@@ -125 +125 @@
         movl r10 = (KERNEL_TRANSLATION_FW)
         itr.d dtr[r7] = r10
-
+        
+        # Initialize DSR
+        
+        movl r10 = (DCR_DP_MASK | DCR_DK_MASK | DCR_DX_MASK | DCR_DR_MASK | DCR_DA_MASK | DCR_DD_MASK | DCR_LC_MASK)
+        mov r9 = cr.dcr
+        or r10 = r10, r9
+        mov cr.dcr = r10
+        
         # Initialize PSR
-
+        
         movl r10 = (PSR_DT_MASK | PSR_RT_MASK | PSR_IT_MASK | PSR_IC_MASK)  /* Enable paging */
         mov r9 = psr
-
+        
         or r10 = r10, r9
         mov cr.ipsr = r10
@@ -138 +145 @@
         srlz.d
         srlz.i
-
+        
         .explicit
-
+        
         /*
          * Return From Interrupt is the only way to
@@ -147 +154 @@
         rfi ;;
 
-
 .global paging_start
 paging_start:
-
+        
         /*
          * Now we are paging.
          */
-
+        
         # Switch to register bank 1
         bsw.1
-
+        
 #ifdef CONFIG_SMP
         # Am I BSP or AP?
@@ -164 +170 @@
         cmp.eq p3, p2 = r20, r0 ;;
 #else
-        cmp.eq p3, p2 = r0, r0 ;;       /* you are BSP */
-#endif  /* CONFIG_SMP */
+        cmp.eq p3, p2 = r0, r0 ;;  /* you are BSP */
+#endif  /* CONFIG_SMP */
         
         # Initialize register stack
@@ -172 +178 @@
         mov ar.bspstore = r8
         loadrs
-
+        
         # Initialize memory stack to some sane value
         movl r12 = stack0 ;;
-        add r12 = -16, r12      /* allocate a scratch area on the stack */
-
+        add r12 = -16, r12  /* allocate a scratch area on the stack */
+        
         # Initialize gp (Global Pointer) register
-        movl r20 = (VRN_KERNEL << VRN_SHIFT);;
-        or r20 = r20,r1;;
-        movl r1 = _hardcoded_load_address
+        movl r20 = (VRN_KERNEL << VRN_SHIFT) ;;
+        or r20 = r20, r1 ;;
+        movl r1 = kernel_image_start
         
         /*
-         * Initialize hardcoded_* variables. Do only BSP
+         * Initialize bootinfo on BSP.
          */
-(p3)    movl r14 = _hardcoded_ktext_size
-(p3)    movl r15 = _hardcoded_kdata_size
-(p3)    movl r16 = _hardcoded_load_address ;;
-(p3)    addl r17 = @gprel(hardcoded_ktext_size), gp
-(p3)    addl r18 = @gprel(hardcoded_kdata_size), gp
-(p3)    addl r19 = @gprel(hardcoded_load_address), gp
-(p3)    addl r21 = @gprel(bootinfo), gp
-        ;;
-(p3)    st8 [r17] = r14
-(p3)    st8 [r18] = r15
-(p3)    st8 [r19] = r16
+(p3)    addl r21 = @gprel(bootinfo), gp ;;
 (p3)    st8 [r21] = r20
-
+        
         ssm (1 << 19) ;; /* Disable f32 - f127 */
         srlz.i
         srlz.d ;;
-
+        
 #ifdef CONFIG_SMP
 (p2)    movl r18 = main_ap ;;
-(p2)    mov b1 = r18 ;;
+(p2)    mov b1 = r18 ;;
 (p2)    br.call.sptk.many b0 = b1
-
+        
         # Mark that BSP is on
+        
         mov r20 = 1 ;;
         movl r21 = bsp_started ;;
         st8 [r21] = r20 ;;
 #endif
-
+        
         br.call.sptk.many b0 = arch_pre_main
-
+        
         movl r18 = main_bsp ;;
         mov b1 = r18 ;;
@@ -227 +224 @@
 kernel_image_ap_start:
         .auto
-
+        
         # Identify self(CPU) in OS structures by ID / EID
-
+        
         mov r9 = cr64
         mov r10 = 1
@@ -240 +237 @@
         
         # Wait for wakeup synchro signal (#3 in cpu_by_id_eid_list)
-        
+
 kernel_image_ap_start_loop:
         movl r11 = kernel_image_ap_start_loop
         and r11 = r11, r12
-        mov b1 = r11 
-
-        ld1 r20 = [r8] ;;
-        movl r21 = 3 ;;
-        cmp.eq p2, p3 = r20, r21 ;;
+        mov b1 = r11
+        
+        ld1 r20 = [r8]
+        movl r21 = 3
+        cmp.eq p2, p3 = r20, r21
 (p3)    br.call.sptk.many b0 = b1
-
+        
         movl r11 = kernel_image_start
         and r11 = r11, r12
-        mov b1 = r11 
+        mov b1 = r11
         br.call.sptk.many b0 = b1
 
@@ -259 +256 @@
 .global bsp_started
 bsp_started:
-.space 8
+        .space 8
 
 .align 4096
 .global cpu_by_id_eid_list
 cpu_by_id_eid_list:
-.space 65536
-
-#endif  /* CONFIG_SMP */
+        .space 65536
+
+#endif  /* CONFIG_SMP */