Changeset 8cbf1c3 in mainline for kernel/generic/src/mm

Timestamp:

2013-09-09T23:13:10Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e2a0d76

Parents:

c67dbd6

Message:

prepare the public API of the frame allocator for the new backend
remove FRAME_KA (can be easily implemented explicitly)

Location:

kernel/generic/src/mm

Files:

• frame.c (modified) (4 diffs)
• km.c (modified) (2 diffs)
• page.c (modified) (3 diffs)
• slab.c (modified) (1 diff)

kernel/generic/src/mm/frame.c

@@ -873 +873 @@
 
         return ADDR2PFN((uintptr_t) frame_alloc(order - FRAME_WIDTH,
-            FRAME_LOWMEM | FRAME_ATOMIC));
+            FRAME_LOWMEM | FRAME_ATOMIC, 0));
 }
 
@@ -1024 +1024 @@
  *
  */
-void *frame_alloc_generic(uint8_t order, frame_flags_t flags, size_t *pzone)
+uintptr_t frame_alloc_generic(uint8_t order, frame_flags_t flags,
+    uintptr_t constraint, size_t *pzone)
 {
         size_t size = ((size_t) 1) << order;
@@ -1071 +1072 @@
                         if (!(flags & FRAME_NO_RESERVE))
                                 reserve_free(size);
-                        return NULL;
+                        return 0;
                 }
                 
@@ -1126 +1127 @@
                 *pzone = znum;
         
-        if (flags & FRAME_KA)
-                return (void *) PA2KA(PFN2ADDR(pfn));
-        
-        return (void *) PFN2ADDR(pfn);
-}
-
-void *frame_alloc(uint8_t order, frame_flags_t flags)
-{
-        return frame_alloc_generic(order, flags, NULL);
-}
-
-void *frame_alloc_noreserve(uint8_t order, frame_flags_t flags)
-{
-        return frame_alloc_generic(order, flags | FRAME_NO_RESERVE, NULL);
+        return PFN2ADDR(pfn);
+}
+
+uintptr_t frame_alloc(uint8_t order, frame_flags_t flags, uintptr_t constraint)
+{
+        return frame_alloc_generic(order, flags, constraint, NULL);
+}
+
+uintptr_t frame_alloc_noreserve(uint8_t order, frame_flags_t flags,
+    uintptr_t constraint)
+{
+        return frame_alloc_generic(order, flags | FRAME_NO_RESERVE, constraint,
+            NULL);
 }
 

kernel/generic/src/mm/km.c

@@ -249 +249 @@
          * Allocate a frame, preferably from high memory.
          */
-        frame = (uintptr_t) frame_alloc(ONE_FRAME,
-            FRAME_HIGHMEM | FRAME_ATOMIC | flags); 
+        frame = frame_alloc(ONE_FRAME,
+            FRAME_HIGHMEM | FRAME_ATOMIC | flags, 0); 
         if (frame) {
                 page = km_map(frame, PAGE_SIZE,
@@ -256 +256 @@
                 ASSERT(page);   // FIXME
         } else {
-                frame = (uintptr_t) frame_alloc(ONE_FRAME,
-                    FRAME_LOWMEM | flags);
+                frame = frame_alloc(ONE_FRAME, FRAME_LOWMEM | flags, 0);
                 if (!frame)
                         return (uintptr_t) NULL;

kernel/generic/src/mm/page.c

@@ -169 +169 @@
 }
 
-int page_find_mapping(uintptr_t virt, void **phys)
+int page_find_mapping(uintptr_t virt, uintptr_t *phys)
 {
         page_table_lock(AS, true);
@@ -179 +179 @@
         }
         
-        *phys = (void *) PTE_GET_FRAME(pte) +
+        *phys = PTE_GET_FRAME(pte) +
             (virt - ALIGN_DOWN(virt, PAGE_SIZE));
         
@@ -193 +193 @@
  *
  */
-sysarg_t sys_page_find_mapping(uintptr_t virt, void *phys_ptr)
-{
-        void *phys;
+sysarg_t sys_page_find_mapping(uintptr_t virt, uintptr_t *phys_ptr)
+{
+        uintptr_t phys;
         int rc = page_find_mapping(virt, &phys);
         if (rc != EOK)

kernel/generic/src/mm/slab.c

@@ -182 +182 @@
         size_t zone = 0;
         
-        void *data = frame_alloc_generic(cache->order, FRAME_KA | flags, &zone);
+        void *data = (void *)
+            PA2KA(frame_alloc_generic(cache->order, flags, 0, &zone));
         if (!data) {
                 return NULL;