mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 11:32:04 +00:00
1530bbc627
Sergio reported that when he recorded audio from a USB headset mic
plugged into the USB 3.0 port on his ASUS N53SV-DH72, the audio sounded
"robotic". When plugged into the USB 2.0 port under EHCI on the same
laptop, the audio sounded fine. The device is:
Bus 002 Device 004: ID 046d:0a0c Logitech, Inc. Clear Chat Comfort USB Headset
The problem was tracked down to the Fresco Logic xHCI host controller
not correctly reporting short transfers on isochronous IN endpoints.
The driver would submit a 96 byte transfer, the device would only send
88 or 90 bytes, and the xHCI host would report the transfer had a
"successful" completion code, with an untransferred buffer length of 8
or 6 bytes.
The successful completion code and non-zero untransferred length is a
contradiction. The xHCI host is supposed to only mark a transfer as
successful if all the bytes are transferred. Otherwise, the transfer
should be marked with a short packet completion code. Without the EHCI
bus trace, we wouldn't know whether the xHCI driver should trust the
completion code or the untransferred length. With it, we know to trust
the untransferred length.
Add a new xHCI quirk for the Fresco Logic host controller. If a
transfer is reported as successful, but the untransferred length is
non-zero, print a warning. For the Fresco Logic host, change the
completion code to COMP_SHORT_TX and process the transfer like a short
transfer.
This should be backported to stable kernels that contain the commit
f5182b4155
"xhci: Disable MSI for some
Fresco Logic hosts." That commit was marked for stable kernels as old
as 2.6.36.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Reported-by: Sergio Correia <lists@uece.net>
Tested-by: Sergio Correia <lists@uece.net>
Cc: stable@vger.kernel.org
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
336 lines
9.3 KiB
C
336 lines
9.3 KiB
C
/*
|
|
* xHCI host controller driver PCI Bus Glue.
|
|
*
|
|
* Copyright (C) 2008 Intel Corp.
|
|
*
|
|
* Author: Sarah Sharp
|
|
* Some code borrowed from the Linux EHCI driver.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
* for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include <linux/pci.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/module.h>
|
|
|
|
#include "xhci.h"
|
|
|
|
/* Device for a quirk */
|
|
#define PCI_VENDOR_ID_FRESCO_LOGIC 0x1b73
|
|
#define PCI_DEVICE_ID_FRESCO_LOGIC_PDK 0x1000
|
|
|
|
#define PCI_VENDOR_ID_ETRON 0x1b6f
|
|
#define PCI_DEVICE_ID_ASROCK_P67 0x7023
|
|
|
|
static const char hcd_name[] = "xhci_hcd";
|
|
|
|
/* called after powerup, by probe or system-pm "wakeup" */
|
|
static int xhci_pci_reinit(struct xhci_hcd *xhci, struct pci_dev *pdev)
|
|
{
|
|
/*
|
|
* TODO: Implement finding debug ports later.
|
|
* TODO: see if there are any quirks that need to be added to handle
|
|
* new extended capabilities.
|
|
*/
|
|
|
|
/* PCI Memory-Write-Invalidate cycle support is optional (uncommon) */
|
|
if (!pci_set_mwi(pdev))
|
|
xhci_dbg(xhci, "MWI active\n");
|
|
|
|
xhci_dbg(xhci, "Finished xhci_pci_reinit\n");
|
|
return 0;
|
|
}
|
|
|
|
static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
|
|
{
|
|
struct pci_dev *pdev = to_pci_dev(dev);
|
|
|
|
/* Look for vendor-specific quirks */
|
|
if (pdev->vendor == PCI_VENDOR_ID_FRESCO_LOGIC &&
|
|
pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_PDK) {
|
|
if (pdev->revision == 0x0) {
|
|
xhci->quirks |= XHCI_RESET_EP_QUIRK;
|
|
xhci_dbg(xhci, "QUIRK: Fresco Logic xHC needs configure"
|
|
" endpoint cmd after reset endpoint\n");
|
|
}
|
|
/* Fresco Logic confirms: all revisions of this chip do not
|
|
* support MSI, even though some of them claim to in their PCI
|
|
* capabilities.
|
|
*/
|
|
xhci->quirks |= XHCI_BROKEN_MSI;
|
|
xhci_dbg(xhci, "QUIRK: Fresco Logic revision %u "
|
|
"has broken MSI implementation\n",
|
|
pdev->revision);
|
|
xhci->quirks |= XHCI_TRUST_TX_LENGTH;
|
|
}
|
|
|
|
if (pdev->vendor == PCI_VENDOR_ID_NEC)
|
|
xhci->quirks |= XHCI_NEC_HOST;
|
|
|
|
if (pdev->vendor == PCI_VENDOR_ID_AMD && xhci->hci_version == 0x96)
|
|
xhci->quirks |= XHCI_AMD_0x96_HOST;
|
|
|
|
/* AMD PLL quirk */
|
|
if (pdev->vendor == PCI_VENDOR_ID_AMD && usb_amd_find_chipset_info())
|
|
xhci->quirks |= XHCI_AMD_PLL_FIX;
|
|
if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
|
|
pdev->device == PCI_DEVICE_ID_INTEL_PANTHERPOINT_XHCI) {
|
|
xhci->quirks |= XHCI_SPURIOUS_SUCCESS;
|
|
xhci->quirks |= XHCI_EP_LIMIT_QUIRK;
|
|
xhci->limit_active_eps = 64;
|
|
xhci->quirks |= XHCI_SW_BW_CHECKING;
|
|
}
|
|
if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
|
|
pdev->device == PCI_DEVICE_ID_ASROCK_P67) {
|
|
xhci->quirks |= XHCI_RESET_ON_RESUME;
|
|
xhci_dbg(xhci, "QUIRK: Resetting on resume\n");
|
|
}
|
|
if (pdev->vendor == PCI_VENDOR_ID_VIA)
|
|
xhci->quirks |= XHCI_RESET_ON_RESUME;
|
|
}
|
|
|
|
/* called during probe() after chip reset completes */
|
|
static int xhci_pci_setup(struct usb_hcd *hcd)
|
|
{
|
|
struct xhci_hcd *xhci;
|
|
struct pci_dev *pdev = to_pci_dev(hcd->self.controller);
|
|
int retval;
|
|
|
|
retval = xhci_gen_setup(hcd, xhci_pci_quirks);
|
|
if (retval)
|
|
return retval;
|
|
|
|
xhci = hcd_to_xhci(hcd);
|
|
if (!usb_hcd_is_primary_hcd(hcd))
|
|
return 0;
|
|
|
|
pci_read_config_byte(pdev, XHCI_SBRN_OFFSET, &xhci->sbrn);
|
|
xhci_dbg(xhci, "Got SBRN %u\n", (unsigned int) xhci->sbrn);
|
|
|
|
/* Find any debug ports */
|
|
retval = xhci_pci_reinit(xhci, pdev);
|
|
if (!retval)
|
|
return retval;
|
|
|
|
kfree(xhci);
|
|
return retval;
|
|
}
|
|
|
|
/*
|
|
* We need to register our own PCI probe function (instead of the USB core's
|
|
* function) in order to create a second roothub under xHCI.
|
|
*/
|
|
static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
|
|
{
|
|
int retval;
|
|
struct xhci_hcd *xhci;
|
|
struct hc_driver *driver;
|
|
struct usb_hcd *hcd;
|
|
|
|
driver = (struct hc_driver *)id->driver_data;
|
|
/* Register the USB 2.0 roothub.
|
|
* FIXME: USB core must know to register the USB 2.0 roothub first.
|
|
* This is sort of silly, because we could just set the HCD driver flags
|
|
* to say USB 2.0, but I'm not sure what the implications would be in
|
|
* the other parts of the HCD code.
|
|
*/
|
|
retval = usb_hcd_pci_probe(dev, id);
|
|
|
|
if (retval)
|
|
return retval;
|
|
|
|
/* USB 2.0 roothub is stored in the PCI device now. */
|
|
hcd = dev_get_drvdata(&dev->dev);
|
|
xhci = hcd_to_xhci(hcd);
|
|
xhci->shared_hcd = usb_create_shared_hcd(driver, &dev->dev,
|
|
pci_name(dev), hcd);
|
|
if (!xhci->shared_hcd) {
|
|
retval = -ENOMEM;
|
|
goto dealloc_usb2_hcd;
|
|
}
|
|
|
|
/* Set the xHCI pointer before xhci_pci_setup() (aka hcd_driver.reset)
|
|
* is called by usb_add_hcd().
|
|
*/
|
|
*((struct xhci_hcd **) xhci->shared_hcd->hcd_priv) = xhci;
|
|
|
|
retval = usb_add_hcd(xhci->shared_hcd, dev->irq,
|
|
IRQF_SHARED);
|
|
if (retval)
|
|
goto put_usb3_hcd;
|
|
/* Roothub already marked as USB 3.0 speed */
|
|
return 0;
|
|
|
|
put_usb3_hcd:
|
|
usb_put_hcd(xhci->shared_hcd);
|
|
dealloc_usb2_hcd:
|
|
usb_hcd_pci_remove(dev);
|
|
return retval;
|
|
}
|
|
|
|
static void xhci_pci_remove(struct pci_dev *dev)
|
|
{
|
|
struct xhci_hcd *xhci;
|
|
|
|
xhci = hcd_to_xhci(pci_get_drvdata(dev));
|
|
if (xhci->shared_hcd) {
|
|
usb_remove_hcd(xhci->shared_hcd);
|
|
usb_put_hcd(xhci->shared_hcd);
|
|
}
|
|
usb_hcd_pci_remove(dev);
|
|
kfree(xhci);
|
|
}
|
|
|
|
#ifdef CONFIG_PM
|
|
static int xhci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup)
|
|
{
|
|
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
|
|
int retval = 0;
|
|
|
|
if (hcd->state != HC_STATE_SUSPENDED ||
|
|
xhci->shared_hcd->state != HC_STATE_SUSPENDED)
|
|
return -EINVAL;
|
|
|
|
retval = xhci_suspend(xhci);
|
|
|
|
return retval;
|
|
}
|
|
|
|
static int xhci_pci_resume(struct usb_hcd *hcd, bool hibernated)
|
|
{
|
|
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
|
|
struct pci_dev *pdev = to_pci_dev(hcd->self.controller);
|
|
int retval = 0;
|
|
|
|
/* The BIOS on systems with the Intel Panther Point chipset may or may
|
|
* not support xHCI natively. That means that during system resume, it
|
|
* may switch the ports back to EHCI so that users can use their
|
|
* keyboard to select a kernel from GRUB after resume from hibernate.
|
|
*
|
|
* The BIOS is supposed to remember whether the OS had xHCI ports
|
|
* enabled before resume, and switch the ports back to xHCI when the
|
|
* BIOS/OS semaphore is written, but we all know we can't trust BIOS
|
|
* 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.
|
|
*/
|
|
if (usb_is_intel_switchable_xhci(pdev))
|
|
usb_enable_xhci_ports(pdev);
|
|
|
|
retval = xhci_resume(xhci, hibernated);
|
|
return retval;
|
|
}
|
|
#endif /* CONFIG_PM */
|
|
|
|
static const struct hc_driver xhci_pci_hc_driver = {
|
|
.description = hcd_name,
|
|
.product_desc = "xHCI Host Controller",
|
|
.hcd_priv_size = sizeof(struct xhci_hcd *),
|
|
|
|
/*
|
|
* generic hardware linkage
|
|
*/
|
|
.irq = xhci_irq,
|
|
.flags = HCD_MEMORY | HCD_USB3 | HCD_SHARED,
|
|
|
|
/*
|
|
* basic lifecycle operations
|
|
*/
|
|
.reset = xhci_pci_setup,
|
|
.start = xhci_run,
|
|
#ifdef CONFIG_PM
|
|
.pci_suspend = xhci_pci_suspend,
|
|
.pci_resume = xhci_pci_resume,
|
|
#endif
|
|
.stop = xhci_stop,
|
|
.shutdown = xhci_shutdown,
|
|
|
|
/*
|
|
* managing i/o requests and associated device resources
|
|
*/
|
|
.urb_enqueue = xhci_urb_enqueue,
|
|
.urb_dequeue = xhci_urb_dequeue,
|
|
.alloc_dev = xhci_alloc_dev,
|
|
.free_dev = xhci_free_dev,
|
|
.alloc_streams = xhci_alloc_streams,
|
|
.free_streams = xhci_free_streams,
|
|
.add_endpoint = xhci_add_endpoint,
|
|
.drop_endpoint = xhci_drop_endpoint,
|
|
.endpoint_reset = xhci_endpoint_reset,
|
|
.check_bandwidth = xhci_check_bandwidth,
|
|
.reset_bandwidth = xhci_reset_bandwidth,
|
|
.address_device = xhci_address_device,
|
|
.update_hub_device = xhci_update_hub_device,
|
|
.reset_device = xhci_discover_or_reset_device,
|
|
|
|
/*
|
|
* scheduling support
|
|
*/
|
|
.get_frame_number = xhci_get_frame,
|
|
|
|
/* Root hub support */
|
|
.hub_control = xhci_hub_control,
|
|
.hub_status_data = xhci_hub_status_data,
|
|
.bus_suspend = xhci_bus_suspend,
|
|
.bus_resume = xhci_bus_resume,
|
|
/*
|
|
* call back when device connected and addressed
|
|
*/
|
|
.update_device = xhci_update_device,
|
|
.set_usb2_hw_lpm = xhci_set_usb2_hardware_lpm,
|
|
};
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/* PCI driver selection metadata; PCI hotplugging uses this */
|
|
static const struct pci_device_id pci_ids[] = { {
|
|
/* handle any USB 3.0 xHCI controller */
|
|
PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_XHCI, ~0),
|
|
.driver_data = (unsigned long) &xhci_pci_hc_driver,
|
|
},
|
|
{ /* end: all zeroes */ }
|
|
};
|
|
MODULE_DEVICE_TABLE(pci, pci_ids);
|
|
|
|
/* pci driver glue; this is a "new style" PCI driver module */
|
|
static struct pci_driver xhci_pci_driver = {
|
|
.name = (char *) hcd_name,
|
|
.id_table = pci_ids,
|
|
|
|
.probe = xhci_pci_probe,
|
|
.remove = xhci_pci_remove,
|
|
/* suspend and resume implemented later */
|
|
|
|
.shutdown = usb_hcd_pci_shutdown,
|
|
#ifdef CONFIG_PM_SLEEP
|
|
.driver = {
|
|
.pm = &usb_hcd_pci_pm_ops
|
|
},
|
|
#endif
|
|
};
|
|
|
|
int __init xhci_register_pci(void)
|
|
{
|
|
return pci_register_driver(&xhci_pci_driver);
|
|
}
|
|
|
|
void xhci_unregister_pci(void)
|
|
{
|
|
pci_unregister_driver(&xhci_pci_driver);
|
|
}
|