nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

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

Browse source 
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: Josue David Hernandez Gutierrez <josue.d.hernandez.gutierrez@intel.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20230317154715.535523-15-mathias.nyman@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Josue David Hernandez Gutierrez 2023-03-17 17:47:15 +02:00 committed by Greg Kroah-Hartman
parent 0c540438c6
commit 9abe15d55d
2 changed files with 13 additions and 25 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

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

@ -88,6 +88,19 @@ static const struct xhci_driver_overrides xhci_pci_overrides __initconst = {
.update_hub_device = xhci_pci_update_hub_device, .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 */ /* Free any IRQs and disable MSI-X */
static void xhci_cleanup_msix(struct xhci_hcd *xhci) 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); 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) static int xhci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup)
{ {
struct xhci_hcd *xhci = hcd_to_xhci(hcd); struct xhci_hcd *xhci = hcd_to_xhci(hcd);

24
drivers/usb/host/xhci.c
View file

@ -318,30 +318,6 @@ static int xhci_disable_interrupter(struct xhci_interrupter *ir)
return 0; 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) static void compliance_mode_recovery(struct timer_list *t)
{ {
struct xhci_hcd *xhci; struct xhci_hcd *xhci;