Changeset c6f1908e in mainline

Timestamp:

2011-11-15T00:08:46Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

19c8030

Parents:

8bdcffa

Message:

Add arm32 versions of frame_low/high_arch_init().

File:

• kernel/arch/arm32/src/mm/frame.c (modified) (2 diffs)

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

@@ -41 +41 @@
 #include <macros.h>
 
+// TODO: remove me
 /** Address of the last frame in the memory. */
 uintptr_t last_frame = 0;
 
-/** Creates memory zones. */
+/** Create low memory zones. */
 void frame_low_arch_init(void)
 {
-        uintptr_t mem_start, mem_size;
-        uintptr_t first_frame;
-        uintptr_t num_frames;
+        uintptr_t mem_start, mem_end, mem_size;
 
         machine_get_memory_extents(&mem_start, &mem_size);
-        first_frame = ALIGN_UP(mem_start, FRAME_SIZE);
+        // TODO: remove me
         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(first_frame >> FRAME_WIDTH, num_frames,
-            BOOT_PAGE_TABLE_START_FRAME + BOOT_PAGE_TABLE_SIZE_IN_FRAMES, 0);
+        mem_start = ALIGN_UP(mem_start, FRAME_SIZE);
+        mem_end = min(ALIGN_DOWN(mem_start + mem_size, FRAME_SIZE),
+            config.identity_size);
+
+        zone_create(ADDR2PFN(mem_start), SIZE2FRAMES(mem_end - mem_start),
+            BOOT_PAGE_TABLE_START_FRAME + BOOT_PAGE_TABLE_SIZE_IN_FRAMES,
+            ZONE_AVAILABLE | ZONE_LOWMEM);
         
         /* blacklist boot page table */
@@ -67 +69 @@
 }
 
+/** Create high memory zones. */
 void frame_high_arch_init(void)
 {
+        uintptr_t mem_start, mem_end, mem_size;
+        size_t frames;
+        uintptr_t conf;
+
+        machine_get_memory_extents(&mem_start, &mem_size);
+
+        mem_end = ALIGN_DOWN(mem_start + mem_size, FRAME_SIZE);
+        if (mem_end <= config.identity_size) {
+                /* There is no high memory to init. */
+                return;
+        }
+
+        frames = SIZE2FRAMES(mem_end - config.identity_size);
+        conf = zone_external_conf_alloc(frames);
+
+        zone_create(ADDR2PFN(config.identity_size), frames, conf,
+            ZONE_AVAILABLE);
 }