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

Timestamp:

2006-03-13T19:58:00Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

6323989

Parents:

272c219

Message:

relocate ppc32 kernel above 2 GB

File:

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

arch/ppc32/loader/main.c

@@ -32 +32 @@
 #include "asm.h"
 
-#define KERNEL_LOAD_ADDRESS 0x400000
+#define KERNEL_PHYSICAL_ADDRESS 0x1000
+#define KERNEL_VIRTUAL_ADDRESS 0x80001000
 #define KERNEL_START &_binary_____________kernel_kernel_bin_start
 #define KERNEL_END &_binary_____________kernel_kernel_bin_end
@@ -41 +42 @@
         printf("\nHelenOS PPC Bootloader\n");
         
-        void *loader = ofw_translate(&start);
-        printf("loaded at %L (physical %L)\n", &start, loader);
-        printf("kernel load address %L (size %d)\n", KERNEL_LOAD_ADDRESS, KERNEL_SIZE);
+        void *phys = ofw_translate(&start);
+        printf("loaded at %L (physical %L)\n", &start, phys);
         
-        void *addr = ofw_claim((void *) KERNEL_LOAD_ADDRESS, KERNEL_SIZE, 1);
-        if (addr == NULL) {
-                printf("Error: Unable to claim memory");
+        // FIXME: map just the kernel
+        if (ofw_map((void *) KERNEL_PHYSICAL_ADDRESS, (void *) KERNEL_VIRTUAL_ADDRESS, 1024 * 1024, 0) != 0) {
+                printf("Unable to map kernel memory at %L (physical %L)\n", KERNEL_VIRTUAL_ADDRESS, KERNEL_PHYSICAL_ADDRESS);
                 halt();
         }
-        printf("Claimed memory at %L\n", addr);
-        memcpy(addr, KERNEL_START, KERNEL_SIZE);
+        printf("kernel memory mapped at %L (physical %L, size %d bytes)\n", KERNEL_VIRTUAL_ADDRESS, KERNEL_PHYSICAL_ADDRESS, KERNEL_SIZE);
+        // FIXME: relocate the kernel in real mode
+        memcpy((void *) KERNEL_VIRTUAL_ADDRESS, KERNEL_START, KERNEL_SIZE);
+        
+        // FIXME: proper framebuffer mapping
+        ofw_map((void *) 0x84000000, (void *) 0x84000000, 2 * 1024 * 1024, 0);
         
         printf("Booting the kernel...\n");
-        jump_to_kernel(addr);
+        
+        flush_instruction_cache();
+        jump_to_kernel((void *) KERNEL_VIRTUAL_ADDRESS);
 }