Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00eed9c8 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Greg Kroah-Hartman
Browse files

USB: xhci: correctly enable interrupts 



xhci has its own interrupt enabling routine, which will try to
use MSI-X/MSI if present. So the usb core shouldn't try to enable
legacy interrupts; on some machines the xhci legacy IRQ setting
is invalid.

v3: Be careful to not break XHCI_BROKEN_MSI workaround (by trenn)

Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Oliver Neukum <oneukum@suse.de>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Frederik Himpe <fhimpe@vub.ac.be>
Cc: David Haerdeman <david@hardeman.nu>
Cc: Alan Stern <stern@rowland.harvard.edu>
Acked-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
Reviewed-by: default avatarThomas Renninger <trenn@suse.de>
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1d9d8639

drivers/usb/core/hcd-pci.c

+14 −9
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) 
	struct hc_driver	*driver;

	struct usb_hcd		*hcd;

	int			retval;

	int			hcd_irq = 0;



	if (usb_disabled())

		return -ENODEV;
@@ -187,16 +188,20 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) 
		return -ENODEV;

	dev->current_state = PCI_D0;



	/* The xHCI driver supports MSI and MSI-X,

	 * so don't fail if the BIOS doesn't provide a legacy IRQ.

	/*

	 * The xHCI driver has its own irq management

	 * make sure irq setup is not touched for xhci in generic hcd code

	 */

	if (!dev->irq && (driver->flags & HCD_MASK) != HCD_USB3) {

	if ((driver->flags & HCD_MASK) != HCD_USB3) {

		if (!dev->irq) {

			dev_err(&dev->dev,

			"Found HC with no IRQ. Check BIOS/PCI %s setup!\n",

				pci_name(dev));

			retval = -ENODEV;

			goto disable_pci;

		}

		hcd_irq = dev->irq;

	}



	hcd = usb_create_hcd(driver, &dev->dev, pci_name(dev));

	if (!hcd) {
@@ -245,7 +250,7 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) 


	pci_set_master(dev);



	retval = usb_add_hcd(hcd, dev->irq, IRQF_SHARED);

	retval = usb_add_hcd(hcd, hcd_irq, IRQF_SHARED);

	if (retval != 0)

		goto unmap_registers;

	set_hs_companion(dev, hcd);

drivers/usb/host/xhci.c

+2 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static int xhci_try_enable_msi(struct usb_hcd *hcd) 
	 * generate interrupts.  Don't even try to enable MSI.

	 */

	if (xhci->quirks & XHCI_BROKEN_MSI)

		return 0;

		goto legacy_irq;



	/* unregister the legacy interrupt */

	if (hcd->irq)
@@ -371,6 +371,7 @@ static int xhci_try_enable_msi(struct usb_hcd *hcd) 
		return -EINVAL;

	}



 legacy_irq:

	/* fall back to legacy interrupt*/

	ret = request_irq(pdev->irq, &usb_hcd_irq, IRQF_SHARED,

			hcd->irq_descr, hcd);