Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

usb/uas: only bind if the hcd supports SG

The UAS driver requires SG support by the HCD operating the device. This
patch stops UAS from operating on a HCD without sg support and prints a
message to let him know.

The spec says:
|For [USB2] backward compatibility, the device shall present [BOT] as
|alternate interface zero (primary) and [UAS] as alternate interface one
|(secondary). A device which does not need backward compatibility with
|[BOT] shall present [UAS] as alternate interface zero. In [USB2]
|systems, the [BOT] driver or an associated filter driver may need to
|issue a SET INTERFACE request for alternate interface one and then allow
|the [UAS] driver to load.

If the user used usb_modeswitch to switch to UAS then he can go back to
BOT or use a different HCD. In case UAS is the only interface then there
is currently no way out.
In future usb_sg_wait() should be extended to provide a non-blocking
interface so it can work with the UAS driver.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>

authored by

Sebastian Andrzej Siewior and committed by
Sarah Sharp
c898add5 b6036698

+19 -6
+19 -6
drivers/usb/storage/uas.c
··· 13 13 #include <linux/types.h> 14 14 #include <linux/module.h> 15 15 #include <linux/usb.h> 16 + #include <linux/usb/hcd.h> 16 17 #include <linux/usb/storage.h> 17 18 18 19 #include <scsi/scsi.h> ··· 622 621 intf->desc.bInterfaceProtocol == USB_PR_UAS); 623 622 } 624 623 624 + static int uas_isnt_supported(struct usb_device *udev) 625 + { 626 + struct usb_hcd *hcd = bus_to_hcd(udev->bus); 627 + 628 + dev_warn(&udev->dev, "The driver for the USB controller %s does not " 629 + "support scatter-gather which is\n", 630 + hcd->driver->description); 631 + dev_warn(&udev->dev, "required by the UAS driver. Please try an" 632 + "alternative USB controller if you wish to use UAS.\n"); 633 + return -ENODEV; 634 + } 635 + 625 636 static int uas_switch_interface(struct usb_device *udev, 626 637 struct usb_interface *intf) 627 638 { 628 639 int i; 629 - 630 - if (uas_is_interface(intf->cur_altsetting)) 631 - return 0; 640 + int sg_supported = udev->bus->sg_tablesize != 0; 632 641 633 642 for (i = 0; i < intf->num_altsetting; i++) { 634 643 struct usb_host_interface *alt = &intf->altsetting[i]; 635 - if (alt == intf->cur_altsetting) 636 - continue; 637 - if (uas_is_interface(alt)) 644 + 645 + if (uas_is_interface(alt)) { 646 + if (!sg_supported) 647 + return uas_isnt_supported(udev); 638 648 return usb_set_interface(udev, 639 649 alt->desc.bInterfaceNumber, 640 650 alt->desc.bAlternateSetting); 651 + } 641 652 } 642 653 643 654 return -ENODEV;