Changeset 822b64e in mainline for genarch/ofw.c

Timestamp:

2006-07-05T13:53:21Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2e672fd

Parents:

83253ad

Message:

Fix ofw.c to support map and translate methods even on 64-bit platforms.

File:

• genarch/ofw.c (modified) (4 diffs)

genarch/ofw.c

@@ -30 +30 @@
 #include <printf.h>
 #include <asm.h>
+#include <types.h>
 
 #define MAX_OFW_ARGS            10
@@ -168 +169 @@
 void *ofw_translate(const void *virt)
 {
-        ofw_arg_t result[3];
-        
-        if (ofw_call("call-method", 4, 4, result, "translate", ofw_mmu, virt, 1) != 0) {
+        ofw_arg_t result[4];
+        int shift;
+
+        if (ofw_call("call-method", 3, 5, result, "translate", ofw_mmu, virt) != 0) {
                 puts("Error: MMU method translate() failed, halting.\n");
                 halt();
         }
-        return (void *) result[2];
+
+        if (sizeof(unative_t) == 8)
+                shift = 32;
+        else
+                shift = 0;
+                
+        return (void *) (((result[2]&0xffffffff)<<shift)|((result[3])&0xffffffff));
 }
 
@@ -180 +188 @@
 int ofw_map(const void *phys, const void *virt, const int size, const int mode)
 {
-        return ofw_call("call-method", 6, 1, NULL, "map", ofw_mmu, mode, size, virt, phys);
+        uintptr_t phys_hi, phys_lo;
+
+        if (sizeof(unative_t) == 8) {
+                int shift = 32;
+                phys_hi = (uintptr_t) phys >> shift;
+                phys_lo = (uintptr_t) phys & 0xffffffff;
+        } else {
+                phys_hi = 0;
+                phys_lo = (uintptr_t) phys;
+        }
+
+        return ofw_call("call-method", 7, 1, NULL, "map", ofw_mmu, mode, size, virt,
+                phys_hi, phys_lo);
 }
 
@@ -239 +259 @@
         return true;
 }
-