Changeset 4872160 in mainline for kernel/arch/sparc64/src/sun4u

Timestamp:

2010-05-04T10:44:55Z (16 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/sparc64/src/sun4u

Files:

• sparc64.c (modified) (2 diffs)
• start.S (modified) (3 diffs)

kernel/arch/sparc64/src/sun4u/sparc64.c

@@ -36 +36 @@
 #include <debug.h>
 #include <config.h>
+#include <macros.h>
 #include <arch/trap/trap.h>
 #include <arch/console.h>
@@ -50 +51 @@
 #include <str.h>
 
-bootinfo_t bootinfo;
+memmap_t memmap;
 
 /** Perform sparc64-specific initialization before main_bsp() is called. */
-void arch_pre_main(void)
+void arch_pre_main(bootinfo_t *bootinfo)
 {
         /* Copy init task info. */
-        init.cnt = bootinfo.taskmap.count;
+        init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS);
         
-        uint32_t i;
-
-        for (i = 0; i < bootinfo.taskmap.count; i++) {
-                init.tasks[i].addr = (uintptr_t) bootinfo.taskmap.tasks[i].addr;
-                init.tasks[i].size = bootinfo.taskmap.tasks[i].size;
+        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;
+        ballocs.base = bootinfo->ballocs.base;
+        ballocs.size = bootinfo->ballocs.size;
         
-        ofw_tree_init(bootinfo.ofw_root);
+        ofw_tree_init(bootinfo->ofw_root);
 }
 

kernel/arch/sparc64/src/sun4u/start.S

@@ -60 +60 @@
 /*
  * Here is where the kernel is passed control from the boot loader.
- * 
+ *
  * The registers are expected to be in this state:
- * - %o0 starting address of physical memory + bootstrap processor flag
- *      bits 63...1:    physical memory starting address / 2
- *      bit 0:          non-zero on BSP processor, zero on AP processors
- * - %o1 bootinfo structure address (BSP only)
- * - %o2 bootinfo structure size (BSP only)
+ *  - %o0 bootinfo structure address (BSP only)
+ *  - %o1 starting address of physical memory
+ *        + bootstrap processor flag
+ *          bits 63...1: physical memory starting address / 2
+ *          bit 0:       non-zero on BSP processor, zero on AP processors
  *
  * Moreover, we depend on boot having established the following environment:
- * - TLBs are on
- * - identity mapping for the kernel image
+ *  - TLBs are on
+ *  - identity mapping for the kernel image
+ *
  */
 
@@ -76 +77 @@
 kernel_image_start:
         mov BSP_FLAG, %l0
-        and %o0, %l0, %l7                       ! l7 <= bootstrap processor?
-        andn %o0, %l0, %l6                      ! l6 <= start of physical memory
+        and %o1, %l0, %l7                       ! l7 <= bootstrap processor?
+        andn %o1, %l0, %l6                      ! l6 <= start of physical memory
 
         ! Get bits (PHYSMEM_ADDR_SIZE - 1):13 of physmem_base.
@@ -282 +283 @@
         sub %sp, STACK_BIAS, %sp
 
-        sethi %hi(bootinfo), %o0
-        call memcpy                             ! copy bootinfo
-        or %o0, %lo(bootinfo), %o0
-
         call arch_pre_main
         nop