Changeset 80a96d2 in mainline for uspace/srv/devman

Timestamp:

2011-09-05T21:26:47Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b33870b

Parents:

16cc9a6

Message:

DDF support for surprise removal.

Location:

uspace/srv/devman

Files:

• devman.c (modified) (1 diff)
• devman.h (modified) (1 diff)
• main.c (modified) (4 diffs)

uspace/srv/devman/devman.c

@@ -878 +878 @@
         
         return retval;
-
+}
+
+int driver_dev_gone(dev_tree_t *tree, dev_node_t *dev)
+{
+        async_exch_t *exch;
+        sysarg_t retval;
+        driver_t *drv;
+        devman_handle_t handle;
+        
+        assert(dev != NULL);
+        
+        log_msg(LVL_DEBUG, "driver_dev_gone(%p)", dev);
+        
+        fibril_rwlock_read_lock(&tree->rwlock);
+        drv = dev->drv;
+        handle = dev->handle;
+        fibril_rwlock_read_unlock(&tree->rwlock);
+        
+        exch = async_exchange_begin(drv->sess);
+        retval = async_req_1_0(exch, DRIVER_DEV_GONE, handle);
+        async_exchange_end(exch);
+        
+        return retval;
 }
 

uspace/srv/devman/devman.h

@@ -263 +263 @@
 extern bool start_driver(driver_t *);
 extern int driver_dev_remove(dev_tree_t *, dev_node_t *);
+extern int driver_dev_gone(dev_tree_t *, dev_node_t *);
 extern int driver_fun_online(dev_tree_t *, fun_node_t *);
 extern int driver_fun_offline(dev_tree_t *, fun_node_t *);

uspace/srv/devman/main.c

@@ -316 +316 @@
                 if (fun->child != NULL) {
                         dev_node_t *dev = fun->child;
+                        device_state_t dev_state;
                         
                         dev_add_ref(dev);
+                        dev_state = dev->state;
+                        
                         fibril_rwlock_write_unlock(&device_tree.rwlock);
-                        
+
                         /* If device is owned by driver, ask driver to give it up. */
-                        if (dev->state == DEVICE_USABLE) {
+                        if (dev_state == DEVICE_USABLE) {
                                 rc = driver_dev_remove(&device_tree, dev);
                                 if (rc != EOK) {
@@ -333 +336 @@
                         if (!list_empty(&dev->functions)) {
                                 fibril_rwlock_read_unlock(&device_tree.rwlock);
+                                dev_del_ref(dev);
                                 return EIO;
                         }
+                        
                         driver_t *driver = dev->drv;
                         fibril_rwlock_read_unlock(&device_tree.rwlock);
@@ -579 +584 @@
         int rc;
         
-        
         fun_node_t *fun = find_fun_node(&device_tree, fun_handle);
         if (fun == NULL) {
@@ -598 +602 @@
         
         if (fun->ftype == fun_inner) {
-                /* Handle possible descendants */
-                /* TODO - This is a surprise removal */
+                /* This is a surprise removal. Handle possible descendants */
                 if (fun->child != NULL) {
-                        log_msg(LVL_WARN, "devman_remove_function(): not handling "
-                            "descendants\n");
+                        dev_node_t *dev = fun->child;
+                        device_state_t dev_state;
+                        int gone_rc;
+                        
+                        dev_add_ref(dev);
+                        dev_state = dev->state;
+                        
+                        fibril_rwlock_write_unlock(&device_tree.rwlock);
+                        
+                        /* If device is owned by driver, inform driver it is gone. */
+                        if (dev_state == DEVICE_USABLE)
+                                gone_rc = driver_dev_gone(&device_tree, dev);
+                        else
+                                gone_rc = EOK;
+                        
+                        fibril_rwlock_read_lock(&device_tree.rwlock);
+                        
+                        /* Verify that driver succeeded and removed all functions */
+                        if (gone_rc != EOK || !list_empty(&dev->functions)) {
+                                log_msg(LVL_ERROR, "Driver did not remove "
+                                    "functions for device that is gone. "
+                                    "Device node is now defunct.");
+                                
+                                /*
+                                 * Not much we can do but mark the device
+                                 * node as having invalid state. This
+                                 * is a driver bug.
+                                 */
+                                dev->state = DEVICE_INVALID;
+                                fibril_rwlock_read_unlock(&device_tree.rwlock);
+                                dev_del_ref(dev);
+                                return;
+                        }
+                        
+                        driver_t *driver = dev->drv;
+                        fibril_rwlock_read_unlock(&device_tree.rwlock);
+                        
+                        if (driver)
+                                detach_driver(&device_tree, dev);
+                        
+                        fibril_rwlock_write_lock(&device_tree.rwlock);
+                        remove_dev_node(&device_tree, dev);
+                        
+                        /* Delete ref created when node was inserted */
+                        dev_del_ref(dev);
+                        /* Delete ref created by dev_add_ref(dev) above */
+                        dev_del_ref(dev);
                 }
         } else {