diff options
| author | Jayachandran C <jayachandranc@netlogicmicro.com> | 2012-01-27 20:27:32 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-13 11:28:50 -0800 |
| commit | 6da6c702a675b75f7c4bcc23ca3befcd25bb07e4 (patch) | |
| tree | a0212ba4c636544658a102afc3d97495d75c36f6 | |
| parent | a86c3948b06007b3befd1b796598e46527ccea9a (diff) | |
| download | lwn-6da6c702a675b75f7c4bcc23ca3befcd25bb07e4.tar.gz lwn-6da6c702a675b75f7c4bcc23ca3befcd25bb07e4.zip | |
usb: Skip PCI USB quirk handling for Netlogic XLP
commit e4436a7c17ac2b5e138f93f83a541cba9b311685 upstream.
The Netlogic XLP SoC's on-chip USB controller appears as a PCI
USB device, but does not need the EHCI/OHCI handoff done in
usb/host/pci-quirks.c.
The pci-quirks.c is enabled for all vendors and devices, and is
enabled if USB and PCI are configured.
If we do not skip the qurik handling on XLP, the readb() call in
ehci_bios_handoff() will cause a crash since byte access is not
supported for EHCI registers in XLP.
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/host/pci-quirks.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c index eae8b18437cb..8213f793d3d9 100644 --- a/drivers/usb/host/pci-quirks.c +++ b/drivers/usb/host/pci-quirks.c @@ -498,6 +498,12 @@ hc_init: static void __devinit quirk_usb_early_handoff(struct pci_dev *pdev) { + /* Skip Netlogic mips SoC's internal PCI USB controller. + * This device does not need/support EHCI/OHCI handoff + */ + if (pdev->vendor == 0x184e) /* vendor Netlogic */ + return; + if (pdev->class == PCI_CLASS_SERIAL_USB_UHCI) quirk_usb_handoff_uhci(pdev); else if (pdev->class == PCI_CLASS_SERIAL_USB_OHCI) |