Changeset 15d0046 in mainline for kernel/generic/src/ddi/ddi.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

kernel/generic/src/ddi/ddi.c

@@ -211 +211 @@
 NO_TRACE static int physmem_unmap(uintptr_t virt)
 {
-        // TODO: implement unmap
-        return EOK;
+        ASSERT(TASK);
+
+        return as_area_destroy(TASK->as, virt);
 }
 
@@ -229 +230 @@
     void *virt_ptr, uintptr_t bound)
 {
-        uintptr_t virt = (uintptr_t) -1;
-        int rc = physmem_map(ALIGN_DOWN(phys, FRAME_SIZE), pages, flags,
-            &virt, 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);
         if (rc != EOK)
                 return rc;
@@ -251 +256 @@
 /** 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
@@ -286 +291 @@
         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;
@@ -310 +356 @@
 sysarg_t sys_iospace_disable(ddi_ioarg_t *uspace_io_arg)
 {
-        // TODO: implement
-        return ENOTSUP;
+        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);
 }
 
@@ -390 +441 @@
                         return rc;
                 
+                uintptr_t virt;
+                rc = copy_from_uspace(&virt, virt_ptr, sizeof(virt));
+                if (rc != EOK)
+                        return rc;
+                
                 uintptr_t phys;
-                uintptr_t virt = (uintptr_t) -1;
                 rc = dmamem_map_anonymous(size, constraint, map_flags, flags,
                     &phys, &virt, bound);