1 files changed, 51 insertions, 18 deletions

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 2f1c4b22ae1c..9dc72e53712f 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -358,7 +358,8 @@ static void usb_set_lpm_parameters(struct usb_device *udev)
 }
 
 /* USB 2.0 spec Section 11.24.4.5 */
-static int get_hub_descriptor(struct usb_device *hdev, void *data)
+static int get_hub_descriptor(struct usb_device *hdev,
+                struct usb_hub_descriptor *desc)
 {
         int i, ret, size;
         unsigned dtype;
@@ -374,10 +375,18 @@ static int get_hub_descriptor(struct usb_device *hdev, void *data)
         for (i = 0; i < 3; i++) {
                 ret = usb_control_msg(hdev, usb_rcvctrlpipe(hdev, 0),
                         USB_REQ_GET_DESCRIPTOR, USB_DIR_IN | USB_RT_HUB,
-                        dtype << 8, 0, data, size,
+                        dtype << 8, 0, desc, size,
                         USB_CTRL_GET_TIMEOUT);
-                if (ret >= (USB_DT_HUB_NONVAR_SIZE + 2))
+                if (hub_is_superspeed(hdev)) {
+                        if (ret == size)
+                                return ret;
+                } else if (ret >= USB_DT_HUB_NONVAR_SIZE + 2) {
+                        /* Make sure we have the DeviceRemovable field. */
+                        size = USB_DT_HUB_NONVAR_SIZE + desc->bNbrPorts / 8 + 1;
+                        if (ret < size)
+                                return -EMSGSIZE;
                         return ret;
+                }
         }
         return -EINVAL;
 }
@@ -1048,6 +1057,9 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
 
                 portstatus = portchange = 0;
                 status = hub_port_status(hub, port1, &portstatus, &portchange);
+                if (status)
+                        goto abort;
+
                 if (udev || (portstatus & USB_PORT_STAT_CONNECTION))
                         dev_dbg(&port_dev->dev, "status %04x change %04x\n",
                                         portstatus, portchange);
@@ -1180,7 +1192,7 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
 
         /* Scan all ports that need attention */
         kick_hub_wq(hub);
-
+ abort:
         if (type == HUB_INIT2 || type == HUB_INIT3) {
                 /* Allow autosuspend if it was suppressed */
  disconnected:
@@ -1292,7 +1304,7 @@ static int hub_configure(struct usb_hub *hub,
         }
         mutex_init(&hub->status_mutex);
 
-        hub->descriptor = kmalloc(sizeof(*hub->descriptor), GFP_KERNEL);
+        hub->descriptor = kzalloc(sizeof(*hub->descriptor), GFP_KERNEL);
         if (!hub->descriptor) {
                 ret = -ENOMEM;
                 goto fail;
@@ -1300,13 +1312,19 @@ static int hub_configure(struct usb_hub *hub,
 
         /* Request the entire hub descriptor.
          * hub->descriptor can handle USB_MAXCHILDREN ports,
-         * but the hub can/will return fewer bytes here.
+         * but a (non-SS) hub can/will return fewer bytes here.
          */
         ret = get_hub_descriptor(hdev, hub->descriptor);
         if (ret < 0) {
                 message = "can't read hub descriptor";
                 goto fail;
-        } else if (hub->descriptor->bNbrPorts > USB_MAXCHILDREN) {
+        }
+
+        maxchild = USB_MAXCHILDREN;
+        if (hub_is_superspeed(hdev))
+                maxchild = min_t(unsigned, maxchild, USB_SS_MAXPORTS);
+
+        if (hub->descriptor->bNbrPorts > maxchild) {
                 message = "hub has too many ports!";
                 ret = -ENODEV;
                 goto fail;
@@ -1980,7 +1998,7 @@ static void choose_devnum(struct usb_device *udev)
         struct usb_bus  *bus = udev->bus;
 
         /* be safe when more hub events are proceed in parallel */
-        mutex_lock(&bus->usb_address0_mutex);
+        mutex_lock(&bus->devnum_next_mutex);
         if (udev->wusb) {
                 devnum = udev->portnum + 1;
                 BUG_ON(test_bit(devnum, bus->devmap.devicemap));
@@ -1998,7 +2016,7 @@ static void choose_devnum(struct usb_device *udev)
                 set_bit(devnum, bus->devmap.devicemap);
                 udev->devnum = devnum;
         }
-        mutex_unlock(&bus->usb_address0_mutex);
+        mutex_unlock(&bus->devnum_next_mutex);
 }
 
 static void release_devnum(struct usb_device *udev)
@@ -2068,6 +2086,12 @@ void usb_disconnect(struct usb_device **pdev)
         dev_info(&udev->dev, "USB disconnect, device number %d\n",
                         udev->devnum);
 
+        /*
+         * Ensure that the pm runtime code knows that the USB device
+         * is in the process of being disconnected.
+         */
+        pm_runtime_barrier(&udev->dev);
+
         usb_lock_device(udev);
 
         hub_disconnect_children(udev);
@@ -2609,8 +2633,15 @@ static int hub_port_wait_reset(struct usb_hub *hub, int port1,
                 if (ret < 0)
                         return ret;
 
-                /* The port state is unknown until the reset completes. */
-                if (!(portstatus & USB_PORT_STAT_RESET))
+                /*
+                 * The port state is unknown until the reset completes.
+                 *
+                 * On top of that, some chips may require additional time
+                 * to re-establish a connection after the reset is complete,
+                 * so also wait for the connection to be re-established.
+                 */
+                if (!(portstatus & USB_PORT_STAT_RESET) &&
+                    (portstatus & USB_PORT_STAT_CONNECTION))
                         break;
 
                 /* switch to the long delay after two short delay failures */
@@ -4206,7 +4237,7 @@ static void hub_set_initial_usb2_lpm_policy(struct usb_device *udev)
         struct usb_hub *hub = usb_hub_to_struct_hub(udev->parent);
         int connect_type = USB_PORT_CONNECT_TYPE_UNKNOWN;
 
-        if (!udev->usb2_hw_lpm_capable)
+        if (!udev->usb2_hw_lpm_capable || !udev->bos)
                 return;
 
         if (hub)
@@ -4274,7 +4305,7 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1,
         if (oldspeed == USB_SPEED_LOW)
                 delay = HUB_LONG_RESET_TIME;
 
-        mutex_lock(&hdev->bus->usb_address0_mutex);
+        mutex_lock(hcd->address0_mutex);
 
         /* Reset the device; full speed may morph to high speed */
         /* FIXME a USB 2.0 device may morph into SuperSpeed on reset. */
@@ -4560,7 +4591,7 @@ fail:
                 hub_port_disable(hub, port1, 0);
                 update_devnum(udev, devnum);    /* for disconnect processing */
         }
-        mutex_unlock(&hdev->bus->usb_address0_mutex);
+        mutex_unlock(hcd->address0_mutex);
         return retval;
 }
 
@@ -4642,7 +4673,8 @@ hub_power_remaining(struct usb_hub *hub)
 static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
                 u16 portchange)
 {
-        int status, i;
+        int status = -ENODEV;
+        int i;
         unsigned unit_load;
         struct usb_device *hdev = hub->hdev;
         struct usb_hcd *hcd = bus_to_hcd(hdev->bus);
@@ -4846,9 +4878,10 @@ loop:
 
 done:
         hub_port_disable(hub, port1, 1);
-        if (hcd->driver->relinquish_port && !hub->hdev->parent)
-                hcd->driver->relinquish_port(hcd, port1);
-
+        if (hcd->driver->relinquish_port && !hub->hdev->parent) {
+                if (status != -ENOTCONN && status != -ENODEV)
+                        hcd->driver->relinquish_port(hcd, port1);
+        }
 }
 
 /* Handle physical or logical connection change events.