Changeset b7068da in mainline for kernel/arch/arm32/src/mm/frame.c

Timestamp:

2012-02-09T20:35:12Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (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 mainline changes

File:

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

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

@@ -39 +39 @@
 #include <config.h>
 #include <align.h>
+#include <macros.h>
 
-/** Address of the last frame in the memory. */
-uintptr_t last_frame = 0;
+static void frame_common_arch_init(bool low)
+{
+        uintptr_t base;
+        size_t size;
 
-/** Creates memory zones. */
-void frame_arch_init(void)
+        machine_get_memory_extents(&base, &size);
+        base = ALIGN_UP(base, FRAME_SIZE);
+        size = ALIGN_DOWN(size, FRAME_SIZE);
+        
+        if (!frame_adjust_zone_bounds(low, &base, &size))
+                return;
+
+        if (low) {
+                zone_create(ADDR2PFN(base), SIZE2FRAMES(size),
+                    BOOT_PAGE_TABLE_START_FRAME +
+                    BOOT_PAGE_TABLE_SIZE_IN_FRAMES,
+                    ZONE_AVAILABLE | ZONE_LOWMEM);
+        } else {
+                pfn_t conf = zone_external_conf_alloc(SIZE2FRAMES(size));
+                if (conf != 0)
+                        zone_create(ADDR2PFN(base), SIZE2FRAMES(size), conf,
+                            ZONE_AVAILABLE | ZONE_HIGHMEM);
+        }
+        
+}
+
+/** Create low memory zones. */
+void frame_low_arch_init(void)
 {
-        uintptr_t mem_start, mem_size;
-        uintptr_t first_frame;
-        uintptr_t num_frames;
+        frame_common_arch_init(true);
 
-        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(first_frame >> FRAME_WIDTH, num_frames,
-            BOOT_PAGE_TABLE_START_FRAME + BOOT_PAGE_TABLE_SIZE_IN_FRAMES, 0);
-        
         /* blacklist boot page table */
         frame_mark_unavailable(BOOT_PAGE_TABLE_START_FRAME,
@@ -64 +77 @@
 
         machine_frame_init();
+}
+
+/** Create high memory zones. */
+void frame_high_arch_init(void)
+{
+        frame_common_arch_init(false);
 }