Changeset b0c2075 in mainline for kernel/arch/arm32

Timestamp:

2013-09-10T17:48:57Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

85147f3

Parents:

86733f3

Message:

new physical memory allocator supporting physical address constrains
the buddy allocator framework is retired and replaced by a two-level bitmap
the allocator can allocate an arbitrary number of frames, not only a power-of-two count

Caution: Change of semantics
The physical memory allocator no longer allocates naturally aligned blocks. If you require an aligned block, specify it as the constraint.

Location:

kernel/arch/arm32

Files:

• include/arch/mm/page.h (modified) (1 diff)
• src/mm/page.c (modified) (1 diff)
• src/ras.c (modified) (1 diff)

kernel/arch/arm32/include/arch/mm/page.h

@@ -73 +73 @@
 
 /* Page table sizes for each level. */
-#define PTL0_SIZE_ARCH          FOUR_FRAMES
-#define PTL1_SIZE_ARCH          0
-#define PTL2_SIZE_ARCH          0
-#define PTL3_SIZE_ARCH          ONE_FRAME
+#define PTL0_FRAMES_ARCH  4
+#define PTL1_FRAMES_ARCH  1
+#define PTL2_FRAMES_ARCH  1
+#define PTL3_FRAMES_ARCH  1
 
 /* Macros calculating indices into page tables for each level. */

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

@@ -69 +69 @@
 #ifdef HIGH_EXCEPTION_VECTORS
         /* Create mapping for exception table at high offset */
-        uintptr_t ev_frame = frame_alloc(ONE_FRAME, FRAME_NONE, 0);
+        uintptr_t ev_frame = frame_alloc(1, FRAME_NONE, 0);
         page_mapping_insert(AS_KERNEL, EXC_BASE_ADDRESS, ev_frame, flags);
 #else

kernel/arch/arm32/src/ras.c

@@ -51 +51 @@
 void ras_init(void)
 {
-        uintptr_t frame = frame_alloc(ONE_FRAME,
-            FRAME_ATOMIC | FRAME_HIGHMEM, 0);
+        uintptr_t frame =
+            frame_alloc(1, FRAME_ATOMIC | FRAME_HIGHMEM, 0);
         if (!frame)
-                frame = frame_alloc(ONE_FRAME, FRAME_LOWMEM, 0);
+                frame = frame_alloc(1, FRAME_LOWMEM, 0);
         
         ras_page = (uintptr_t *) km_map(frame,