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

File:

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

kernel/generic/src/ddi/ddi.c

@@ -314 +314 @@
 
 NO_TRACE static int dmamem_map(uintptr_t virt, size_t size, unsigned int map_flags,
-    unsigned int flags, uintptr_t *phys)
+    unsigned int flags, void **phys)
 {
         ASSERT(TASK);
@@ -322 +322 @@
 }
 
-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)
+NO_TRACE static int dmamem_map_anonymous(size_t size, unsigned int map_flags,
+    unsigned int flags, void **phys, uintptr_t *virt, uintptr_t bound)
 {
         ASSERT(TASK);
         
-        size_t frames = SIZE2FRAMES(size);
-        *phys = frame_alloc_noreserve(frames, 0, constraint);
-        if (*phys == 0)
+        size_t pages = SIZE2FRAMES(size);
+        uint8_t order;
+        
+        /* We need the 2^order >= pages */
+        if (pages == 1)
+                order = 0;
+        else
+                order = fnzb(pages - 1) + 1;
+        
+        *phys = frame_alloc_noreserve(order, FRAME_DMA);
+        if (*phys == NULL)
                 return ENOMEM;
         
         mem_backend_data_t backend_data;
-        backend_data.base = *phys;
-        backend_data.frames = frames;
+        backend_data.base = (uintptr_t) *phys;
+        backend_data.frames = pages;
         
         if (!as_area_create(TASK->as, map_flags, size,
             AS_AREA_ATTR_NONE, &phys_backend, &backend_data, virt, bound)) {
-                frame_free_noreserve(*phys, frames);
+                frame_free_noreserve((uintptr_t) *phys);
                 return ENOMEM;
         }
@@ -354 +361 @@
 NO_TRACE static int dmamem_unmap_anonymous(uintptr_t virt)
 {
-        // TODO: implement unlocking & unmap
-        return EOK;
+        // TODO: This is an ugly hack
+        as_t *as = TASK->as;
+
+        mutex_lock(&as->lock);
+        as_area_t *area = find_locked_area(as, virt);
+        if (!area) {
+                mutex_unlock(&as->lock);
+                return ENOENT;
+        }
+        frame_free_noreserve(area->backend_data.base);
+        area->backend_data.base = 0;
+        area->backend_data.frames = 0;
+        mutex_unlock(&area->lock);
+        mutex_unlock(&as->lock);
+
+        return as_area_destroy(as, virt);
 }
 
@@ -366 +387 @@
                  */
                 
-                uintptr_t phys;
+                void *phys;
                 int rc = dmamem_map((uintptr_t) virt_ptr, size, map_flags,
                     flags, &phys);
@@ -383 +404 @@
                  */
                 
-                uintptr_t constraint;
-                int rc = copy_from_uspace(&constraint, phys_ptr,
-                    sizeof(constraint));
-                if (rc != EOK)
-                        return rc;
-                
-                uintptr_t phys;
+                void *phys;
                 uintptr_t virt = (uintptr_t) -1;
-                rc = dmamem_map_anonymous(size, constraint, map_flags, flags,
+                int rc = dmamem_map_anonymous(size, map_flags, flags,
                     &phys, &virt, bound);
                 if (rc != EOK)