powerpc: Add MSI operations to pci_controller_ops struct

Add MSI setup and teardown functions to pci_controller_ops.

Patch the callsites (arch_{setup,teardown}_msi_irqs) to prefer the
controller ops version if it's available.

Signed-off-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h
index 1811c44bf34bcb6564036a76fb5b7a63563edf83..a3b6252bcfc9f45284ec1814ed8d924aea8c4c12 100644 (file)
--- a/arch/powerpc/include/asm/pci-bridge.h
+++ b/arch/powerpc/include/asm/pci-bridge.h
@@ -30,6 +30,12 @@ struct pci_controller_ops {
        /* Called during PCI resource reassignment */
        resource_size_t (*window_alignment)(struct pci_bus *, unsigned long type);
        void            (*reset_secondary_bus)(struct pci_dev *dev);
+
+#ifdef CONFIG_PCI_MSI
+       int             (*setup_msi_irqs)(struct pci_dev *dev,
+                                         int nvec, int type);
+       void            (*teardown_msi_irqs)(struct pci_dev *dev);
+#endif
 };
 
 /*

diff --git a/arch/powerpc/kernel/msi.c b/arch/powerpc/kernel/msi.c
index 71bd161640cfc8d101e03117582229823d365676..3d452f71fa2515ba3cc2897568e1a9362c1396a4 100644 (file)
--- a/arch/powerpc/kernel/msi.c
+++ b/arch/powerpc/kernel/msi.c
@@ -15,7 +15,11 @@
 
 int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 {
-       if (!ppc_md.setup_msi_irqs || !ppc_md.teardown_msi_irqs) {
+       struct pci_controller *phb = pci_bus_to_host(dev->bus);
+
+       if ((!phb->controller_ops.setup_msi_irqs ||
+            !phb->controller_ops.teardown_msi_irqs) &&
+           (!ppc_md.setup_msi_irqs || !ppc_md.teardown_msi_irqs)) {
                pr_debug("msi: Platform doesn't provide MSI callbacks.\n");
                return -ENOSYS;
        }
@@ -24,10 +28,18 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
        if (type == PCI_CAP_ID_MSI && nvec > 1)
                return 1;
 
-       return ppc_md.setup_msi_irqs(dev, nvec, type);
+       if (phb->controller_ops.setup_msi_irqs)
+               return phb->controller_ops.setup_msi_irqs(dev, nvec, type);
+       else
+               return ppc_md.setup_msi_irqs(dev, nvec, type);
 }
 
 void arch_teardown_msi_irqs(struct pci_dev *dev)
 {
-       ppc_md.teardown_msi_irqs(dev);
+       struct pci_controller *phb = pci_bus_to_host(dev->bus);
+
+       if (phb->controller_ops.teardown_msi_irqs)
+               phb->controller_ops.teardown_msi_irqs(dev);
+       else
+               ppc_md.teardown_msi_irqs(dev);
 }