Changeset 1a5b252 in mainline for uspace/srv/devman/devman.c

Timestamp:

2011-08-21T11:54:15Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8cc4ddb

Parents:

e64df9a

Message:

DDF support for function offlining and onlining. This allows
(anticipated) hot removal — support needs to be added in individual
drivers, currently there is support in test1 and partially in rootvirt.
Surprise removal is not supported. TODO: synchronization.

File:

• uspace/srv/devman/devman.c (modified) (5 diffs)

uspace/srv/devman/devman.c

@@ -483 +483 @@
 }
 
+/** Detach driver from device.
+ *
+ * @param node          The device's node in the device tree.
+ * @param drv           The driver.
+ */
+void detach_driver(dev_node_t *dev)
+{
+        /* XXX need lock on dev */
+        driver_t *drv = dev->drv;
+        
+        assert(drv != NULL);
+        log_msg(LVL_DEBUG, "detach_driver(dev=\"%s\",drv=\"%s\")",
+            dev->pfun->pathname, drv->name);
+        
+        fibril_mutex_lock(&drv->driver_mutex);
+        
+        dev->drv = NULL;
+        list_remove(&dev->driver_devices);
+        
+        fibril_mutex_unlock(&drv->driver_mutex);
+}
+
 /** Start a driver
  *
@@ -726 +748 @@
         
         ipc_call_t answer;
-        aid_t req = async_send_2(exch, DRIVER_ADD_DEVICE, dev->handle,
+        aid_t req = async_send_2(exch, DRIVER_DEV_ADD, dev->handle,
             parent_handle, &answer);
         
@@ -800 +822 @@
 }
 
+int driver_dev_remove(dev_node_t *dev)
+{
+        async_exch_t *exch;
+        sysarg_t retval;
+        driver_t *drv;
+        
+        assert(dev != NULL);
+        log_msg(LVL_DEBUG, "driver_dev_remove(%p)", dev);
+        drv = dev->drv;
+        
+        exch = async_exchange_begin(drv->sess);
+        retval = async_req_1_0(exch, DRIVER_DEV_REMOVE, dev->handle);
+        async_exchange_end(exch);
+        
+        return retval;
+
+}
+
+int driver_fun_online(fun_node_t *fun)
+{
+        async_exch_t *exch;
+        sysarg_t retval;
+        driver_t *drv;
+        
+        log_msg(LVL_DEBUG, "driver_fun_online(%p)", fun);
+        if (fun->dev == NULL) {
+                /* XXX root function? */
+                return EINVAL;
+        }
+        
+        drv = fun->dev->drv;
+        
+        exch = async_exchange_begin(drv->sess);
+        retval = async_req_1_0(exch, DRIVER_FUN_ONLINE, fun->handle);
+        loc_exchange_end(exch);
+        
+        return retval;
+}
+
+int driver_fun_offline(fun_node_t *fun)
+{
+        async_exch_t *exch;
+        sysarg_t retval;
+        driver_t *drv;
+        
+        log_msg(LVL_DEBUG, "driver_fun_offline(%p)", fun);
+        if (fun->dev == NULL) {
+                /* XXX root function? */
+                return EINVAL;
+        }
+        
+        drv = fun->dev->drv;
+        
+        exch = async_exchange_begin(drv->sess);
+        retval = async_req_1_0(exch, DRIVER_FUN_OFFLINE, fun->handle);
+        loc_exchange_end(exch);
+        
+        return retval;
+
+}
+
 /** Initialize the device tree.
  *
@@ -1065 +1148 @@
 }
 
+/** Remove device from device tree.
+ *
+ * @param tree          Device tree
+ * @param dev           Device node
+ */
+void remove_dev_node(dev_tree_t *tree, dev_node_t *dev)
+{
+        assert(tree != NULL);
+        assert(dev != NULL);
+        assert(fibril_rwlock_is_write_locked(&tree->rwlock));
+        
+        log_msg(LVL_DEBUG, "remove_dev_node(dev=%p)", dev);
+        
+        /* Remove node from the handle-to-node map. */
+        unsigned long key = dev->handle;
+        hash_table_remove(&tree->devman_devices, &key, 1);
+        
+        /* Unlink from parent function. */
+        dev->pfun->child = NULL;
+        dev->pfun = NULL;
+}
+
+
 /** Insert new function into device tree.
  *
@@ -1127 +1233 @@
         if (fun->dev != NULL)
                 list_remove(&fun->dev_functions);
+        
+        fun->dev = NULL;
 }