Looks fine on the xHCI portion. Thanks for catching the XHCI_BROKEN_MSI
case.
Acked-by: Sarah Sharp <sarah.a.sh...@linux.intel.com>
On Mon, Mar 04, 2013 at 05:14:43PM +0100, Thomas Renninger wrote:
> From: Hannes Reinecke <h...@suse.de>
>
> 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 <bhelg...@google.com>
> Cc: Oliver Neukum <oneu...@suse.de>
> Cc: Thomas Renninger <tr...@suse.de>
> Cc: Yinghai Lu <ying...@kernel.org>
> Cc: Frederik Himpe <fhi...@vub.ac.be>
> Cc: David Haerdeman <da...@hardeman.nu>
> Cc: Alan Stern <st...@rowland.harvard.edu>
>
> Reviewed-by: Thomas Renninger <tr...@suse.de>
> Signed-off-by: Hannes Reinecke <h...@suse.de>
>
> diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
> index 622b4a4..2b487d4 100644
> --- a/drivers/usb/core/hcd-pci.c
> +++ b/drivers/usb/core/hcd-pci.c
> @@ -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,15 +188,19 @@ 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) {
> - dev_err(&dev->dev,
> - "Found HC with no IRQ. Check BIOS/PCI %s setup!\n",
> - pci_name(dev));
> - retval = -ENODEV;
> - goto disable_pci;
> + 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));
> @@ -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);
> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
> index f1f01a8..849470b 100644
> --- a/drivers/usb/host/xhci.c
> +++ b/drivers/usb/host/xhci.c
> @@ -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);
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
