Changeset eb522e8 in mainline for boot/arch/sparc64/src/main.c

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Huuuuuge merge from development - all the work actually

File:

• boot/arch/sparc64/src/main.c (modified) (5 diffs)

boot/arch/sparc64/src/main.c

@@ -190 +190 @@
         bootinfo.memmap.zones[0].start += OBP_BIAS;
         bootinfo.memmap.zones[0].size -= OBP_BIAS;
+        bootinfo.memmap.total -= OBP_BIAS;
 }
 
@@ -204 +205 @@
         bootinfo.physmem_start = ofw_get_physmem_start();
         ofw_memmap(&bootinfo.memmap);
+
+        if (arch == ARCH_SUN4V)
+                sun4v_fixups();
         
         void *bootinfo_pa = ofw_translate(&bootinfo);
@@ -209 +213 @@
         void *loader_address_pa = ofw_translate((void *) LOADER_ADDRESS);
         
-        printf("\nMemory statistics (total %llu MB, starting at %p)\n",
-            bootinfo.memmap.total >> 20, bootinfo.physmem_start);
-        printf(" %p|%p: boot info structure\n", &bootinfo, bootinfo_pa);
-        printf(" %p|%p: kernel entry point\n", KERNEL_ADDRESS, kernel_address_pa);
-        printf(" %p|%p: loader entry point\n", LOADER_ADDRESS, loader_address_pa);
+        printf("\nMemory statistics (total %" PRIu64 " MB, starting at %p)\n",
+            bootinfo.memmap.total >> 20, (void *) bootinfo.physmem_start);
+        printf(" %p|%p: boot info structure\n", &bootinfo, (void *) bootinfo_pa);
+        printf(" %p|%p: kernel entry point\n",
+            (void *) KERNEL_ADDRESS, (void *) kernel_address_pa);
+        printf(" %p|%p: loader entry point\n",
+            (void *) LOADER_ADDRESS, (void *) loader_address_pa);
         
         size_t i;
         for (i = 0; i < COMPONENTS; i++)
-                printf(" %p|%p: %s image (%u/%u bytes)\n", components[i].start,
+                printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].start,
                     ofw_translate(components[i].start), components[i].name,
                     components[i].inflated, components[i].size);
@@ -251 +257 @@
                 
                 /*
-                 * At this point, we claim the physical memory that we are
-                 * going to use. We should be safe in case of the virtual
+                 * At this point, we claim and map the physical memory that we
+                 * are going to use. We should be safe in case of the virtual
                  * address space because the OpenFirmware, according to its
-                 * SPARC binding, should restrict its use of virtual memory
-                 * to addresses from [0xffd00000; 0xffefffff] and
-                 * [0xfe000000; 0xfeffffff].
-                 *
-                 * We don't map this piece of memory. We simply rely on
-                 * SILO to have it done for us already in this case.
-                 *
-                 * XXX SILO only maps 8 MB for us here. We should improve
-                 *     this code to be totally independent on the behavior
-                 *     of SILO.
-                 *
+                 * SPARC binding, should restrict its use of virtual memory to
+                 * addresses from [0xffd00000; 0xffefffff] and [0xfe000000;
+                 * 0xfeffffff].
                  */
                 ofw_claim_phys(bootinfo.physmem_start + dest[i - 1],
                     ALIGN_UP(components[i - 1].inflated, PAGE_SIZE));
+                
+                ofw_map(bootinfo.physmem_start + dest[i - 1], dest[i - 1],
+                    ALIGN_UP(components[i - 1].inflated, PAGE_SIZE), -1);
                 
                 int err = inflate(components[i - 1].start, components[i - 1].size,
@@ -302 +303 @@
                 sun4u_smp();
         
-        if (arch == ARCH_SUN4V)
-                sun4v_fixups();
-        
         printf("Booting the kernel ...\n");
         jump_to_kernel(bootinfo.physmem_start | BSP_PROCESSOR, &bootinfo, subarch,