Changeset 3debedec in mainline for arch/ppc32/src/mm/memory_init.c

Timestamp:

2006-02-16T20:26:14Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

ba52899

Parents:

2a46e10

Message:

Made powerpc to get on PearPC to the version print when compiled with -O1:

• create proper memory zones
• switch to real mode on boot

TODO

• kernel relocation during boot
• autodetection of framebuffer settings (PCI?) - now includes hardcoded settings for PearPc.

File:

• arch/ppc32/src/mm/memory_init.c (modified) (2 diffs)

arch/ppc32/src/mm/memory_init.c

@@ -30 +30 @@
 #include <genarch/ofw/ofw.h>
 #include <panic.h>
+#include <mm/frame.h>
+#include <align.h>
 
 #define MEMMAP_MAX_RECORDS 32
@@ -38 +40 @@
 } memmap_t;
 
-size_t get_memory_size(void) 
+static memmap_t memmap[MEMMAP_MAX_RECORDS];
+size_t total_mem = 0;
+
+static void init_memmap(void)
 {
+        int i;
+
         phandle handle = ofw_find_device("/memory");
         if (handle == -1)
                 panic("No RAM\n");
         
-        memmap_t memmap[MEMMAP_MAX_RECORDS];
         size_t ret = ofw_get_property(handle, "reg", &memmap, sizeof(memmap));
         if (ret == -1)
                 panic("Device /memory has no reg property\n");
         
-        size_t total = 0;
-        int i;
         
         for (i = 0; i < MEMMAP_MAX_RECORDS; i++) {
                 if (memmap[i].size == 0)
                         break;
-                total += memmap[i].size;
+                total_mem += memmap[i].size;
         }
+}
 
-        return total;
+void preboot_read_config(void)
+{
+        init_memmap();
 }
+
+size_t get_memory_size(void) 
+{
+        return total_mem;
+}
+
+void ppc_init_zones(void)
+{
+        int i;
+        pfn_t confdata;
+
+        for (i = 0; i < MEMMAP_MAX_RECORDS; i++) {
+                if (memmap[i].size == 0)
+                        break;
+                confdata = ADDR2PFN(memmap[i].start);
+                if (confdata == 0)
+                        confdata = 2;
+                zone_create(ADDR2PFN(memmap[i].start),
+                            SIZE2FRAMES(ALIGN_DOWN(memmap[i].size,PAGE_SIZE)),
+                            confdata, 0);
+        }
+}