Changeset 2e672fd in mainline for arch/ppc32/loader

Timestamp:

2006-07-10T20:48:40Z (20 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/ppc32/loader

Files:

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

arch/ppc32/loader/boot.S

@@ -34 +34 @@
 
 start:
-        lis r4, ofw@ha
-        addi r4, r4, ofw@l
+        lis r4, ofw_cif@ha
+        addi r4, r4, ofw_cif@l
         stw r5, 0(r4)
         

arch/ppc32/loader/main.c

@@ -157 +157 @@
         
         printf("\nBooting the kernel...\n");
-        jump_to_kernel(bootinfo_pa, sizeof(bootinfo), trans_pa, pages << PAGE_WIDTH, real_mode_pa, bootinfo.screen.addr, bootinfo.screen.scanline);
+        jump_to_kernel(bootinfo_pa, sizeof(bootinfo), trans_pa, pages << PAGE_WIDTH, real_mode_pa, (void *) bootinfo.screen.addr, bootinfo.screen.scanline);
 }

arch/ppc32/loader/ofw.c

@@ -30 +30 @@
 #include <printf.h>
 
+typedef int (* ofw_entry_t)(ofw_args_t *args);
+
+int ofw(ofw_args_t *args)
+{
+        return ((ofw_entry_t) ofw_cif)(args);
+}
+
 void write(const char *str, const int len)
 {
@@ -49 +56 @@
         if (ofw_get_property(device, "assigned-addresses", &macio, sizeof(macio)) <= 0)
                 return false;
-        keyboard->addr = (void *) macio.addr.addr_lo;
+        keyboard->addr = macio.addr.addr_lo;
         keyboard->size = macio.size_lo;
 
         return true;
 }
+
+int ofw_translate_failed(ofw_arg_t flag)
+{
+        return 0;
+}