Changeset 81685dd9 in mainline for uspace/srv/devman

Timestamp:

2017-10-20T07:18:57Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

feab36ae

Parents:

04efacc

Message:

Add devctl unload-drv subcommand to manually unload a driver that is not in use.

Location:

uspace/srv/devman

Files:

• client_conn.c (modified) (2 diffs)
• driver.c (modified) (1 diff)
• driver.h (modified) (1 diff)

uspace/srv/devman/client_conn.c

@@ -726 +726 @@
 }
 
+/** Unload a driver by user request. */
+static void devman_driver_unload(ipc_callid_t iid, ipc_call_t *icall)
+{
+        driver_t *drv;
+        int rc;
+        
+        drv = driver_find(&drivers_list, IPC_GET_ARG1(*icall));
+        if (drv == NULL) {
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        fibril_mutex_lock(&drv->driver_mutex);
+        rc = stop_driver(drv);
+        fibril_mutex_unlock(&drv->driver_mutex);
+
+        async_answer_0(iid, rc);
+}
+
 /** Function for handling connections from a client to the device manager. */
 void devman_connection_client(ipc_callid_t iid, ipc_call_t *icall, void *arg)
@@ -794 +813 @@
                         devman_driver_load(callid, &call);
                         break;
+                case DEVMAN_DRIVER_UNLOAD:
+                        devman_driver_unload(callid, &call);
+                        break;
                 default:
                         async_answer_0(callid, ENOENT);

uspace/srv/devman/driver.c

@@ -298 +298 @@
         drv->state = DRIVER_STARTING;
         return true;
+}
+
+/** Stop a driver
+ *
+ * @param drv           The driver's structure.
+ * @return              True if the driver's task is successfully spawned, false
+ *                      otherwise.
+ */
+int stop_driver(driver_t *drv)
+{
+        async_exch_t *exch;
+        sysarg_t retval;
+        
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "stop_driver(drv=\"%s\")", drv->name);
+
+        exch = async_exchange_begin(drv->sess);
+        retval = async_req_0_0(exch, DRIVER_STOP);
+        loc_exchange_end(exch);
+        
+        if (retval != EOK)
+                return retval;
+        
+        drv->state = DRIVER_NOT_STARTED;
+        async_hangup(drv->sess);
+        drv->sess = NULL;
+        return EOK;
 }
 

uspace/srv/devman/driver.h

@@ -50 +50 @@
 extern void detach_driver(dev_tree_t *, dev_node_t *);
 extern bool start_driver(driver_t *);
+extern int stop_driver(driver_t *);
 extern void add_device(driver_t *, dev_node_t *, dev_tree_t *);
 extern int driver_dev_remove(dev_tree_t *, dev_node_t *);