Changeset 1f330de in mainline for arch/ppc32/loader/main.c

Timestamp:

2006-03-17T02:04:30Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

543c31f

Parents:

01cb210

Message:

proper ppc32 initial memory mapping

File:

• arch/ppc32/loader/main.c (modified) (3 diffs)

arch/ppc32/loader/main.c

@@ -47 +47 @@
 
 
+static void check_overlap(const void *addr, const char *desc)
+{
+        if ((unsigned int) addr < KERNEL_SIZE) {
+                printf("Error: %s overlaps kernel physical area\n", desc);
+                halt();
+        }
+}
+
+
 void bootstrap(void)
 {
@@ -55 +64 @@
         check_align(&trans, "Translation table");
         
+        if (!ofw_memmap(&memmap)) {
+                printf("Error: Unable to get memory map\n");
+                halt();
+        }
+        
         void *real_mode_pa = ofw_translate(&real_mode);
         void *trans_pa = ofw_translate(&trans);
         void *memmap_pa = ofw_translate(&memmap);
         
-        printf("Memory statistics\n");
+        check_overlap(real_mode_pa, "Bootstrap trampoline");
+        check_overlap(trans_pa, "Translation table");
+        check_overlap(memmap_pa, "Memory map");
+        
+        printf("Memory statistics (total %d MB)\n", memmap.total >> 20);
         printf(" kernel image         at %L (size %d bytes)\n", KERNEL_START, KERNEL_SIZE);
         printf(" memory map           at %L (physical %L)\n", &memmap, memmap_pa);
@@ -65 +83 @@
         printf(" translation table    at %L (physical %L)\n", &trans, trans_pa);
         
-        if (!ofw_memmap(&memmap)) {
-                printf("Unable to get memory map\n");
-                halt();
-        }
-        printf("Total memory %d MB\n", memmap.total >> 20);
-        
         unsigned int addr;
-        unsigned int pages;
-        for (addr = 0, pages = 0; addr < KERNEL_SIZE; addr += PAGE_SIZE, pages++) {
+        for (addr = 0; addr < KERNEL_SIZE; addr += PAGE_SIZE) {
                 void *pa = ofw_translate(KERNEL_START + addr);
-                if ((unsigned int) pa < KERNEL_SIZE) {
-                        printf("Error: Kernel image overlaps kernel physical area\n");
-                        halt();
-                }
+                check_overlap(pa, "Kernel image");
                 trans[addr >> PAGE_WIDTH] = pa;
         }
         
         printf("Booting the kernel...\n");
-        jump_to_kernel(memmap_pa, trans_pa, pages, real_mode_pa);
+        jump_to_kernel(memmap_pa, trans_pa, KERNEL_SIZE, real_mode_pa);
 }