Commit ba47b1aa authored by Josue David Hernandez Gutierrez's avatar Josue David Hernandez Gutierrez Committed by Greg Kroah-Hartman
Browse files

xhci: Move functions to cleanup MSI to xhci-pci 



Move function to cleanup MSI from xhci.c to xhci-pci.c
This is to decouple PCI specific code from generic xhci code.

No functional changes, function is an exact copy

Signed-off-by: default avatarJosue David Hernandez Gutierrez <josue.d.hernandez.gutierrez@intel.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20230317154715.535523-13-mathias.nyman@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ed526ba2

drivers/usb/host/xhci-pci.c

+26 −0
Original line number Diff line number Diff line
@@ -88,6 +88,32 @@ static const struct xhci_driver_overrides xhci_pci_overrides __initconst = { 
	.update_hub_device = xhci_pci_update_hub_device,

};



/* Free any IRQs and disable MSI-X */

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;



	if (hcd->msix_enabled) {

		int i;



		for (i = 0; i < xhci->msix_count; i++)

			free_irq(pci_irq_vector(pdev, i), xhci_to_hcd(xhci));

	} else {

		free_irq(pci_irq_vector(pdev, 0), xhci_to_hcd(xhci));

	}



	pci_free_irq_vectors(pdev);

	hcd->msix_enabled = 0;

}



/*

 * Set up MSI

 */

drivers/usb/host/xhci.c

+0 −31
Original line number Diff line number Diff line
@@ -320,33 +320,6 @@ static int xhci_disable_interrupter(struct xhci_interrupter *ir) 


#ifdef CONFIG_USB_PCI



/* Free any IRQs and disable MSI-X */

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;



	if (hcd->msix_enabled) {

		int i;



		for (i = 0; i < xhci->msix_count; i++)

			free_irq(pci_irq_vector(pdev, i), xhci_to_hcd(xhci));

	} else {

		free_irq(pci_irq_vector(pdev, 0), xhci_to_hcd(xhci));

	}



	pci_free_irq_vectors(pdev);

	hcd->msix_enabled = 0;

}

EXPORT_SYMBOL_GPL(xhci_cleanup_msix);



static void __maybe_unused xhci_msix_sync_irqs(struct xhci_hcd *xhci)

{

	struct usb_hcd *hcd = xhci_to_hcd(xhci);
@@ -362,10 +335,6 @@ static void __maybe_unused xhci_msix_sync_irqs(struct xhci_hcd *xhci) 


#else



static inline void xhci_cleanup_msix(struct xhci_hcd *xhci)

{

}



static inline void xhci_msix_sync_irqs(struct xhci_hcd *xhci)

{

}

drivers/usb/host/xhci.h

+0 −1
Original line number Diff line number Diff line
@@ -2144,7 +2144,6 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated); 


irqreturn_t xhci_irq(struct usb_hcd *hcd);

irqreturn_t xhci_msi_irq(int irq, void *hcd);

void xhci_cleanup_msix(struct xhci_hcd *xhci);

int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev);

int xhci_alloc_tt_info(struct xhci_hcd *xhci,

		struct xhci_virt_device *virt_dev,