UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

PCI/MSI: Use msi_get_virq() in pci_get_vector() 

Use msi_get_vector() and handle the return value to be compatible.

No functional change intended.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Michael Kelley <mikelley@microsoft.com>
Tested-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20211210221814.841243231@linutronix.de
This commit is contained in:
Thomas Gleixner 2021-12-10 23:19:25 +01:00
parent cf15f43aca
commit 82ff8e6b78
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/pci/msi/msi.c
View File

@ -1080,28 +1080,13 @@ EXPORT_SYMBOL(pci_free_irq_vectors);
*/ */
int pci_irq_vector(struct pci_dev *dev, unsigned int nr) int pci_irq_vector(struct pci_dev *dev, unsigned int nr)
{ {
if (dev->msix_enabled) { unsigned int irq;
struct msi_desc *entry;
for_each_pci_msi_entry(entry, dev) { if (!dev->msi_enabled && !dev->msix_enabled)
if (entry->msi_index == nr) return !nr ? dev->irq : -EINVAL;
return entry->irq;
}
WARN_ON_ONCE(1);
return -EINVAL;
}
if (dev->msi_enabled) { irq = msi_get_virq(&dev->dev, nr);
struct msi_desc *entry = first_pci_msi_entry(dev); return irq ? irq : -EINVAL;
if (WARN_ON_ONCE(nr >= entry->nvec_used))
return -EINVAL;
} else {
if (WARN_ON_ONCE(nr > 0))
return -EINVAL;
}
return dev->irq + nr;
} }
EXPORT_SYMBOL(pci_irq_vector); EXPORT_SYMBOL(pci_irq_vector);