usb: pci-quirks: Prevent Sony VAIO t-series from switching usb ports

commit b38f09ccc3fd453180e96273bf3f34083c30809a upstream.

Sony VAIO t-series machines are not capable of switching usb2 ports over
from Intel EHCI to xHCI controller. If tried the USB2 port will be left
unconnected and unusable.

This patch should be backported to stable kernels as old as 3.12,
that contain the commit 26b76798e0507429506b93cd49f8c4cfdab06896
"Intel xhci: refactor EHCI/xHCI port switching"

Reported-by: Jorge <xxopxe@gmail.com>
Tested-by: Jorge <xxopxe@gmail.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>

diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 463156d0314079a45b1e8dfccad7e6e13604c085..f8763cc9d3015b9822b4c9ae2ca90f61fb75e39f 100644 (file)
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -836,6 +836,13 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev)
        bool            ehci_found = false;
        struct pci_dev  *companion = NULL;
 
+       /* Sony VAIO t-series with subsystem device ID 90a8 is not capable of
+        * switching ports from EHCI to xHCI
+        */
+       if (xhci_pdev->subsystem_vendor == PCI_VENDOR_ID_SONY &&
+           xhci_pdev->subsystem_device == 0x90a8)
+               return;
+
        /* make sure an intel EHCI controller exists */
        for_each_pci_dev(companion) {
                if (companion->class == PCI_CLASS_SERIAL_USB_EHCI &&