| Message ID | 20221111122015.271447896@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:55:01PM +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_msi_enabled() 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 | 12 ++++++++++++ > drivers/pci/msi/msi.c | 14 +------------- > drivers/pci/msi/msi.h | 3 +++ > 3 files changed, 16 insertions(+), 13 deletions(-) > --- > diff --git a/drivers/pci/msi/api.c b/drivers/pci/msi/api.c > index 473df7ba0584..ee9ed5ccd94d 100644 > --- a/drivers/pci/msi/api.c > +++ b/drivers/pci/msi/api.c > @@ -307,3 +307,15 @@ void pci_free_irq_vectors(struct pci_dev *dev) > pci_disable_msi(dev); > } > EXPORT_SYMBOL(pci_free_irq_vectors); > + > +/** > + * pci_msi_enabled() - Are MSI(-X) interrupts enabled system-wide? > + * > + * Return: true if MSI has not been globally disabled through ACPI FADT, > + * PCI bridge quirks, or the "pci=nomsi" kernel command-line option. > + */ > +int pci_msi_enabled(void) > +{ > + return pci_msi_enable; > +} > +EXPORT_SYMBOL(pci_msi_enabled); > diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c > index d78646d1c116..59c33bc7fe81 100644 > --- a/drivers/pci/msi/msi.c > +++ b/drivers/pci/msi/msi.c > @@ -13,7 +13,7 @@ > #include "../pci.h" > #include "msi.h" > > -static int pci_msi_enable = 1; > +int pci_msi_enable = 1; > int pci_msi_ignore_mask; > > void pci_msi_update_mask(struct msi_desc *desc, u32 clear, u32 set) > @@ -864,15 +864,3 @@ void pci_no_msi(void) > { > pci_msi_enable = 0; > } > - > -/** > - * pci_msi_enabled - is MSI enabled? > - * > - * Returns true if MSI has not been disabled by the command-line option > - * pci=nomsi. > - **/ > -int pci_msi_enabled(void) > -{ > - return pci_msi_enable; > -} > -EXPORT_SYMBOL(pci_msi_enabled); > diff --git a/drivers/pci/msi/msi.h b/drivers/pci/msi/msi.h > index 77e2587f7e4f..f3f4ede53171 100644 > --- a/drivers/pci/msi/msi.h > +++ b/drivers/pci/msi/msi.h > @@ -84,6 +84,9 @@ static inline __attribute_const__ u32 msi_multi_mask(struct msi_desc *desc) > return (1 << (1 << desc->pci.msi_attrib.multi_cap)) - 1; > } > > +/* Subsystem variables */ > +extern int pci_msi_enable; > + > /* MSI internal functions invoked from the public APIs */ > void pci_msi_shutdown(struct pci_dev *dev); > void pci_msix_shutdown(struct pci_dev *dev); >
diff --git a/drivers/pci/msi/api.c b/drivers/pci/msi/api.c index 473df7ba0584..ee9ed5ccd94d 100644 --- a/drivers/pci/msi/api.c +++ b/drivers/pci/msi/api.c @@ -307,3 +307,15 @@ void pci_free_irq_vectors(struct pci_dev *dev) pci_disable_msi(dev); } EXPORT_SYMBOL(pci_free_irq_vectors); + +/** + * pci_msi_enabled() - Are MSI(-X) interrupts enabled system-wide? + * + * Return: true if MSI has not been globally disabled through ACPI FADT, + * PCI bridge quirks, or the "pci=nomsi" kernel command-line option. + */ +int pci_msi_enabled(void) +{ + return pci_msi_enable; +} +EXPORT_SYMBOL(pci_msi_enabled); diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c index d78646d1c116..59c33bc7fe81 100644 --- a/drivers/pci/msi/msi.c +++ b/drivers/pci/msi/msi.c @@ -13,7 +13,7 @@ #include "../pci.h" #include "msi.h" -static int pci_msi_enable = 1; +int pci_msi_enable = 1; int pci_msi_ignore_mask; void pci_msi_update_mask(struct msi_desc *desc, u32 clear, u32 set) @@ -864,15 +864,3 @@ void pci_no_msi(void) { pci_msi_enable = 0; } - -/** - * pci_msi_enabled - is MSI enabled? - * - * Returns true if MSI has not been disabled by the command-line option - * pci=nomsi. - **/ -int pci_msi_enabled(void) -{ - return pci_msi_enable; -} -EXPORT_SYMBOL(pci_msi_enabled); diff --git a/drivers/pci/msi/msi.h b/drivers/pci/msi/msi.h index 77e2587f7e4f..f3f4ede53171 100644 --- a/drivers/pci/msi/msi.h +++ b/drivers/pci/msi/msi.h @@ -84,6 +84,9 @@ static inline __attribute_const__ u32 msi_multi_mask(struct msi_desc *desc) return (1 << (1 << desc->pci.msi_attrib.multi_cap)) - 1; } +/* Subsystem variables */ +extern int pci_msi_enable; + /* MSI internal functions invoked from the public APIs */ void pci_msi_shutdown(struct pci_dev *dev); void pci_msix_shutdown(struct pci_dev *dev);