Changeset 94d614e in mainline for kernel/arch/sparc64/src/mm

Timestamp:

2006-07-13T17:32:38Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a5f76758

Parents:

63cda71

Message:

Remove OpenFirmware calls from kernel/ entirely.

Switch the sparc64 port to use bootinfo.

Copy memcpy from boot/ to sparc64 kernel/ and
adjust it for memcpy_from/to_uspace.

Location:

kernel/arch/sparc64/src/mm

Files:

• frame.c (modified) (1 diff)
• memory_init.c (modified) (1 diff)

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

@@ -34 +34 @@
 
 #include <arch/mm/frame.h>
-#include <genarch/ofw/memory_init.h>
 #include <mm/frame.h>
+#include <arch/boot/boot.h>
 #include <config.h>
 #include <align.h>
 
+/** Create memory zones according to information stored in bootinfo.
+ *
+ * Walk the bootinfo memory map and create frame zones according to it.
+ * The first frame is not blacklisted here as it is done in generic
+ * frame_init().
+ */
 void frame_arch_init(void)
 {
-        ofw_init_zones();
+        int i;
+        pfn_t confdata;
 
-        /*
-         * Workaround to prevent slab allocator from allocating frame 0.
-         * Frame 0 is
-         * a) not mapped by OFW
-         * b) would be confused with NULL error return code
-         */
-        frame_mark_unavailable(0, 1);
+        for (i = 0; i < bootinfo.memmap.count; i++) {
+
+                /*
+                 * The memmap is created by HelenOS boot loader.
+                 * It already contains no holes.
+                 */
+        
+                confdata = ADDR2PFN(bootinfo.memmap.zones[i].start);
+                if (confdata == 0)
+                        confdata = 2;
+                zone_create(ADDR2PFN(bootinfo.memmap.zones[i].start),
+                        SIZE2FRAMES(ALIGN_DOWN(bootinfo.memmap.zones[i].size, PAGE_SIZE)),
+                        confdata, 0);
+        }
+
 }
 

kernel/arch/sparc64/src/mm/memory_init.c

@@ -34 +34 @@
 
 #include <arch/mm/memory_init.h>
-#include <genarch/ofw/memory_init.h>
+#include <arch/boot/boot.h>
 #include <typedefs.h>
 
+/** Return total size of available memory in bytes.
+ *
+ * @return Size of available memory in bytes.
+ */
 size_t get_memory_size(void)
 {
-        return ofw_get_memory_size();
+        return bootinfo.memmap.total;
 }
 
 /** @}
  */
-