aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorManoj Iyer <manoj.iyer@canonical.com>2012-08-22 11:53:18 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-02 09:47:39 -0700
commitb1e81baa2d46338345c6f16c0e873ef3e7d73188 (patch)
tree1c16d06d594229ae060750f1ccfb26c903324ae4 /drivers/usb
parentf78e6ad433084ec0b7bc40ff9910f458609ee9cb (diff)
downloadkernel_samsung_smdk4412-b1e81baa2d46338345c6f16c0e873ef3e7d73188.zip
kernel_samsung_smdk4412-b1e81baa2d46338345c6f16c0e873ef3e7d73188.tar.gz
kernel_samsung_smdk4412-b1e81baa2d46338345c6f16c0e873ef3e7d73188.tar.bz2
xhci: Recognize USB 3.0 devices as superspeed at powerup
commit 29d214576f936db627ff62afb9ef438eea18bcd2 upstream. On Intel Panther Point chipset USB 3.0 devices show up as high-speed devices on powerup, but after an s3 cycle they are correctly recognized as SuperSpeed. At powerup switch the port to xHCI so that USB 3.0 devices are correctly recognized. BugLink: http://bugs.launchpad.net/bugs/1000424 This patch should be backported to kernels as old as 3.0, that contain commit ID 69e848c2090aebba5698a1620604c7dccb448684 "Intel xhci: Support EHCI/xHCI port switching." Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com> Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/pci-quirks.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 186438f..3b82c81 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -895,9 +895,10 @@ static void __devinit quirk_usb_handoff_xhci(struct pci_dev *pdev)
/* Disable any BIOS SMIs and clear all SMI events*/
writel(val, base + ext_cap_offset + XHCI_LEGACY_CONTROL_OFFSET);
+hc_init:
if (usb_is_intel_switchable_xhci(pdev))
usb_enable_xhci_ports(pdev);
-hc_init:
+
op_reg_base = base + XHCI_HC_LENGTH(readl(base));
/* Wait for the host controller to be ready before writing any