Changes in kernel/generic/src/ddi/ddi.c [ba2be23:5df1963] in mainline

File:

• kernel/generic/src/ddi/ddi.c (modified) (3 diffs)

kernel/generic/src/ddi/ddi.c

@@ -322 +322 @@
 }
 
-NO_TRACE static int dmamem_map_anonymous(size_t size, unsigned int map_flags,
-    unsigned int flags, uintptr_t *phys, uintptr_t *virt, uintptr_t bound)
+NO_TRACE static int dmamem_map_anonymous(size_t size, uintptr_t constraint,
+    unsigned int map_flags, unsigned int flags, uintptr_t *phys,
+    uintptr_t *virt, uintptr_t bound)
 {
         ASSERT(TASK);
         
         size_t frames = SIZE2FRAMES(size);
-        uint8_t order;
-        
-        /* We need the 2^order >= frames */
-        if (frames == 1)
-                order = 0;
-        else
-                order = fnzb(frames - 1) + 1;
-        
-        *phys = frame_alloc_noreserve(order, 0, 0);
+        *phys = frame_alloc_noreserve(frames, 0, constraint);
         if (*phys == 0)
                 return ENOMEM;
@@ -346 +339 @@
         if (!as_area_create(TASK->as, map_flags, size,
             AS_AREA_ATTR_NONE, &phys_backend, &backend_data, virt, bound)) {
-                frame_free_noreserve(*phys);
+                frame_free_noreserve(*phys, frames);
                 return ENOMEM;
         }
@@ -390 +383 @@
                  */
                 
+                uintptr_t constraint;
+                int rc = copy_from_uspace(&constraint, phys_ptr,
+                    sizeof(constraint));
+                if (rc != EOK)
+                        return rc;
+                
                 uintptr_t phys;
                 uintptr_t virt = (uintptr_t) -1;
-                int rc = dmamem_map_anonymous(size, map_flags, flags,
+                rc = dmamem_map_anonymous(size, constraint, map_flags, flags,
                     &phys, &virt, bound);
                 if (rc != EOK)