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

xhci: Move xhci MSI sync function to to xhci-pci 



Move function to sync MSI from xhci.c to xhci-pci.c to decouple PCI
specific code from generic xhci code.

No functional changes, function is an exact copy

[commit message rewording -Mathias]

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-15-mathias.nyman@linux.intel.com


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

drivers/usb/host/xhci-pci.c

+13 −1
Original line number Diff line number Diff line
@@ -88,6 +88,19 @@ static const struct xhci_driver_overrides xhci_pci_overrides __initconst = { 
	.update_hub_device = xhci_pci_update_hub_device,

};



static void xhci_msix_sync_irqs(struct xhci_hcd *xhci)

{

	struct usb_hcd *hcd = xhci_to_hcd(xhci);



	if (hcd->msix_enabled) {

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

		int i;



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

			synchronize_irq(pci_irq_vector(pdev, i));

	}

}



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

static void xhci_cleanup_msix(struct xhci_hcd *xhci)

{
@@ -779,7 +792,6 @@ static void xhci_sparse_control_quirk(struct usb_hcd *hcd) 
	writel(reg, hcd->regs + SPARSE_CNTL_ENABLE);

}



extern void xhci_msix_sync_irqs(struct xhci_hcd *xhci);

static int xhci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup)

{

	struct xhci_hcd	*xhci = hcd_to_xhci(hcd);

drivers/usb/host/xhci.c

+0 −24
Original line number Diff line number Diff line
@@ -318,30 +318,6 @@ static int xhci_disable_interrupter(struct xhci_interrupter *ir) 
	return 0;

}



#ifdef CONFIG_USB_PCI



void xhci_msix_sync_irqs(struct xhci_hcd *xhci)

{

	struct usb_hcd *hcd = xhci_to_hcd(xhci);



	if (hcd->msix_enabled) {

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

		int i;



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

			synchronize_irq(pci_irq_vector(pdev, i));

	}

}

EXPORT_SYMBOL_GPL(xhci_msix_sync_irqs);



#else



static inline void xhci_msix_sync_irqs(struct xhci_hcd *xhci)

{

}



#endif



static void compliance_mode_recovery(struct timer_list *t)

{

	struct xhci_hcd *xhci;