Changeset 040068c in mainline for uspace/srv/devman/devman.c

Timestamp:

2010-12-09T00:28:58Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

cdc1aa1

Parents:

818dc00 (diff), 0a5a950 (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 + minor changes

The marge with mainline includes the hands-off configure and merge with
our DDF fixes.

The virtual USB host controller is now under the virtual devices hierarchy
(the path is /virt/usbhc now).

File:

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

uspace/srv/devman/devman.c

@@ -516 +516 @@
 /** Notify driver about the devices to which it was assigned.
  *
- * The driver's mutex must be locked.
- *
  * @param driver        The driver to which the devices are passed.
  */
@@ -526 +524 @@
         int phone;
 
-        printf(NAME ": pass_devices_to_driver\n");
-
-        phone = ipc_connect_me_to(driver->phone, DRIVER_DEVMAN, 0, 0);
-        if (phone > 0) {
-                
+        printf(NAME ": pass_devices_to_driver(`%s')\n", driver->name);
+
+        fibril_mutex_lock(&driver->driver_mutex);
+
+        phone = async_connect_me_to(driver->phone, DRIVER_DEVMAN, 0, 0);
+
+        if (phone < 0) {
+                fibril_mutex_unlock(&driver->driver_mutex);
+                return;
+        }
+
+        /*
+         * Go through devices list as long as there is some device
+         * that has not been passed to the driver.
+         */
+        link = driver->devices.next;
+        while (link != &driver->devices) {
+                dev = list_get_instance(link, node_t, driver_devices);
+                if (dev->passed_to_driver) {
+                        link = link->next;
+                        continue;
+                }
+
+                /*
+                 * We remove the device from the list to allow safe adding
+                 * of new devices (no one will touch our item this way).
+                 */
+                list_remove(link);
+
+                /*
+                 * Unlock to avoid deadlock when adding device
+                 * handled by itself.
+                 */
+                fibril_mutex_unlock(&driver->driver_mutex);
+
+                add_device(phone, driver, dev, tree);
+
+                /*
+                 * Lock again as we will work with driver's
+                 * structure.
+                 */
+                fibril_mutex_lock(&driver->driver_mutex);
+
+                /*
+                 * Insert the device back.
+                 * The order is not relevant here so no harm is done
+                 * (actually, the order would be preserved in most cases).
+                 */
+                list_append(link, &driver->devices);
+
+                /*
+                 * Restart the cycle to go through all devices again.
+                 */
                 link = driver->devices.next;
-                while (link != &driver->devices) {
-                        dev = list_get_instance(link, node_t, driver_devices);
-                        add_device(phone, driver, dev, tree);
-                        link = link->next;
-                }
-                
-                ipc_hangup(phone);
-        }
+        }
+
+        ipc_hangup(phone);
+
+        /*
+         * Once we passed all devices to the driver, we need to mark the
+         * driver as running.
+         * It is vital to do it here and inside critical section.
+         *
+         * If we would change the state earlier, other devices added to
+         * the driver would be added to the device list and started
+         * immediately and possibly started here as well.
+         */
+        printf(NAME ": driver %s goes into running state.\n", driver->name);
+        driver->state = DRIVER_RUNNING;
+
+        fibril_mutex_unlock(&driver->driver_mutex);
 }
 
@@ -553 +608 @@
 void initialize_running_driver(driver_t *driver, dev_tree_t *tree)
 {
-        printf(NAME ": initialize_running_driver\n");
-        fibril_mutex_lock(&driver->driver_mutex);
+        printf(NAME ": initialize_running_driver (`%s')\n", driver->name);
         
         /*
@@ -561 +615 @@
          */
         pass_devices_to_driver(driver, tree);
-        
-        /* Change driver's state to running. */
-        driver->state = DRIVER_RUNNING;
-        
-        fibril_mutex_unlock(&driver->driver_mutex);
 }
 
@@ -637 +686 @@
 }
 
+static FIBRIL_MUTEX_INITIALIZE(add_device_guard);
 
 /** Pass a device to running driver.
@@ -645 +695 @@
 void add_device(int phone, driver_t *drv, node_t *node, dev_tree_t *tree)
 {
-        printf(NAME ": add_device\n");
+        fibril_mutex_lock(&add_device_guard);
+
+        /*
+         * We do not expect to have driver's mutex locked as we do not
+         * access any structures that would affect driver_t.
+         */
+        printf(NAME ": add_device (driver `%s', device `%s')\n", drv->name,
+            node->name);
         
         ipcarg_t rc;
@@ -657 +714 @@
                 parent_handle = 0;
         }
+
         aid_t req = async_send_2(phone, DRIVER_ADD_DEVICE, node->handle,
             parent_handle, &answer);
@@ -666 +724 @@
                 /* TODO handle error */
         }
-        
+
         /* Wait for answer from the driver. */
         async_wait_for(req, &rc);
+
+        fibril_mutex_unlock(&add_device_guard);
+
         switch(rc) {
         case EOK:
@@ -681 +742 @@
         }
         
+        node->passed_to_driver = true;
+
         return;
 }
@@ -706 +769 @@
         attach_driver(node, drv);
         
+        fibril_mutex_lock(&drv->driver_mutex);
         if (drv->state == DRIVER_NOT_STARTED) {
                 /* Start the driver. */
                 start_driver(drv);
         }
-        
-        if (drv->state == DRIVER_RUNNING) {
+        bool is_running = drv->state == DRIVER_RUNNING;
+        fibril_mutex_unlock(&drv->driver_mutex);
+
+        if (is_running) {
                 /* Notify the driver about the new device. */
-                int phone = ipc_connect_me_to(drv->phone, DRIVER_DEVMAN, 0, 0);
+                int phone = async_connect_me_to(drv->phone, DRIVER_DEVMAN, 0, 0);
                 if (phone > 0) {
                         add_device(phone, drv, node, tree);
@@ -875 +941 @@
         node->name = dev_name;
         if (!set_dev_path(node, parent)) {
-                fibril_rwlock_write_unlock(&tree->rwlock);
                 return false;
         }
@@ -1097 +1162 @@
         while (link != &class_list->classes) {
                 cl = list_get_instance(link, dev_class_t, link);
-                if (str_cmp(cl->name, class_name) == 0)
+                if (str_cmp(cl->name, class_name) == 0) {
                         return cl;
+                }
+                link = link->next;
         }