Changeset fb7e5a9a in mainline for uspace/srv/devman/main.c

Timestamp:

2011-09-06T20:03:31Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

038b289, f7d6b30

Parents:

7a46bfe (diff), 7e9fce6 (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:

• uspace/srv/devman/main.c (modified) (7 diffs)

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);
@@ -507 +512 @@
         fun_node_t *fun;
         int rc;
-
-        printf("devman_drv_fun_online()\n");
+        
+        log_msg(LVL_DEBUG, "devman_drv_fun_online()");
+        
         fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall));
         if (fun == NULL) {
@@ -526 +532 @@
         rc = online_function(fun);
         if (rc != EOK) {
-                printf("devman_drv_fun_online() online_fun->ERROR\n");
                 fun_del_ref(fun);
                 async_answer_0(iid, (sysarg_t) rc);
@@ -533 +538 @@
         
         fun_del_ref(fun);
-        printf("devman_drv_fun_online() online_fun->OK\n");
         
         async_answer_0(iid, (sysarg_t) EOK);
@@ -580 +584 @@
         int rc;
         
-        
         fun_node_t *fun = find_fun_node(&device_tree, fun_handle);
         if (fun == NULL) {
@@ -599 +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 {