Changeset 4872160 in mainline for kernel/arch/ppc32/src

Timestamp:

2010-05-04T10:44:55Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

568db0f

Parents:

bb252ca

Message:

new boot infrastructure

• more code and metadata unification
• import of up-to-date implementations from the kernel
• the boot loaders should behave more similarly on all platforms
• support for deflate compressed (LZ77) boot components
  • this again allows feasible boot images to be created on mips32
• IA64 is still not booting
  • the broken forked GNU EFI library has been removed, a replacement of the functionality is on its way

Location:

kernel/arch/ppc32/src

Files:

• boot/boot.S (modified) (1 diff)
• mm/frame.c (modified) (5 diffs)
• mm/page.c (modified) (1 diff)
• ppc32.c (modified) (1 diff)

kernel/arch/ppc32/src/boot/boot.S

@@ -47 +47 @@
         
         # r3 contains physical address of bootinfo_t
-        # r4 contains size of bootinfo_t
-        
-        cmpwi r4, 0
-        beq bootinfo_end
         
         addis r3, r3, 0x8000
-        
-        lis r31, bootinfo@ha
-        addi r31, r31, bootinfo@l  # r31 = bootinfo
-        
-        bootinfo_loop:
-                
-                lwz r30, 0(r3)
-                stw r30, 0(r31)
-                
-                addi r3, r3, 4
-                addi r31, r31, 4
-                subi r4, r4, 4
-                
-                cmpwi r4, 0
-                bgt bootinfo_loop
-                
-        bootinfo_end:
-        
         bl arch_pre_main
         b main_bsp

kernel/arch/ppc32/src/mm/frame.c

@@ -27 +27 @@
  */
 
-/** @addtogroup ppc32mm 
+/** @addtogroup ppc32mm
  * @{
  */
@@ -41 +41 @@
 
 uintptr_t last_frame = 0;
+memmap_t memmap;
 
 void physmem_print(void)
@@ -49 +50 @@
         printf("---------- ----------\n");
                 
-        for (i = 0; i < bootinfo.memmap.count; i++) {
-                printf("%#10x %#10x\n", bootinfo.memmap.zones[i].start,
-                        bootinfo.memmap.zones[i].size);
+        for (i = 0; i < memmap.cnt; i++) {
+                printf("%#10x %#10x\n", memmap.zones[i].start,
+                        memmap.zones[i].size);
         }
 }
@@ -62 +63 @@
         size_t size;
         
-        for (i = 0; i < bootinfo.memmap.count; i++) {
-                start = ADDR2PFN(ALIGN_UP(bootinfo.memmap.zones[i].start, FRAME_SIZE));
-                size = SIZE2FRAMES(ALIGN_DOWN(bootinfo.memmap.zones[i].size, FRAME_SIZE));
+        for (i = 0; i < memmap.cnt; i++) {
+                start = ADDR2PFN(ALIGN_UP((uintptr_t) memmap.zones[i].start, FRAME_SIZE));
+                size = SIZE2FRAMES(ALIGN_DOWN(memmap.zones[i].size, FRAME_SIZE));
                 
                 if ((minconf < start) || (minconf >= start + size))
@@ -72 +73 @@
                 
                 zone_create(start, size, conf, 0);
-                if (last_frame < ALIGN_UP(bootinfo.memmap.zones[i].start + bootinfo.memmap.zones[i].size, FRAME_SIZE))
-                        last_frame = ALIGN_UP(bootinfo.memmap.zones[i].start + bootinfo.memmap.zones[i].size, FRAME_SIZE);
+                if (last_frame < ALIGN_UP((uintptr_t) memmap.zones[i].start + memmap.zones[i].size, FRAME_SIZE))
+                        last_frame = ALIGN_UP((uintptr_t) memmap.zones[i].start + memmap.zones[i].size, FRAME_SIZE);
         }
         

kernel/arch/ppc32/src/mm/page.c

@@ -45 +45 @@
 }
 
-
 uintptr_t hw_map(uintptr_t physaddr, size_t size)
 {

kernel/arch/ppc32/src/ppc32.c

@@ -65 +65 @@
 
 /** Performs ppc32-specific initialization before main_bsp() is called. */
-void arch_pre_main(void)
-{
-        init.cnt = bootinfo.taskmap.count;
-        
-        uint32_t i;
-        
-        for (i = 0; i < min3(bootinfo.taskmap.count, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); i++) {
-                init.tasks[i].addr = bootinfo.taskmap.tasks[i].addr;
-                init.tasks[i].size = bootinfo.taskmap.tasks[i].size;
+void arch_pre_main(bootinfo_t *bootinfo)
+{
+        /* Copy tasks map. */
+        init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS);
+        size_t i;
+        for (i = 0; i < init.cnt; i++) {
+                init.tasks[i].addr = (uintptr_t) bootinfo->taskmap.tasks[i].addr;
+                init.tasks[i].size = bootinfo->taskmap.tasks[i].size;
                 str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN,
-                    bootinfo.taskmap.tasks[i].name);
+                    bootinfo->taskmap.tasks[i].name);
+        }
+        
+        /* Copy physical memory map. */
+        memmap.total = bootinfo->memmap.total;
+        memmap.cnt = min(bootinfo->memmap.cnt, MEMMAP_MAX_RECORDS);
+        for (i = 0; i < memmap.cnt; i++) {
+                memmap.zones[i].start = bootinfo->memmap.zones[i].start;
+                memmap.zones[i].size = bootinfo->memmap.zones[i].size;
         }
         
         /* Copy boot allocations info. */
-        ballocs.base = bootinfo.ballocs.base;
-        ballocs.size = bootinfo.ballocs.size;
-        
-        ofw_tree_init(bootinfo.ofw_root);
+        ballocs.base = bootinfo->ballocs.base;
+        ballocs.size = bootinfo->ballocs.size;
+        
+        /* Copy OFW tree. */
+        ofw_tree_init(bootinfo->ofw_root);
 }