Changeset 398e7688 in mainline

Timestamp:

2006-09-29T18:01:54Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

34bd143

Parents:

c23baab

Message:

Small improvements in sparc64.

Files:

• boot/arch/sparc64/loader/boot.S (modified) (1 diff)
• boot/arch/sparc64/loader/register.h (modified) (1 diff)
• kernel/arch/sparc64/src/start.S (modified) (4 diffs)

boot/arch/sparc64/loader/boot.S

@@ -59 +59 @@
          * Disable interrupts and disable address masking.
          */
-        rdpr %pstate, %g2
-        and %g2, ~(PSTATE_IE_BIT|PSTATE_AM_BIT), %g2
-        wrpr %g2, 0, %pstate
+        wrpr %g0, PSTATE_PRIV_BIT, %pstate
 
-        set initial_stack_top, %g3
-        add %g3, -STACK_BIAS, %sp
+        set initial_stack_top, %sp
+        add %sp, -STACK_BIAS, %sp
 
         set ofw_cif, %l0

boot/arch/sparc64/loader/register.h

@@ -31 +31 @@
 
 #define PSTATE_IE_BIT   2
+#define PSTATE_PRIV_BIT 4
 #define PSTATE_AM_BIT   8
 

kernel/arch/sparc64/src/start.S

@@ -77 +77 @@
 
         /*
-         * Copy the bootinfo structure passed from the boot loader
-         * to the kernel bootinfo structure.
-         */
-        brz %l7, 0f                             ! skip if you are not the bootstrap CPU
-        nop
-        
-        sethi %hi(bootinfo), %o0
-        call memcpy
-        or %o0, %lo(bootinfo), %o0
-0:
-
-        /*
          * Switch to kernel trap table.
          */
@@ -210 +198 @@
         flush %g5
 
-        ! switch to context 0
-        stxa %g0, [VA_PRIMARY_CONTEXT_REG] %asi ! ASI_DMMU is correct here !!!
-        flush %g5
-
-        ! ensure nucleus mapping
+        ! enter nucleus - using context 0
         wrpr %g0, 1, %tl
-
-        ! set context 1 in the primary context register
-        mov MEM_CONTEXT_TEMP, %g1
-        stxa %g1, [VA_PRIMARY_CONTEXT_REG] %asi ! ASI_DMMU is correct here !!!
-        flush %g5
 
         ! demap context 1
@@ -231 +210 @@
         flush %g5
         
-        ! set TL back to 0
+        ! leave nucleus - using primary context, i.e. context 0
         wrpr %g0, 0, %tl
 
         brz %l7, 1f                             ! skip if you are not the bootstrap CPU
         nop
+
+        sethi %hi(bootinfo), %o0
+        call memcpy                             ! copy bootinfo
+        or %o0, %lo(bootinfo), %o0
 
         call arch_pre_main
@@ -272 +255 @@
         nop
 
-
         /*
          * Configure stack for the AP.