Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b38f09cc authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

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



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 26b76798
"Intel xhci: refactor EHCI/xHCI port switching"

Cc: stable <stable@vger.kernel.org> # 3.12
Reported-by: default avatarJorge <xxopxe@gmail.com>
Tested-by: default avatarJorge <xxopxe@gmail.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7ac3764f

drivers/usb/host/pci-quirks.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -847,6 +847,13 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) 
	bool		ehci_found = false;

	bool		ehci_found = false;

	struct pci_dev	*companion = NULL;

	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 */

	/* make sure an intel EHCI controller exists */

	for_each_pci_dev(companion) {

	for_each_pci_dev(companion) {

		if (companion->class == PCI_CLASS_SERIAL_USB_EHCI &&

		if (companion->class == PCI_CLASS_SERIAL_USB_EHCI &&