Changeset 6196dae in mainline

Timestamp:

2009-01-28T15:22:54Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

f3776a3

Parents:

623dc03

Message:

correct memory mapping for machines with physical memory displacement
this fixes booting on machines whose physical memory does not start at 0

File:

• boot/arch/sparc64/loader/main.c (modified) (4 diffs)

boot/arch/sparc64/loader/main.c

@@ -143 +143 @@
                 silo_ramdisk_image -= 0x400000;
                 /* Install 1:1 mapping for the ramdisk. */
-                if (ofw_map((void *)((uintptr_t)silo_ramdisk_image),
-                    (void *)((uintptr_t)silo_ramdisk_image),
+                if (ofw_map((void *)((uintptr_t) silo_ramdisk_image),
+                    (void *)((uintptr_t) silo_ramdisk_image),
                     silo_ramdisk_size, -1) != 0) {
                         printf("Failed to map ramdisk.\n");
@@ -204 +204 @@
                  */
                 (void) ofw_claim_phys(base + top, silo_ramdisk_size);
-                (void) ofw_map(base + top, base + top, silo_ramdisk_size, -1);
+                (void) ofw_map(bootinfo.physmem_start + base + top, base + top,
+                    silo_ramdisk_size, -1);
                 memmove(base + top, (void *)((uintptr_t)silo_ramdisk_image),
                     silo_ramdisk_size);
@@ -254 +255 @@
         (void) ofw_claim_phys(bootinfo.physmem_start + balloc_base,
             BALLOC_MAX_SIZE);
-        (void) ofw_map(balloc_base, balloc_base, BALLOC_MAX_SIZE, -1);
+        (void) ofw_map(bootinfo.physmem_start + balloc_base, balloc_base,
+            BALLOC_MAX_SIZE, -1);
         balloc_init(&bootinfo.ballocs, (uintptr_t)balloc_base);
 
@@ -275 +277 @@
             sizeof(bootinfo));
 }
-