Changes in kernel/arch/sparc64/src/sun4v/start.S [4872160:c92af69b] in mainline

File:

• kernel/arch/sparc64/src/sun4v/start.S (modified) (10 diffs)

kernel/arch/sparc64/src/sun4v/start.S

@@ -93 +93 @@
  *
  * The registers are expected to be in this state:
- *  - %o0 bootinfo structure address (BSP only)
- *  - %o1 starting address of physical memory
+ *  - %o0 starting address of physical memory
  *        + bootstrap processor flag
  *          bits 63...1: physical memory starting address / 2
  *          bit 0:       non-zero on BSP processor, zero on AP processors
+ *  - %o1 bootinfo structure address (BSP only)
+ *
  *
  * Moreover, we depend on boot having established the following environment:
@@ -107 +108 @@
 kernel_image_start:
         mov BSP_FLAG, %l0
-        and %o1, %l0, %l7                       ! l7 <= bootstrap processor?
-        andn %o1, %l0, %l6                      ! l6 <= start of physical memory
-        or %o0, %g0, %l0
+        and %o0, %l0, %l7                       ! l7 <= bootstrap processor?
+        andn %o0, %l0, %l6                      ! l6 <= start of physical memory
+        or %o1, %g0, %l1
 
         ! Get bits (PHYSMEM_ADDR_SIZE - 1):13 of physmem_base.
@@ -154 +155 @@
         mov 0, %o5
         ta 0xff
-        nop
 
         /*
@@ -218 +218 @@
         ! on APs skip executing the following code
         cmp %l7, 0
-        be 1f
+        be %xcc, 1f
         nop
 
@@ -246 +246 @@
         sub %sp, STACK_BIAS, %sp
 
-        or %l0, %g0, %o0
+        /*
+         * Call arch_pre_main(bootinfo)
+         */
         call arch_pre_main
-        nop
+        or %l1, %g0, %o0
         
+        /*
+         * Create the first stack frame.
+         */
+        save %sp, -(STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE), %sp
+        flushw
+        add %g0, -STACK_BIAS, %fp
+
         call main_bsp
         nop
@@ -256 +265 @@
 
 0:
-        ba 0b
-        nop
+        ba,a %xcc, 0b
 
 1:
@@ -269 +277 @@
          */
 
-        mov     1, %o0                  ! MMU enable flag
-        set     mmu_enabled, %o1
-        mov     MMU_ENABLE, %o5 ! MMU enable HV call
-        ta      0x80            ! call HV
+        mov 1, %o0              ! MMU enable flag
+        set mmu_enabled, %o1
+        mov MMU_ENABLE, %o5     ! MMU enable HV call
+        ta 0x80                 ! call HV
 
         mmu_enabled:
@@ -285 +293 @@
         ldx [%g1], %o6
 
+        /*
+         * Create the first stack frame.
+         */
+        save %sp, -(STACK_WINDWO_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE), %sp
+        flushw
+        add %g0, -STACK_BIAS, %fp
+
         call main_ap
         nop
@@ -291 +306 @@
         /* Not reached. */
 0:
-        ba 0b
-        nop
+        ba,a %xcc, 0b
 
 .align 8
@@ -310 +324 @@
 before_ap_boots:
         setx 0x80400000, %g0, %o0
-        ba kernel_image_start
-        nop
+        ba,a %xcc, kernel_image_start
 
 .section K_DATA_START, "aw", @progbits