Changeset f941347 in mainline for arch/ppc32/loader/main.c

Timestamp:

2006-03-17T12:46:35Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7dcde32

Parents:

543c31f

Message:

relocate boot loader structures if needed
(allowing to boot on stupid OFW implementations)

File:

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

arch/ppc32/loader/main.c

@@ -35 +35 @@
 #define KERNEL_SIZE ((unsigned int) KERNEL_END - (unsigned int) KERNEL_START)
 
+#define HEAP_GAP 1024000
+
 memmap_t memmap;
 
@@ -47 +49 @@
 
 
-static void check_overlap(const void *addr, const char *desc)
+static void fix_overlap(void *va, void **pa, const char *desc, unsigned int *top)
 {
-        if ((unsigned int) addr < KERNEL_SIZE) {
-                printf("Error: %s overlaps kernel physical area\n", desc);
-                halt();
+        if ((unsigned int) *pa + PAGE_SIZE < *top) {
+                printf("Warning: %s overlaps kernel physical area\n", desc);
+                
+                void *new_va = (void *) (ALIGN_UP((unsigned int) KERNEL_END + HEAP_GAP, PAGE_SIZE) + *top);
+                void *new_pa = (void *) (HEAP_GAP + *top);
+                *top += PAGE_SIZE;
+                
+                if (ofw_map(new_pa, new_va, PAGE_SIZE, 0) != 0) {
+                        printf("Error: Unable to map page aligned memory at %L (physical %L)\n", new_va, new_pa);
+                        halt();
+                }
+                
+                if ((unsigned int) new_pa + PAGE_SIZE < KERNEL_SIZE) {
+                        printf("Error: %s cannot be relocated\n", desc);
+                        halt(); 
+                }
+                
+                printf("Relocating %L -> %L (physical %L -> %L)\n", va, new_va, *pa, new_pa);
+                *pa = new_pa;
+                memcpy(new_va, va, PAGE_SIZE);
         }
 }
@@ -73 +92 @@
         void *memmap_pa = ofw_translate(&memmap);
         
-        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);
@@ -83 +98 @@
         printf(" translation table    at %L (physical %L)\n", &trans, trans_pa);
         
+        unsigned int top = ALIGN_UP(KERNEL_SIZE, PAGE_SIZE);
         unsigned int addr;
         for (addr = 0; addr < KERNEL_SIZE; addr += PAGE_SIZE) {
                 void *pa = ofw_translate(KERNEL_START + addr);
-                check_overlap(pa, "Kernel image");
+                fix_overlap(KERNEL_START + addr, &pa, "Kernel image", &top);
                 trans[addr >> PAGE_WIDTH] = pa;
         }
+        
+        fix_overlap(&real_mode, &real_mode_pa, "Bootstrap trampoline", &top);
+        fix_overlap(&trans, &trans_pa, "Translation table", &top);
+        fix_overlap(&memmap, &memmap_pa, "Memory map", &top);
         
         printf("Booting the kernel...\n");