Intel xhci: refactor EHCI/xHCI port switching

Make the Linux xHCI driver automatically try to switchover the EHCI ports to
xHCI when an Intel xHCI host is detected, and it also finds an Intel EHCI host.

This means we will no longer have to add Intel xHCI hosts to a quirks list when
the PCI device IDs change.  Simply continuing to add new Intel xHCI PCI device
IDs to the quirks list is not sustainable.

During suspend ports may be swicthed back to EHCI by BIOS and not properly
restored to xHCI at resume. Previously both EHCI and xHCI resume functions
switched ports back to XHCI, but it's enough to do it in xHCI only
because the hub driver doesn't start running again until after both hosts are resumed.

Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>

1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index cc24e39b97d5..475e06e10a77 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -250,13 +250,15 @@ static int xhci_pci_resume(struct usb_hcd *hcd, bool hibernated)
          * writers.
          *
          * Unconditionally switch the ports back to xHCI after a system resume.
-         * We can't tell whether the EHCI or xHCI controller will be resumed
-         * first, so we have to do the port switchover in both drivers.  Writing
-         * a '1' to the port switchover registers should have no effect if the
-         * port was already switched over.
+         * It should not matter whether the EHCI or xHCI controller is
+         * resumed first. It's enough to do the switchover in xHCI because
+         * USB core won't notice anything as the hub driver doesn't start
+         * running again until after all the devices (including both EHCI and
+         * xHCI host controllers) have been resumed.
          */
-        if (usb_is_intel_switchable_xhci(pdev))
-                usb_enable_xhci_ports(pdev);
+
+        if (pdev->vendor == PCI_VENDOR_ID_INTEL)
+                usb_enable_intel_xhci_ports(pdev);
 
         retval = xhci_resume(xhci, hibernated);
         return retval;