Commit 0a477620 authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: get rid of XHCI_PLAT quirk that used to prevent MSI setup 



The XHCI_PLAT quirk was only needed to ensure non-PCI xHC host avoided
setting up MSI interrupts in generic xhci codepaths.

The MSI setup code is now moved to PCI specific xhci-pci.c file so
the quirk is no longer needed.

Remove setting the XHCI_PLAT quirk for HiSilocon SoC xHC, NVIDIA Tegra xHC,
MediaTek xHC, the generic xhci-plat driver, and the checks for XHCI_PLAT
in xhci-pci.c MSI setup code.

Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Message-ID: <20230602144009.1225632-5-mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9b907c91

drivers/usb/host/xhci-histb.c

+1 −11
Original line number Diff line number Diff line
@@ -164,16 +164,6 @@ static void xhci_histb_host_disable(struct xhci_hcd_histb *histb) 
	clk_disable_unprepare(histb->bus_clk);

}



static void xhci_histb_quirks(struct device *dev, struct xhci_hcd *xhci)

{

	/*

	 * As of now platform drivers don't provide MSI support so we ensure

	 * here that the generic code does not try to make a pci_dev from our

	 * dev struct in order to setup MSI

	 */

	xhci->quirks |= XHCI_PLAT;

}



/* called during probe() after chip reset completes */

static int xhci_histb_setup(struct usb_hcd *hcd)

{
@@ -186,7 +176,7 @@ static int xhci_histb_setup(struct usb_hcd *hcd) 
			return ret;

	}



	return xhci_gen_setup(hcd, xhci_histb_quirks);

	return xhci_gen_setup(hcd, NULL);

}



static const struct xhci_driver_overrides xhci_histb_overrides __initconst = {

drivers/usb/host/xhci-mtk.c

+0 −6
Original line number Diff line number Diff line
@@ -418,12 +418,6 @@ static void xhci_mtk_quirks(struct device *dev, struct xhci_hcd *xhci) 
	struct usb_hcd *hcd = xhci_to_hcd(xhci);

	struct xhci_hcd_mtk *mtk = hcd_to_mtk(hcd);



	/*

	 * As of now platform drivers don't provide MSI support so we ensure

	 * here that the generic code does not try to make a pci_dev from our

	 * dev struct in order to setup MSI

	 */

	xhci->quirks |= XHCI_PLAT;

	xhci->quirks |= XHCI_MTK_HOST;

	/*

	 * MTK host controller gives a spurious successful event after a

drivers/usb/host/xhci-pci.c

+0 −7
Original line number Diff line number Diff line
@@ -108,9 +108,6 @@ static void xhci_cleanup_msix(struct xhci_hcd *xhci) 
	struct usb_hcd *hcd = xhci_to_hcd(xhci);

	struct pci_dev *pdev = to_pci_dev(hcd->self.controller);



	if (xhci->quirks & XHCI_PLAT)

		return;



	/* return if using legacy interrupt */

	if (hcd->irq > 0)

		return;
@@ -208,10 +205,6 @@ static int xhci_try_enable_msi(struct usb_hcd *hcd) 
	struct pci_dev  *pdev;

	int ret;



	/* The xhci platform device has set up IRQs through usb_add_hcd. */

	if (xhci->quirks & XHCI_PLAT)

		return 0;



	pdev = to_pci_dev(xhci_to_hcd(xhci)->self.controller);

	/*

	 * Some Fresco Logic host controllers advertise MSI, but fail to

drivers/usb/host/xhci-plat.c

+1 −6
Original line number Diff line number Diff line
@@ -78,12 +78,7 @@ static void xhci_plat_quirks(struct device *dev, struct xhci_hcd *xhci) 
{

	struct xhci_plat_priv *priv = xhci_to_priv(xhci);



	/*

	 * As of now platform drivers don't provide MSI support so we ensure

	 * here that the generic code does not try to make a pci_dev from our

	 * dev struct in order to setup MSI

	 */

	xhci->quirks |= XHCI_PLAT | priv->quirks;

	xhci->quirks |= priv->quirks;

}



/* called during probe() after chip reset completes */

drivers/usb/host/xhci-tegra.c

+0 −1
Original line number Diff line number Diff line
@@ -2663,7 +2663,6 @@ static void tegra_xhci_quirks(struct device *dev, struct xhci_hcd *xhci) 
{

	struct tegra_xusb *tegra = dev_get_drvdata(dev);



	xhci->quirks |= XHCI_PLAT;

	if (tegra && tegra->soc->lpm_support)

		xhci->quirks |= XHCI_LPM_SUPPORT;

}