| Message ID | 20221111122015.099461602@linutronix.de (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | genirq, PCI/MSI: Support for per device MSI and PCI/IMS - Part 1 cleanups | expand |
On Fri, Nov 11, 2022 at 02:54:56PM +0100, Thomas Gleixner wrote: > From: Ahmed S. Darwish <darwi@linutronix.de> > > To distangle the maze in msi.c, all exported device-driver MSI APIs are > now to be grouped in one file, api.c. > > Move pci_msix_vec_count() and make its kernel-doc comprehensive. > > Signed-off-by: Ahmed S. Darwish <darwi@linutronix.de> > Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Bjorn Helgaas <bhelgaas@google.com> > --- > drivers/pci/msi/api.c | 20 ++++++++++++++++++++ > drivers/pci/msi/msi.c | 20 -------------------- > 2 files changed, 20 insertions(+), 20 deletions(-) > --- > diff --git a/drivers/pci/msi/api.c b/drivers/pci/msi/api.c > index 2ff2a9ccfc47..83ea38ffa116 100644 > --- a/drivers/pci/msi/api.c > +++ b/drivers/pci/msi/api.c > @@ -60,6 +60,26 @@ void pci_disable_msi(struct pci_dev *dev) > EXPORT_SYMBOL(pci_disable_msi); > > /** > + * pci_msix_vec_count() - Get number of MSI-X interrupt vectors on device > + * @dev: the PCI device to operate on > + * > + * Return: number of MSI-X interrupt vectors available on this device > + * (i.e., the device's MSI-X capability structure "table size"), -EINVAL > + * if the device is not MSI-X capable, other errnos otherwise. > + */ > +int pci_msix_vec_count(struct pci_dev *dev) > +{ > + u16 control; > + > + if (!dev->msix_cap) > + return -EINVAL; > + > + pci_read_config_word(dev, dev->msix_cap + PCI_MSIX_FLAGS, &control); > + return msix_table_size(control); > +} > +EXPORT_SYMBOL(pci_msix_vec_count); > + > +/** > * pci_enable_msix_range() - Enable MSI-X interrupt mode on device > * @dev: the PCI device to operate on > * @entries: input/output parameter, array of MSI-X configuration entries > diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c > index ed8caf5ac99f..1226d66da992 100644 > --- a/drivers/pci/msi/msi.c > +++ b/drivers/pci/msi/msi.c > @@ -701,26 +701,6 @@ void pci_msi_shutdown(struct pci_dev *dev) > pcibios_alloc_irq(dev); > } > > -/** > - * pci_msix_vec_count - return the number of device's MSI-X table entries > - * @dev: pointer to the pci_dev data structure of MSI-X device function > - * This function returns the number of device's MSI-X table entries and > - * therefore the number of MSI-X vectors device is capable of sending. > - * It returns a negative errno if the device is not capable of sending MSI-X > - * interrupts. > - **/ > -int pci_msix_vec_count(struct pci_dev *dev) > -{ > - u16 control; > - > - if (!dev->msix_cap) > - return -EINVAL; > - > - pci_read_config_word(dev, dev->msix_cap + PCI_MSIX_FLAGS, &control); > - return msix_table_size(control); > -} > -EXPORT_SYMBOL(pci_msix_vec_count); > - > static int __pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, > int nvec, struct irq_affinity *affd, int flags) > { >
diff --git a/drivers/pci/msi/api.c b/drivers/pci/msi/api.c index 2ff2a9ccfc47..83ea38ffa116 100644 --- a/drivers/pci/msi/api.c +++ b/drivers/pci/msi/api.c @@ -60,6 +60,26 @@ void pci_disable_msi(struct pci_dev *dev) EXPORT_SYMBOL(pci_disable_msi); /** + * pci_msix_vec_count() - Get number of MSI-X interrupt vectors on device + * @dev: the PCI device to operate on + * + * Return: number of MSI-X interrupt vectors available on this device + * (i.e., the device's MSI-X capability structure "table size"), -EINVAL + * if the device is not MSI-X capable, other errnos otherwise. + */ +int pci_msix_vec_count(struct pci_dev *dev) +{ + u16 control; + + if (!dev->msix_cap) + return -EINVAL; + + pci_read_config_word(dev, dev->msix_cap + PCI_MSIX_FLAGS, &control); + return msix_table_size(control); +} +EXPORT_SYMBOL(pci_msix_vec_count); + +/** * pci_enable_msix_range() - Enable MSI-X interrupt mode on device * @dev: the PCI device to operate on * @entries: input/output parameter, array of MSI-X configuration entries diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c index ed8caf5ac99f..1226d66da992 100644 --- a/drivers/pci/msi/msi.c +++ b/drivers/pci/msi/msi.c @@ -701,26 +701,6 @@ void pci_msi_shutdown(struct pci_dev *dev) pcibios_alloc_irq(dev); } -/** - * pci_msix_vec_count - return the number of device's MSI-X table entries - * @dev: pointer to the pci_dev data structure of MSI-X device function - * This function returns the number of device's MSI-X table entries and - * therefore the number of MSI-X vectors device is capable of sending. - * It returns a negative errno if the device is not capable of sending MSI-X - * interrupts. - **/ -int pci_msix_vec_count(struct pci_dev *dev) -{ - u16 control; - - if (!dev->msix_cap) - return -EINVAL; - - pci_read_config_word(dev, dev->msix_cap + PCI_MSIX_FLAGS, &control); - return msix_table_size(control); -} -EXPORT_SYMBOL(pci_msix_vec_count); - static int __pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec, struct irq_affinity *affd, int flags) {