Use MSI controller framework instead of arch MSI functions to configure MSI/MSI-X irq. So we can manage MSI/MSI-X irq in a unified framework. Signed-off-by: Yijing Wang <wangyijing@xxxxxxxxxx> --- arch/x86/include/asm/pci.h | 4 ++++ arch/x86/kernel/apic/io_apic.c | 25 +++++++++++++++++++++++++ arch/x86/pci/acpi.c | 1 + arch/x86/pci/common.c | 3 +++ 4 files changed, 33 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index 0892ea0..1af3d77 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -20,6 +20,9 @@ struct pci_sysdata { #ifdef CONFIG_X86_64 void *iommu; /* IOMMU private data */ #endif +#ifdef CONFIG_PCI_MSI + struct msi_controller *msi_ctrl; +#endif }; extern int pci_routeirq; @@ -101,6 +104,7 @@ void native_teardown_msi_irq(unsigned int irq); void native_restore_msi_irqs(struct pci_dev *dev); int setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc, unsigned int irq_base, unsigned int irq_offset); +extern struct msi_controller *x86_msi_ctrl; #else #define native_setup_msi_irqs NULL #define native_teardown_msi_irq NULL diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 1183d54..8b8c671 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -3234,11 +3234,36 @@ int native_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) return 0; } +static int __native_setup_msi_irqs(struct msi_controller *ctrl, + struct pci_dev *dev, int nvec, int type) +{ + return native_setup_msi_irqs(dev, nvec, type); +} + void native_teardown_msi_irq(unsigned int irq) { irq_free_hwirq(irq); } +static void __native_teardown_msi_irq(struct msi_controller *ctrl, + unsigned int irq) +{ + native_teardown_msi_irq(irq); +} + +static struct msi_controller native_msi_ctrl = { + .setup_irqs = __native_setup_msi_irqs, + .teardown_irq = __native_teardown_msi_irq, +}; + +struct msi_controller *pcibios_msi_controller(struct pci_bus *bus) +{ + struct pci_sysdata *sys = bus->sysdata; + + return sys->msi_ctrl; +} +struct msi_controller *x86_msi_ctrl = &native_msi_ctrl; + #ifdef CONFIG_DMAR_TABLE static int dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask, diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index cfd1b13..edb14dd 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -508,6 +508,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) sd = &info->sd; sd->domain = domain; + sd->msi_ctrl = x86_msi_ctrl; sd->node = node; sd->companion = device; diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 7b20bcc..4deb240 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -468,6 +468,9 @@ void pcibios_scan_root(int busnum) return; } sd->node = x86_pci_root_bus_node(busnum); +#ifdef CONFIG_PCI_MSI + sd->msi_ctrl = x86_msi_ctrl; +#endif x86_pci_root_bus_resources(busnum, &resources); printk(KERN_DEBUG "PCI: Probing PCI hardware (bus %02x)\n", busnum); bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, sd, &resources); -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-s390" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html