Changeset 95b47c82 in mainline for boot/genarch/ofw.c

Timestamp:

2007-04-15T20:51:04Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9a7a970

Parents:

ddee708

Message:

Fix ticket #31.

File:

• boot/genarch/ofw.c (modified) (7 diffs)

boot/genarch/ofw.c

@@ -39 +39 @@
 phandle ofw_root;
 ihandle ofw_mmu;
+ihandle ofw_memory_prop;
 phandle ofw_memory;
 phandle ofw_aliases;
@@ -48 +49 @@
                 halt();
         
-        if (ofw_get_property(ofw_chosen, "stdout",  &ofw_stdout, sizeof(ofw_stdout)) <= 0)
+        if (ofw_get_property(ofw_chosen, "stdout", &ofw_stdout, sizeof(ofw_stdout)) <= 0)
                 ofw_stdout = 0;
         
@@ -57 +58 @@
         }
         
-        if (ofw_get_property(ofw_chosen, "mmu",  &ofw_mmu, sizeof(ofw_mmu)) <= 0) {
+        if (ofw_get_property(ofw_chosen, "mmu", &ofw_mmu, sizeof(ofw_mmu)) <= 0) {
                 puts("\r\nError: Unable to get mmu property, halted.\r\n");
+                halt();
+        }
+        if (ofw_get_property(ofw_chosen, "memory", &ofw_memory_prop, sizeof(ofw_memory_prop)) <= 0) {
+                puts("\r\nError: Unable to get memory property, halted.\r\n");
                 halt();
         }
@@ -201 +206 @@
                 shift = 0;
 
-        return (void *) ((result[2]<<shift)|result[3]);
-}
-
-void *ofw_claim(const void *virt, const int len)
+        return (void *) ((result[2] << shift) | result[3]);
+}
+
+void *ofw_claim_virt(const void *virt, const int len)
 {
         ofw_arg_t retaddr;
-        int shift;
 
         if (ofw_call("call-method", 5, 2, &retaddr, "claim", ofw_mmu, 0, len, virt) != 0) {
@@ -215 +219 @@
 
         return (void *) retaddr;
+}
+
+void *ofw_claim_phys(const void *phys, const int len)
+{
+        ofw_arg_t retaddr[2];
+        int shift;
+
+        if (sizeof(unative_t) == 8) {
+                shift = 32;
+                if (ofw_call("call-method", 6, 3, retaddr, "claim",
+                    ofw_memory_prop, 0, len, ((uintptr_t) phys) >> shift,
+                    ((uintptr_t) phys) & ((uint32_t) -1)) != 0) {
+                        /*
+                         * Note that this will help us to discover
+                         * conflicts between OpenFirmware allocations
+                         * and our use of physical memory.
+                         * It is better to detect collisions here
+                         * than to cope with weird errors later.
+                         *
+                         * So this is really not to make the loader
+                         * more generic; it is here for debugging
+                         * purposes.
+                         */
+                        puts("Error: memory method claim() failed, halting.\n");
+                        halt();
+                }
+        } else {
+                shift = 0;
+                /*
+                 * FIXME: the number of arguments is probably different...
+                 */
+                puts("Error: 32-bit ofw_claim_phys not implemented.\n");
+                halt();
+        }
+
+        return (void *) ((retaddr[0] << shift) | retaddr[1]);
 }
 
@@ -231 +271 @@
 
         return ofw_call("call-method", 7, 1, NULL, "map", ofw_mmu, mode, size, virt,
-                phys_hi, phys_lo);
+            phys_hi, phys_lo);
 }
 
@@ -253 +293 @@
         map->total = 0;
         map->count = 0;
-        for (pos = 0; (pos < ret / sizeof(uint32_t)) && (map->count <
-                MEMMAP_MAX_RECORDS); pos += ac + sc) {
+        for (pos = 0; (pos < ret / sizeof(uint32_t)) &&
+            (map->count < MEMMAP_MAX_RECORDS); pos += ac + sc) {
                 void * start = (void *) ((uintptr_t) buf[pos + ac - 1]);
                 unsigned int size = buf[pos + ac + sc - 1];