Changes in kernel/arch/arm32/src/mm/frame.c [7852625:6250c37] in mainline

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>
 
-static void frame_common_arch_init(bool low)
+/** Address of the last frame in the memory. */
+uintptr_t last_frame = 0;
+
+/** Creates memory zones. */
+void frame_arch_init(void)
 {
-        uintptr_t base;
-        size_t size;
+        uintptr_t mem_start, mem_size;
+        uintptr_t first_frame;
+        uintptr_t num_frames;
 
-        machine_get_memory_extents(&base, &size);
-        base = ALIGN_UP(base, FRAME_SIZE);
-        size = ALIGN_DOWN(size, FRAME_SIZE);
+        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;
         
-        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);
-        }
+        /* 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);
         
-}
-
-/** Create low memory zones. */
-void frame_low_arch_init(void)
-{
-        frame_common_arch_init(true);
-
         /* blacklist boot page table */
         frame_mark_unavailable(BOOT_PAGE_TABLE_START_FRAME,
@@ -77 +64 @@
 
         machine_frame_init();
-}
-
-/** Create high memory zones. */
-void frame_high_arch_init(void)
-{
-        frame_common_arch_init(false);
 }