Commit a01e09ef authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

PCI/MSI: Split out !IRQDOMAIN code 



Split out the non irqdomain code into its own file.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarJuergen Gross <jgross@suse.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/r/20211206210224.763574089@linutronix.de
parent 54324c2f

drivers/pci/msi/Makefile

+3 −2
Original line number Original line Diff line number Diff line
@@ -3,3 +3,4 @@ 
# Makefile for the PCI/MSI

# Makefile for the PCI/MSI

obj-$(CONFIG_PCI)			+= pcidev_msi.o

obj-$(CONFIG_PCI)			+= pcidev_msi.o

obj-$(CONFIG_PCI_MSI)			+= msi.o

obj-$(CONFIG_PCI_MSI)			+= msi.o

obj-$(CONFIG_PCI_MSI_ARCH_FALLBACKS)	+= legacy.o

drivers/pci/msi/legacy.c

0 → 100644
+52 −0
Original line number Original line Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * PCI Message Signaled Interrupt (MSI).

 *

 * Legacy architecture specific setup and teardown mechanism.

 */

#include <linux/msi.h>

#include <linux/pci.h>



/* Arch hooks */

int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)

{

	return -EINVAL;

}



void __weak arch_teardown_msi_irq(unsigned int irq)

{

}



int __weak arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)

{

	struct msi_desc *desc;

	int ret;



	/*

	 * If an architecture wants to support multiple MSI, it needs to

	 * override arch_setup_msi_irqs()

	 */

	if (type == PCI_CAP_ID_MSI && nvec > 1)

		return 1;



	for_each_pci_msi_entry(desc, dev) {

		ret = arch_setup_msi_irq(dev, desc);

		if (ret)

			return ret < 0 ? ret : -ENOSPC;

	}



	return 0;

}



void __weak arch_teardown_msi_irqs(struct pci_dev *dev)

{

	struct msi_desc *desc;

	int i;



	for_each_pci_msi_entry(desc, dev) {

		if (desc->irq) {

			for (i = 0; i < desc->nvec_used; i++)

				arch_teardown_msi_irq(desc->irq + i);

		}

	}

}

drivers/pci/msi/msi.c

+0 −46
Original line number Original line Diff line number Diff line
@@ -50,52 +50,6 @@ static void pci_msi_teardown_msi_irqs(struct pci_dev *dev) 
#define pci_msi_teardown_msi_irqs	arch_teardown_msi_irqs

#define pci_msi_teardown_msi_irqs	arch_teardown_msi_irqs

#endif

#endif





#ifdef CONFIG_PCI_MSI_ARCH_FALLBACKS

/* Arch hooks */

int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)

{

	return -EINVAL;

}



void __weak arch_teardown_msi_irq(unsigned int irq)

{

}



int __weak arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)

{

	struct msi_desc *entry;

	int ret;



	/*

	 * If an architecture wants to support multiple MSI, it needs to

	 * override arch_setup_msi_irqs()

	 */

	if (type == PCI_CAP_ID_MSI && nvec > 1)

		return 1;



	for_each_pci_msi_entry(entry, dev) {

		ret = arch_setup_msi_irq(dev, entry);

		if (ret < 0)

			return ret;

		if (ret > 0)

			return -ENOSPC;

	}



	return 0;

}



void __weak arch_teardown_msi_irqs(struct pci_dev *dev)

{

	int i;

	struct msi_desc *entry;



	for_each_pci_msi_entry(entry, dev)

		if (entry->irq)

			for (i = 0; i < entry->nvec_used; i++)

				arch_teardown_msi_irq(entry->irq + i);

}

#endif /* CONFIG_PCI_MSI_ARCH_FALLBACKS */



/*

/*

 * PCI 2.3 does not specify mask bits for each MSI interrupt.  Attempting to

 * PCI 2.3 does not specify mask bits for each MSI interrupt.  Attempting to

 * mask all MSI interrupts by clearing the MSI enable bit does not work

 * mask all MSI interrupts by clearing the MSI enable bit does not work