Commit bbda3407 authored by Ahmed S. Darwish's avatar Ahmed S. Darwish Committed by Thomas Gleixner
Browse files

PCI/MSI: Move pci_enable_msi() API to api.c 



To disentangle the maze in msi.c all exported device-driver MSI APIs are
now to be grouped in one file, api.c.

Move pci_enable_msi() and make its kernel-doc comprehensive.

Signed-off-by: default avatarAhmed S. Darwish <darwi@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/r/20221111122014.755178149@linutronix.de
parent b12d0bec

drivers/pci/msi/api.c

+23 −0
Original line number Diff line number Diff line
@@ -12,6 +12,29 @@ 


#include "msi.h"



/**

 * pci_enable_msi() - Enable MSI interrupt mode on device

 * @dev: the PCI device to operate on

 *

 * Legacy device driver API to enable MSI interrupts mode on device and

 * allocate a single interrupt vector. On success, the allocated vector

 * Linux IRQ will be saved at @dev->irq. The driver must invoke

 * pci_disable_msi() on cleanup.

 *

 * NOTE: The newer pci_alloc_irq_vectors() / pci_free_irq_vectors() API

 * pair should, in general, be used instead.

 *

 * Return: 0 on success, errno otherwise

 */

int pci_enable_msi(struct pci_dev *dev)

{

	int rc = __pci_enable_msi_range(dev, 1, 1, NULL);

	if (rc < 0)

		return rc;

	return 0;

}

EXPORT_SYMBOL(pci_enable_msi);



/**

 * pci_disable_msi() - Disable MSI interrupt mode on device

 * @dev: the PCI device to operate on

drivers/pci/msi/msi.c

+2 −12
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ void pci_disable_msix(struct pci_dev *dev) 
}

EXPORT_SYMBOL(pci_disable_msix);



static int __pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec,

int __pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec,

			   struct irq_affinity *affd)

{

	int nvec;
@@ -844,16 +844,6 @@ static int __pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec, 
	}

}



/* deprecated, don't use */

int pci_enable_msi(struct pci_dev *dev)

{

	int rc = __pci_enable_msi_range(dev, 1, 1, NULL);

	if (rc < 0)

		return rc;

	return 0;

}

EXPORT_SYMBOL(pci_enable_msi);



static int __pci_enable_msix_range(struct pci_dev *dev,

				   struct msix_entry *entries, int minvec,

				   int maxvec, struct irq_affinity *affd,

drivers/pci/msi/msi.h

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ static inline __attribute_const__ u32 msi_multi_mask(struct msi_desc *desc) 
/* MSI internal functions invoked from the public APIs */

void pci_msi_shutdown(struct pci_dev *dev);

void pci_free_msi_irqs(struct pci_dev *dev);

int __pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec, struct irq_affinity *affd);



/* Legacy (!IRQDOMAIN) fallbacks */

#ifdef CONFIG_PCI_MSI_ARCH_FALLBACKS