Merge tag 'usb-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB fixes from Greg KH:
 "Here are some USB and PHY fixes for 3.17-rc5.

  Nothing major here, just a number of tiny fixes for reported issues,
  and some new device ids as well.

  All have been tested in linux-next"

* tag 'usb-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (46 commits)
  xhci: fix oops when xhci resumes from hibernate with hw lpm capable devices
  usb: xhci: Fix OOPS in xhci error handling code
  xhci: Fix null pointer dereference if xhci initialization fails
  storage: Add single-LUN quirk for Jaz USB Adapter
  uas: Add missing le16_to_cpu calls to asm1051 / asm1053 usb-id check
  usb: chipidea: msm: Initialize PHY on reset event
  usb: chipidea: msm: Use USB PHY API to control PHY state
  usb: hub: take hub->hdev reference when processing from eventlist
  uas: Disable uas on ASM1051 devices
  usb: dwc2/gadget: avoid disabling ep0
  usb: dwc2/gadget: delay enabling irq once hardware is configured properly
  usb: dwc2/gadget: do not call disconnect method in pullup
  usb: dwc2/gadget: break infinite loop in endpoint disable code
  usb: dwc2/gadget: fix phy initialization sequence
  usb: dwc2/gadget: fix phy disable sequence
  uwb: init beacon cache entry before registering uwb device
  USB: ftdi_sio: Add support for GE Healthcare Nemo Tracker device
  USB: document the 'u' flag for usb-storage quirks parameter
  usb: host: xhci: fix compliance mode workaround
  usb: dwc3: fix TRB completion when multiple TRBs are started
  ...

1 files changed, 23 insertions, 4 deletions

diff --git a/drivers/usb/storage/uas-detect.h b/drivers/usb/storage/uas-detect.h
index 503ac5c8d80f..8a6f371ed6e7 100644
--- a/drivers/usb/storage/uas-detect.h
+++ b/drivers/usb/storage/uas-detect.h
@@ -59,10 +59,6 @@ static int uas_use_uas_driver(struct usb_interface *intf,
         unsigned long flags = id->driver_info;
         int r, alt;
 
-        usb_stor_adjust_quirks(udev, &flags);
-
-        if (flags & US_FL_IGNORE_UAS)
-                return 0;
 
         alt = uas_find_uas_alt_setting(intf);
         if (alt < 0)
@@ -72,6 +68,29 @@ static int uas_use_uas_driver(struct usb_interface *intf,
         if (r < 0)
                 return 0;
 
+        /*
+         * ASM1051 and older ASM1053 devices have the same usb-id, and UAS is
+         * broken on the ASM1051, use the number of streams to differentiate.
+         * New ASM1053-s also support 32 streams, but have a different prod-id.
+         */
+        if (le16_to_cpu(udev->descriptor.idVendor) == 0x174c &&
+                        le16_to_cpu(udev->descriptor.idProduct) == 0x55aa) {
+                if (udev->speed < USB_SPEED_SUPER) {
+                        /* No streams info, assume ASM1051 */
+                        flags |= US_FL_IGNORE_UAS;
+                } else if (usb_ss_max_streams(&eps[1]->ss_ep_comp) == 32) {
+                        flags |= US_FL_IGNORE_UAS;
+                }
+        }
+
+        usb_stor_adjust_quirks(udev, &flags);
+
+        if (flags & US_FL_IGNORE_UAS) {
+                dev_warn(&udev->dev,
+                        "UAS is blacklisted for this device, using usb-storage instead\n");
+                return 0;
+        }
+
         if (udev->bus->sg_tablesize == 0) {
                 dev_warn(&udev->dev,
                         "The driver for the USB controller %s does not support scatter-gather which is\n",