Changeset 4037847 in mainline

Timestamp:

2006-03-24T19:14:12Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c715e9b

Parents:

5201199

Message:

kernel boot API change

Location:

arch/ppc32

Files:

• include/boot/boot.h (modified) (1 diff)
• include/boot/memmap.h (deleted)
• src/boot/boot.S (modified) (3 diffs)
• src/mm/frame.c (modified) (3 diffs)
• src/mm/memory_init.c (modified) (2 diffs)
• src/ppc32.c (modified) (1 diff)

arch/ppc32/include/boot/boot.h

@@ -35 +35 @@
 #define TEMP_STACK_SIZE 0x100
 
+#define MEMMAP_MAX_RECORDS 32
+
+#ifndef __ASM__
+
+#include <arch/types.h>
+
+typedef struct {
+        __address start;
+        __u32 size;
+} memzone_t;
+
+typedef struct {
+        __u32 total;
+        __u32 count;
+        memzone_t zones[MEMMAP_MAX_RECORDS];
+} memmap_t;
+
+typedef struct {
+        unsigned int addr;
+        unsigned int width;
+        unsigned int height;
+        unsigned int bpp;
+        unsigned int scanline;
+} screen_t;
+
+typedef struct {
+        memmap_t memmap;
+        screen_t screen;
+} bootinfo_t;
+
+extern bootinfo_t bootinfo;
+
 #endif
+
+#endif

arch/ppc32/src/boot/boot.S

@@ -29 +29 @@
 #include <arch/asm/regname.h>
 #include <arch/boot/boot.h>
-#include <arch/boot/memmap.h>
 
 .section K_TEXT_START, "ax"
@@ -41 +40 @@
         addi sp, sp, end_stack@l
         
-        # r10 contains physical address to memmap_t
-        # from boot loader
+        # r3 contains physical address of bootinfo_t
+        # r4 contains size of bootinfo_t
         
         lis r31, 0x80000000@ha
@@ -49 +48 @@
         add r3, r3, r31
 
-        lis r31, memmap@ha
-        addi r31, r31, memmap@l    # r31 = memmap
+        lis r31, bootinfo@ha
+        addi r31, r31, bootinfo@l  # r31 = bootinfo
         
-        lwz r30, 0(r3)             # memmap->total
-        stw r30, 0(r31)
+        cmpwi r4, 0
+        beq bootinfo_end
         
-        lwzu r30, 4(r3)            # memmap->count
-        stwu r30, 4(r31)
-        
-        cmpwi r30, 0
-        beq memmap_end
-        
-        mtctr r30
-        memmap_loop:
-        
-                lwzu r30, 4(r3)           # memmap->zones[i].start
-                stwu r30, 4(r31)
+        bootinfo_loop:
                 
-                lwzu r30, 4(r3)           # memmap->zones[i].size
-                stwu r30, 4(r31)
-        
-        bdnz memmap_loop
-        memmap_end:
+                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:
         
         b main_bsp

arch/ppc32/src/mm/frame.c

@@ -27 +27 @@
  */
 
+#include <arch/boot/boot.h>
 #include <arch/mm/frame.h>
-#include <arch/boot/memmap.h>
 #include <arch/mm/memory_init.h>
 #include <mm/frame.h>
@@ -43 +43 @@
         size_t size;
         
-        for (i = 0; i < memmap.count; i++) {
-                start = ADDR2PFN(ALIGN_UP(memmap.zones[i].start, FRAME_SIZE));
-                size = SIZE2FRAMES(ALIGN_DOWN(memmap.zones[i].size, FRAME_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));
                 
                 if ((minconf < start) || (minconf >= start + size))
@@ -53 +53 @@
                 
                 zone_create(start, size, conf, 0);
-                if (last_frame < ALIGN_UP(memmap.zones[i].start + memmap.zones[i].size, FRAME_SIZE))
-                        last_frame = ALIGN_UP(memmap.zones[i].start + memmap.zones[i].size, FRAME_SIZE);
+                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);
         }
 

arch/ppc32/src/mm/memory_init.c

@@ -27 +27 @@
  */
 
-#include <arch/boot/memmap.h>
+#include <arch/boot/boot.h>
 #include <arch/mm/memory_init.h>
 #include <typedefs.h>
 #include <print.h>
 
-memmap_t memmap;
-
 
 size_t get_memory_size(void) 
 {
-        return memmap.total;
+        return bootinfo.memmap.total;
 }
 
@@ -45 +43 @@
         count_t i;
         
-        for (i = 0; i < memmap.count; i++)
-                printf("base: %L size: %L\n", memmap.zones[i].start, memmap.zones[i].size);
+        for (i = 0; i < bootinfo.memmap.count; i++)
+                printf("base: %L size: %L\n", bootinfo.memmap.zones[i].start, bootinfo.memmap.zones[i].size);
 }

arch/ppc32/src/ppc32.c

@@ -28 +28 @@
 
 #include <arch.h>
+#include <arch/boot/boot.h>
 #include <arch/console.h>
 #include <arch/drivers/cuda.h>
 #include <arch/mm/memory_init.h>
 #include <arch/interrupt.h>
+
+bootinfo_t bootinfo;
 
 void arch_pre_mm_init(void)