Changeset 2e672fd in mainline for arch/sparc64

Timestamp:

2006-07-10T20:48:40Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

daab5145

Parents:

822b64e

Message:

Some 32-bit vs. 64-bit fixes.

Make the call to OpenFirmware client interface architecture dependent.
For instance and contrary to my previous experience, the sparc64 version of
'translate' method would not work reliably unless the Address Mask bit in the
PSTATE register is cleared during duration of the call.

sparc64 and ppc32 OpenFirmware seem to differ in details, for example, the above
mentioned method 'translate' signals success by setting the first return value
to -1 on sparc64 while on ppc32 the value is/stays (???) zero.

Location:

arch/sparc64/loader

Files:

• asm.S (modified) (2 diffs)
• boot.S (modified) (2 diffs)
• main.c (modified) (1 diff)
• ofw.c (modified) (1 diff)

arch/sparc64/loader/asm.S

@@ -26 +26 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
+
+#define STACK_WINDOW_SAVE_AREA_SIZE     (16*8)
+
+#define PSTATE_AM_BIT   8
 
 .text
@@ -95 +99 @@
 
 jump_to_kernel:
-        set ofw, %l0
+        set ofw_cif, %l0
         jmp %o0                         ! jump to kernel
         ldx [%l0], %o4                  ! pass OpenFirmware address in %o4
+
+.global ofw
+ofw:
+        save %sp, -STACK_WINDOW_SAVE_AREA_SIZE, %sp
+        set ofw_cif, %l0
+        ldx [%l0], %l0
+
+        rdpr  %pstate, %l1
+        and  %l1, ~PSTATE_AM_BIT, %l2
+        wrpr  %l2, 0, %pstate
+    
+        jmpl %l0, %o7
+        mov %i0, %o0
+
+        wrpr %l1, 0, %pstate
+
+        ret
+        restore %o0, 0, %o0

arch/sparc64/loader/boot.S

@@ -29 +29 @@
 #define INITIAL_STACK 0x0
 
+#define PSTATE_IE_BIT   2
+
 .register %g2, #scratch
 .register %g3, #scratch
@@ -53 +55 @@
         flushw
 
+        /*
+         * Disable interrupts.
+         */
+        rdpr %pstate, %g2
+        and %g2, ~PSTATE_IE_BIT, %g2    ! mask the Interrupt Enable bit
+        wrpr %g2, 0, %pstate
+
         # TODO: set initial stack
 
-        set ofw, %l0
+        set ofw_cif, %l0
  
         call init               ! initialize OpenFirmware

arch/sparc64/loader/main.c

@@ -52 +52 @@
                 printf(" %L: %s image (size %d bytes)\n", components[i].start, components[i].name, components[i].size);
 
-        screen_t scr;
-        
-        ofw_screen(&scr);
-        printf("\n%P: fb, %dx%dx%d\n", ofw_translate(scr.addr), scr.width, scr.height, scr.bpp);
-
-        
         printf("\nCopying components\n");
         unsigned int top = 0;

arch/sparc64/loader/ofw.c

@@ -40 +40 @@
         }
 }
+
+int ofw_translate_failed(ofw_arg_t flag)
+{
+        return flag != -1;
+}