Changeset 06e6805 in mainline

Timestamp:

2006-03-14T11:08:44Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

4bb4836d

Parents:

d1f8a87

Message:

ppc32: get memory map from loader

Location:

arch/ppc32

Files:

• Makefile.inc (modified) (1 diff)
• include/boot/memmap.h (added)
• include/mm/memory_init.h (modified) (1 diff)
• src/boot/boot.S (moved) (moved from arch/ppc32/src/start.S ) (1 diff)
• src/console.c (modified) (1 diff)
• src/mm/memory_init.c (modified) (1 diff)
• src/ppc32.c (modified) (2 diffs)

arch/ppc32/Makefile.inc

@@ -59 +59 @@
         arch/$(ARCH)/src/debug/panic.s \
         arch/$(ARCH)/src/fpu_context.S \
+        arch/$(ARCH)/src/boot/boot.S \
         arch/$(ARCH)/src/ppc32.c \
         arch/$(ARCH)/src/dummy.s \
-        arch/$(ARCH)/src/start.S \
         arch/$(ARCH)/src/asm.S \
         arch/$(ARCH)/src/cpu/cpu.c \

arch/ppc32/include/mm/memory_init.h

@@ -34 +34 @@
 size_t get_memory_size(void);
 
+void memory_print_map(void);
+
 #endif

arch/ppc32/src/boot/boot.S

@@ -29 +29 @@
 #include <arch/asm/regname.h>
 #include <arch/asm/spr.h>
+#include <arch/boot/boot.h>
+#include <arch/boot/memmap.h>
 
 .section K_TEXT_START
 
 .global kernel_image_start
+kernel_image_start:
+        
+        # r10 contains physical address to memmap_t
+        # from boot loader
+        
+        lis r4, 0x80000000@ha
+        addi r4, r4, 0x80000000@l
+        
+        add r10, r10, r4
 
-kernel_image_start:
+        lis r4, memmap@ha
+        addi r4, r4, memmap@l    # r4 = memmap
+        
+        lwz r5, 0(r10)           # memmap->total
+        stw r5, 0(r4)
+        
+        lwzu r5, 4(r10)           # memmap->count
+        stwu r5, 4(r4)
+        
+        cmpwi r5, 0
+        beq memmap_end
+        
+        mtctr r5
+        memmap_loop:
+        
+                lwzu r5, 4(r10)           # memmap->zones[i].start
+                stwu r5, 4(r4)
+                
+                lwzu r5, 4(r10)           # memmap->zones[i].size
+                stwu r5, 4(r4)
+        
+        bdnz memmap_loop
+        memmap_end:
+        
         b main_bsp

arch/ppc32/src/console.c

@@ -37 +37 @@
 {
         /* TODO: PCI detection etc. etc. - this is fine in PearPC for now */
-        fb_init(0x84000000, 800, 600, 4);
+        fb_init(0xf0000000, 800, 600, 4);
 }

arch/ppc32/src/mm/memory_init.c

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

arch/ppc32/src/ppc32.c

@@ -30 +30 @@
 #include <arch/console.h>
 
+#include <arch/mm/memory_init.h>
+
 void arch_pre_mm_init(void)
 {
@@ -41 +43 @@
 void arch_pre_smp_init(void)
 {
+        memory_print_map();
 }