mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-07 00:59:06 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
[ Upstream commit 0a4776205b ]

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: Mathias Nyman <mathias.nyman@linux.intel.com>
Message-ID: <20230602144009.1225632-5-mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Mathias Nyman 2023-06-02 17:40:02 +03:00 committed by Greg Kroah-Hartman
parent 84ee489395
commit 000dd3a768
6 changed files with 3 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/usb/host/xhci-histb.c
View file

@ -164,16 +164,6 @@ static void xhci_histb_host_disable(struct xhci_hcd_histb *histb)
clk_disable_unprepare(histb->bus_clk); 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 */ /* called during probe() after chip reset completes */
static int xhci_histb_setup(struct usb_hcd *hcd) 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 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 = { static const struct xhci_driver_overrides xhci_histb_overrides __initconst = {

6
drivers/usb/host/xhci-mtk.c
View file

@ -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 usb_hcd *hcd = xhci_to_hcd(xhci);
struct xhci_hcd_mtk *mtk = hcd_to_mtk(hcd); 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; xhci->quirks |= XHCI_MTK_HOST;
/* /*
* MTK host controller gives a spurious successful event after a * MTK host controller gives a spurious successful event after a

7
drivers/usb/host/xhci-pci.c
View file

@ -108,9 +108,6 @@ static void xhci_cleanup_msix(struct xhci_hcd *xhci)
struct usb_hcd *hcd = xhci_to_hcd(xhci); struct usb_hcd *hcd = xhci_to_hcd(xhci);
struct pci_dev *pdev = to_pci_dev(hcd->self.controller); struct pci_dev *pdev = to_pci_dev(hcd->self.controller);
if (xhci->quirks & XHCI_PLAT)
return;
/* return if using legacy interrupt */ /* return if using legacy interrupt */
if (hcd->irq > 0) if (hcd->irq > 0)
return; return;
@ -208,10 +205,6 @@ static int xhci_try_enable_msi(struct usb_hcd *hcd)
struct pci_dev *pdev; struct pci_dev *pdev;
int ret; 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); pdev = to_pci_dev(xhci_to_hcd(xhci)->self.controller);
/* /*
* Some Fresco Logic host controllers advertise MSI, but fail to * Some Fresco Logic host controllers advertise MSI, but fail to

7
drivers/usb/host/xhci-plat.c
View file

@ -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); struct xhci_plat_priv *priv = xhci_to_priv(xhci);
/* xhci->quirks |= priv->quirks;
* 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;
} }
/* called during probe() after chip reset completes */ /* called during probe() after chip reset completes */

1
drivers/usb/host/xhci-tegra.c
View file

@ -2662,7 +2662,6 @@ static void tegra_xhci_quirks(struct device *dev, struct xhci_hcd *xhci)
{ {
struct tegra_xusb *tegra = dev_get_drvdata(dev); struct tegra_xusb *tegra = dev_get_drvdata(dev);
xhci->quirks |= XHCI_PLAT;
if (tegra && tegra->soc->lpm_support) if (tegra && tegra->soc->lpm_support)
xhci->quirks |= XHCI_LPM_SUPPORT; xhci->quirks |= XHCI_LPM_SUPPORT;
} }

2
drivers/usb/host/xhci.h
View file

@ -1874,7 +1874,7 @@ struct xhci_hcd {
#define XHCI_SPURIOUS_REBOOT BIT_ULL(13) #define XHCI_SPURIOUS_REBOOT BIT_ULL(13)
#define XHCI_COMP_MODE_QUIRK BIT_ULL(14) #define XHCI_COMP_MODE_QUIRK BIT_ULL(14)
#define XHCI_AVOID_BEI BIT_ULL(15) #define XHCI_AVOID_BEI BIT_ULL(15)
#define XHCI_PLAT BIT_ULL(16) #define XHCI_PLAT BIT_ULL(16) /* Deprecated */
#define XHCI_SLOW_SUSPEND BIT_ULL(17) #define XHCI_SLOW_SUSPEND BIT_ULL(17)
#define XHCI_SPURIOUS_WAKEUP BIT_ULL(18) #define XHCI_SPURIOUS_WAKEUP BIT_ULL(18)
/* For controllers with a broken beyond repair streams implementation */ /* For controllers with a broken beyond repair streams implementation */