Changeset 4d0f97d in mainline for kernel/arch/arm32/src/mm

Timestamp:

2010-07-16T14:23:41Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e2650d3

Parents:

aa0d227 (diff), 24697c3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jsvoboda/helenos/gta02. This adds support for the GTA02 platform. Fixes ticket #134.

Location:

kernel/arch/arm32/src/mm

Files:

• frame.c (modified) (2 diffs)
• page.c (modified) (2 diffs)

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

@@ -38 +38 @@
 #include <arch/machine_func.h>
 #include <config.h>
+#include <align.h>
 
 /** Address of the last frame in the memory. */
@@ -45 +46 @@
 void frame_arch_init(void)
 {
-        last_frame = machine_get_memory_size();
+        uintptr_t mem_start, mem_size;
+        uintptr_t first_frame;
+        uintptr_t num_frames;
+
+        machine_get_memory_extents(&mem_start, &mem_size);
+        first_frame = ALIGN_UP(mem_start, FRAME_SIZE);
+        last_frame = ALIGN_DOWN(mem_start + mem_size, FRAME_SIZE);
+        num_frames = (last_frame - first_frame) >> FRAME_WIDTH;
         
         /* All memory as one zone */
-        zone_create(0, ADDR2PFN(last_frame),
+        zone_create(first_frame >> FRAME_WIDTH, num_frames,
             BOOT_PAGE_TABLE_START_FRAME + BOOT_PAGE_TABLE_SIZE_IN_FRAMES, 0);
         

kernel/arch/arm32/src/mm/page.c

@@ -58 +58 @@
         uintptr_t cur;
         /* Kernel identity mapping */
-        for (cur = 0; cur < last_frame; cur += FRAME_SIZE)
+        for (cur = PHYSMEM_START_ADDR; cur < last_frame; cur += FRAME_SIZE)
                 page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
         
@@ -68 +68 @@
 #error "Only high exception vector supported now"
 #endif
+        cur = ALIGN_DOWN(0x50008010, FRAME_SIZE);
+        page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
 
         page_table_unlock(AS_KERNEL, true);