Changes in kernel/generic/src/ddi/ddi.c [8cd680c:9d58539] in mainline

File:

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

kernel/generic/src/ddi/ddi.c

@@ -121 +121 @@
         backend_data.base = phys;
         backend_data.frames = pages;
-        backend_data.anonymous = false;
         
         /*
@@ -211 +210 @@
 NO_TRACE static int physmem_unmap(uintptr_t virt)
 {
-        ASSERT(TASK);
-
-        return as_area_destroy(TASK->as, virt);
+        // TODO: implement unmap
+        return EOK;
 }
 
@@ -230 +228 @@
     void *virt_ptr, uintptr_t bound)
 {
-        uintptr_t virt;
-        int rc = copy_from_uspace(&virt, virt_ptr, sizeof(virt));
-        if (rc != EOK)
-                return rc;
-        
-        rc = physmem_map(ALIGN_DOWN(phys, FRAME_SIZE), pages, flags, &virt,
-            bound);
+        uintptr_t virt = (uintptr_t) -1;
+        int rc = physmem_map(ALIGN_DOWN(phys, FRAME_SIZE), pages, flags,
+            &virt, bound);
         if (rc != EOK)
                 return rc;
@@ -256 +250 @@
 /** Enable range of I/O space for task.
  *
- * @param id     Task ID of the destination task.
+ * @param id Task ID of the destination task.
  * @param ioaddr Starting I/O address.
- * @param size   Size of the enabled I/O space.
+ * @param size Size of the enabled I/O space..
  *
  * @return 0 on success, EPERM if the caller lacks capabilities to use this
@@ -291 +285 @@
         int rc = ddi_iospace_enable_arch(task, ioaddr, size);
         irq_spinlock_unlock(&task->lock, true);
-
-        return rc;
-}
-
-/** Disable range of I/O space for task.
- *
- * @param id     Task ID of the destination task.
- * @param ioaddr Starting I/O address.
- * @param size   Size of the enabled I/O space.
- *
- * @return 0 on success, EPERM if the caller lacks capabilities to use this
- *           syscall, ENOENT if there is no task matching the specified ID.
- *
- */
-NO_TRACE static int iospace_disable(task_id_t id, uintptr_t ioaddr, size_t size)
-{
-        /*
-         * Make sure the caller is authorised to make this syscall.
-         */
-        cap_t caps = cap_get(TASK);
-        if (!(caps & CAP_IO_MANAGER))
-                return EPERM;
-        
-        irq_spinlock_lock(&tasks_lock, true);
-        
-        task_t *task = task_find_by_id(id);
-        
-        if ((!task) || (!container_check(CONTAINER, task->container))) {
-                /*
-                 * There is no task with the specified ID
-                 * or the task belongs to a different security
-                 * context.
-                 */
-                irq_spinlock_unlock(&tasks_lock, true);
-                return ENOENT;
-        }
-        
-        /* Lock the task and release the lock protecting tasks_btree. */
-        irq_spinlock_exchange(&tasks_lock, &task->lock);
-        int rc = ddi_iospace_disable_arch(task, ioaddr, size);
-        irq_spinlock_unlock(&task->lock, true);
         
         return rc;
@@ -356 +309 @@
 sysarg_t sys_iospace_disable(ddi_ioarg_t *uspace_io_arg)
 {
-        ddi_ioarg_t arg;
-        int rc = copy_from_uspace(&arg, uspace_io_arg, sizeof(ddi_ioarg_t));
-        if (rc != 0)
-                return (sysarg_t) rc;
-
-        return (sysarg_t) iospace_disable((task_id_t) arg.task_id,
-            (uintptr_t) arg.ioaddr, (size_t) arg.size);
+        // TODO: implement
+        return ENOTSUP;
 }
 
 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);
@@ -374 +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(frames, FRAME_ATOMIC, 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, 0);
+        if (*phys == NULL)
                 return ENOMEM;
         
         mem_backend_data_t backend_data;
-        backend_data.base = *phys;
-        backend_data.frames = frames;
-        backend_data.anonymous = true;
+        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(*phys, frames);
+                frame_free_noreserve((uintptr_t) *phys);
                 return ENOMEM;
         }
@@ -407 +361 @@
 NO_TRACE static int dmamem_unmap_anonymous(uintptr_t virt)
 {
-        return as_area_destroy(TASK->as, virt);
+        // TODO: implement unlocking & unmap
+        return EOK;
 }
 
@@ -418 +373 @@
                  */
                 
-                uintptr_t phys;
+                void *phys;
                 int rc = dmamem_map((uintptr_t) virt_ptr, size, map_flags,
                     flags, &phys);
@@ -435 +390 @@
                  */
                 
-                uintptr_t constraint;
-                int rc = copy_from_uspace(&constraint, phys_ptr,
-                    sizeof(constraint));
-                if (rc != EOK)
-                        return rc;
-                
-                uintptr_t virt;
-                rc = copy_from_uspace(&virt, virt_ptr, sizeof(virt));
-                if (rc != EOK)
-                        return rc;
-                
-                uintptr_t phys;
-                rc = dmamem_map_anonymous(size, constraint, map_flags, flags,
+                void *phys;
+                uintptr_t virt = (uintptr_t) -1;
+                int rc = dmamem_map_anonymous(size, map_flags, flags,
                     &phys, &virt, bound);
                 if (rc != EOK)