Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xhci: Add Lynx Point to list of Intel switchable hosts.

Browse source 
The upcoming Intel Lynx Point chipset includes an xHCI host controller
that can have ports switched from the EHCI host controller, just like
the Intel Panther Point xHCI host.  This time, ports from both EHCI
hosts can be switched to the xHCI host controller.  The PCI config
registers to do the port switching are in the exact same place in the
xHCI PCI configuration registers, with the same semantics.

Hooray for shipping patches for next-gen hardware before the current gen
hardware is even available for purchase!

This patch should be backported to stable kernels as old as 3.0,
that contain commit 69e848c209
"Intel xhci: Support EHCI/xHCI port switching."

Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable@vger.kernel.org
This commit is contained in:
Sarah Sharp 2012-02-09 15:55:13 -08:00
parent 51c9e6c773
commit 1c12443ab8
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/usb/host/ehci-pci.c
View file

@ -360,7 +360,9 @@ static bool usb_is_intel_switchable_ehci(struct pci_dev *pdev)
{ {
return pdev->class == PCI_CLASS_SERIAL_USB_EHCI && return pdev->class == PCI_CLASS_SERIAL_USB_EHCI &&
pdev->vendor == PCI_VENDOR_ID_INTEL && pdev->vendor == PCI_VENDOR_ID_INTEL &&
pdev->device == 0x1E26; (pdev->device == 0x1E26 ||
pdev->device == 0x8C2D ||
pdev->device == 0x8C26);
} }
static void ehci_enable_xhci_companion(void) static void ehci_enable_xhci_companion(void)

18
drivers/usb/host/pci-quirks.c
View file

@ -713,12 +713,28 @@ static int handshake(void __iomem *ptr, u32 mask, u32 done,
return -ETIMEDOUT; return -ETIMEDOUT;
} }
bool usb_is_intel_switchable_xhci(struct pci_dev *pdev) #define PCI_DEVICE_ID_INTEL_LYNX_POINT_XHCI 0x8C31
bool usb_is_intel_ppt_switchable_xhci(struct pci_dev *pdev)
{ {
return pdev->class == PCI_CLASS_SERIAL_USB_XHCI && return pdev->class == PCI_CLASS_SERIAL_USB_XHCI &&
pdev->vendor == PCI_VENDOR_ID_INTEL && pdev->vendor == PCI_VENDOR_ID_INTEL &&
pdev->device == PCI_DEVICE_ID_INTEL_PANTHERPOINT_XHCI; pdev->device == PCI_DEVICE_ID_INTEL_PANTHERPOINT_XHCI;
} }
/* The Intel Lynx Point chipset also has switchable ports. */
bool usb_is_intel_lpt_switchable_xhci(struct pci_dev *pdev)
{
return pdev->class == PCI_CLASS_SERIAL_USB_XHCI &&
pdev->vendor == PCI_VENDOR_ID_INTEL &&
pdev->device == PCI_DEVICE_ID_INTEL_LYNX_POINT_XHCI;
}
bool usb_is_intel_switchable_xhci(struct pci_dev *pdev)
{
return usb_is_intel_ppt_switchable_xhci(pdev) ||
usb_is_intel_lpt_switchable_xhci(pdev);
}
EXPORT_SYMBOL_GPL(usb_is_intel_switchable_xhci); EXPORT_SYMBOL_GPL(usb_is_intel_switchable_xhci);
/* /*