Changes in kernel/arch/sparc64/src/sun4u/start.S [4872160:7f1d897] in mainline

File:

• kernel/arch/sparc64/src/sun4u/start.S (modified) (8 diffs)

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

@@ -36 +36 @@
 #include <arch/mm/tlb.h>
 #include <arch/mm/tte.h>
+#include <arch/mm/cache_spec.h>
 
 #ifdef CONFIG_SMP
@@ -62 +63 @@
  *
  * 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:
@@ -77 +79 @@
 kernel_image_start:
         mov BSP_FLAG, %l0
-        and %o1, %l0, %l7                       ! l7 <= bootstrap processor?
-        andn %o1, %l0, %l6                      ! l6 <= start of physical memory
+        and %o0, %l0, %l7                       ! l7 <= bootstrap processor?
+        andn %o0, %l0, %l6                      ! l6 <= start of physical memory
 
         ! Get bits (PHYSMEM_ADDR_SIZE - 1):13 of physmem_base.
@@ -268 +270 @@
         or %l3, %l5, %l3
         stx %l3, [%l4 + %lo(kernel_8k_tlb_data_template)]
-
-        /*
-         * Flush D-Cache.
-         */
-        call dcache_flush
-        nop
-
+        
+        ! flush the whole D-cache
+        set (DCACHE_SIZE - DCACHE_LINE_SIZE), %g1
+        stxa %g0, [%g1] ASI_DCACHE_TAG
+        
+0:
+        membar #Sync
+        subcc %g1, DCACHE_LINE_SIZE, %g1
+        bnz,pt %xcc, 0b
+        stxa %g0, [%g1] ASI_DCACHE_TAG
+        membar #Sync
+        
         /*
          * So far, we have not touched the stack.
@@ -282 +289 @@
         or %sp, %lo(temporary_boot_stack), %sp
         sub %sp, STACK_BIAS, %sp
-
+        
+        /*
+         * Call arch_pre_main(bootinfo)
+         */
         call arch_pre_main
-        nop
-        
+        mov %o1, %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
@@ -292 +309 @@
 
 0:
-        ba %xcc, 0b
-        nop
+        ba,a %xcc, 0b
 
 
@@ -343 +359 @@
         ldx [%g1], %o6
 
+        /*
+         * 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_ap
         nop
@@ -350 +373 @@
         
 0:
-        ba %xcc, 0b
-        nop
+        ba,a %xcc, 0b