1 files changed, 57 insertions, 67 deletions

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 3b7151687776..73dfa194160b 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -122,12 +122,12 @@ struct usb_hub *usb_hub_to_struct_hub(struct usb_device *hdev)
         return usb_get_intfdata(hdev->actconfig->interface[0]);
 }
 
-static int usb_device_supports_lpm(struct usb_device *udev)
+int usb_device_supports_lpm(struct usb_device *udev)
 {
         /* USB 2.1 (and greater) devices indicate LPM support through
          * their USB 2.0 Extended Capabilities BOS descriptor.
          */
-        if (udev->speed == USB_SPEED_HIGH) {
+        if (udev->speed == USB_SPEED_HIGH || udev->speed == USB_SPEED_FULL) {
                 if (udev->bos->ext_cap &&
                         (USB_LPM_SUPPORT &
                          le32_to_cpu(udev->bos->ext_cap->bmAttributes)))
@@ -795,7 +795,8 @@ int usb_hub_clear_tt_buffer(struct urb *urb)
          * since each TT has "at least two" buffers that can need it (and
          * there can be many TTs per hub).  even if they're uncommon.
          */
-        if ((clear = kmalloc (sizeof *clear, GFP_ATOMIC)) == NULL) {
+        clear = kmalloc(sizeof *clear, GFP_ATOMIC);
+        if (clear == NULL) {
                 dev_err (&udev->dev, "can't save CLEAR_TT_BUFFER state\n");
                 /* FIXME recover somehow ... RESET_TT? */
                 return -ENOMEM;
@@ -2350,6 +2351,26 @@ static void set_usb_port_removable(struct usb_device *udev)
 
         hub = usb_hub_to_struct_hub(udev->parent);
 
+        /*
+         * If the platform firmware has provided information about a port,
+         * use that to determine whether it's removable.
+         */
+        switch (hub->ports[udev->portnum - 1]->connect_type) {
+        case USB_PORT_CONNECT_TYPE_HOT_PLUG:
+                udev->removable = USB_DEVICE_REMOVABLE;
+                return;
+        case USB_PORT_CONNECT_TYPE_HARD_WIRED:
+        case USB_PORT_NOT_USED:
+                udev->removable = USB_DEVICE_FIXED;
+                return;
+        default:
+                break;
+        }
+
+        /*
+         * Otherwise, check whether the hub knows whether a port is removable
+         * or not
+         */
         wHubCharacteristics = le16_to_cpu(hub->descriptor->wHubCharacteristics);
 
         if (!(wHubCharacteristics & HUB_CHAR_COMPOUND))
@@ -2369,21 +2390,6 @@ static void set_usb_port_removable(struct usb_device *udev)
         else
                 udev->removable = USB_DEVICE_FIXED;
 
-        /*
-         * Platform firmware may have populated an alternative value for
-         * removable.  If the parent port has a known connect_type use
-         * that instead.
-         */
-        switch (hub->ports[udev->portnum - 1]->connect_type) {
-        case USB_PORT_CONNECT_TYPE_HOT_PLUG:
-                udev->removable = USB_DEVICE_REMOVABLE;
-                break;
-        case USB_PORT_CONNECT_TYPE_HARD_WIRED:
-                udev->removable = USB_DEVICE_FIXED;
-                break;
-        default: /* use what was set above */
-                break;
-        }
 }
 
 /**
@@ -2616,9 +2622,6 @@ static bool use_new_scheme(struct usb_device *udev, int retry)
         return USE_NEW_SCHEME(retry);
 }
 
-static int hub_port_reset(struct usb_hub *hub, int port1,
-                        struct usb_device *udev, unsigned int delay, bool warm);
-
 /* Is a USB 3.0 port in the Inactive or Compliance Mode state?
  * Port worm reset is required to recover
  */
@@ -2706,44 +2709,6 @@ static int hub_port_wait_reset(struct usb_hub *hub, int port1,
         return 0;
 }
 
-static void hub_port_finish_reset(struct usb_hub *hub, int port1,
-                        struct usb_device *udev, int *status)
-{
-        switch (*status) {
-        case 0:
-                /* TRSTRCY = 10 ms; plus some extra */
-                msleep(10 + 40);
-                if (udev) {
-                        struct usb_hcd *hcd = bus_to_hcd(udev->bus);
-
-                        update_devnum(udev, 0);
-                        /* The xHC may think the device is already reset,
-                         * so ignore the status.
-                         */
-                        if (hcd->driver->reset_device)
-                                hcd->driver->reset_device(hcd, udev);
-                }
-                /* FALL THROUGH */
-        case -ENOTCONN:
-        case -ENODEV:
-                usb_clear_port_feature(hub->hdev,
-                                port1, USB_PORT_FEAT_C_RESET);
-                if (hub_is_superspeed(hub->hdev)) {
-                        usb_clear_port_feature(hub->hdev, port1,
-                                        USB_PORT_FEAT_C_BH_PORT_RESET);
-                        usb_clear_port_feature(hub->hdev, port1,
-                                        USB_PORT_FEAT_C_PORT_LINK_STATE);
-                        usb_clear_port_feature(hub->hdev, port1,
-                                        USB_PORT_FEAT_C_CONNECTION);
-                }
-                if (udev)
-                        usb_set_device_state(udev, *status
-                                        ? USB_STATE_NOTATTACHED
-                                        : USB_STATE_DEFAULT);
-                break;
-        }
-}
-
 /* Handle port reset and port warm(BH) reset (for USB3 protocol ports) */
 static int hub_port_reset(struct usb_hub *hub, int port1,
                         struct usb_device *udev, unsigned int delay, bool warm)
@@ -2767,13 +2732,10 @@ static int hub_port_reset(struct usb_hub *hub, int port1,
                  * If the caller hasn't explicitly requested a warm reset,
                  * double check and see if one is needed.
                  */
-                status = hub_port_status(hub, port1,
-                                        &portstatus, &portchange);
-                if (status < 0)
-                        goto done;
-
-                if (hub_port_warm_reset_required(hub, port1, portstatus))
-                        warm = true;
+                if (hub_port_status(hub, port1, &portstatus, &portchange) == 0)
+                        if (hub_port_warm_reset_required(hub, port1,
+                                                        portstatus))
+                                warm = true;
         }
         clear_bit(port1, hub->warm_reset_bits);
 
@@ -2799,11 +2761,19 @@ static int hub_port_reset(struct usb_hub *hub, int port1,
 
                 /* Check for disconnect or reset */
                 if (status == 0 || status == -ENOTCONN || status == -ENODEV) {
-                        hub_port_finish_reset(hub, port1, udev, &status);
+                        usb_clear_port_feature(hub->hdev, port1,
+                                        USB_PORT_FEAT_C_RESET);
 
                         if (!hub_is_superspeed(hub->hdev))
                                 goto done;
 
+                        usb_clear_port_feature(hub->hdev, port1,
+                                        USB_PORT_FEAT_C_BH_PORT_RESET);
+                        usb_clear_port_feature(hub->hdev, port1,
+                                        USB_PORT_FEAT_C_PORT_LINK_STATE);
+                        usb_clear_port_feature(hub->hdev, port1,
+                                        USB_PORT_FEAT_C_CONNECTION);
+
                         /*
                          * If a USB 3.0 device migrates from reset to an error
                          * state, re-issue the warm reset.
@@ -2836,6 +2806,26 @@ static int hub_port_reset(struct usb_hub *hub, int port1,
         dev_err(&port_dev->dev, "Cannot enable. Maybe the USB cable is bad?\n");
 
 done:
+        if (status == 0) {
+                /* TRSTRCY = 10 ms; plus some extra */
+                msleep(10 + 40);
+                if (udev) {
+                        struct usb_hcd *hcd = bus_to_hcd(udev->bus);
+
+                        update_devnum(udev, 0);
+                        /* The xHC may think the device is already reset,
+                         * so ignore the status.
+                         */
+                        if (hcd->driver->reset_device)
+                                hcd->driver->reset_device(hcd, udev);
+
+                        usb_set_device_state(udev, USB_STATE_DEFAULT);
+                }
+        } else {
+                if (udev)
+                        usb_set_device_state(udev, USB_STATE_NOTATTACHED);
+        }
+
         if (!hub_is_superspeed(hub->hdev))
                 up_read(&ehci_cf_port_reset_rwsem);