Changeset dd143621 in mainline

Timestamp:

2011-05-28T15:09:21Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a066122c, b59ec8c

Parents:

af6136d

Message:

Fix seizure of default address in unplugged hub

This revision shall fix following scenario

• hub is attached to the host
• second hub has several devices connected to it bus is not connected to the host
• second hub is plugged to the first one
• device discovery takes place
• second hub is unplugged

Before this fix, the hub might fail to return the default address
because it might wait for ever for completion of port reset
(waiting for change on status pipe that would send no more data).

File:

• uspace/drv/usbhub/usbhub.c (modified) (1 diff)

uspace/drv/usbhub/usbhub.c

@@ -487 +487 @@
 
         fibril_mutex_lock(&hub->pending_ops_mutex);
+
+        /* The device is dead. However there might be some pending operations
+         * that we need to wait for.
+         * One of them is device adding in progress.
+         * The respective fibril is probably waiting for status change
+         * in port reset (port enable) callback.
+         * Such change would never come (otherwise we would not be here).
+         * Thus, we would flush all pending port resets.
+         */
+        if (hub->pending_ops_count > 0) {
+                fibril_mutex_lock(&hub->port_mutex);
+                size_t port;
+                for (port = 0; port < hub->port_count; port++) {
+                        usb_hub_port_t *the_port = hub->ports + port;
+                        fibril_mutex_lock(&the_port->reset_mutex);
+                        the_port->reset_completed = true;
+                        the_port->reset_okay = false;
+                        fibril_condvar_broadcast(&the_port->reset_cv);
+                        fibril_mutex_unlock(&the_port->reset_mutex);
+                }
+                fibril_mutex_unlock(&hub->port_mutex);
+        }
+        /* And now wait for them. */
         while (hub->pending_ops_count > 0) {
                 fibril_condvar_wait(&hub->pending_ops_cv,