x86, msi: Use IRQ remapping specific setup_msi_irqs routine

Use seperate routines to setup MSI IRQs for both
irq_remapping_enabled cases.

Signed-off-by: Joerg Roedel <joro@8bytes.org>
Acked-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

1 files changed, 109 insertions, 3 deletions

diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
index 0baad3b9ecba..20f04b67efd2 100644
--- a/drivers/iommu/irq_remapping.c
+++ b/drivers/iommu/irq_remapping.c
@@ -4,6 +4,8 @@
 #include <linux/cpumask.h>
 #include <linux/errno.h>
 #include <linux/msi.h>
+#include <linux/irq.h>
+#include <linux/pci.h>
 
 #include <asm/hw_irq.h>
 #include <asm/irq_remapping.h>
@@ -21,6 +23,10 @@ int no_x2apic_optout;
 
 static struct irq_remap_ops *remap_ops;
 
+static int msi_alloc_remapped_irq(struct pci_dev *pdev, int irq, int nvec);
+static int msi_setup_remapped_irq(struct pci_dev *pdev, unsigned int irq,
+                                  int index, int sub_handle);
+
 static void irq_remapping_disable_io_apic(void)
 {
         /*
@@ -34,9 +40,109 @@ static void irq_remapping_disable_io_apic(void)
                 disconnect_bsp_APIC(0);
 }
 
+static int do_setup_msi_irqs(struct pci_dev *dev, int nvec)
+{
+        int node, ret, sub_handle, index = 0;
+        unsigned int irq;
+        struct msi_desc *msidesc;
+
+        nvec = __roundup_pow_of_two(nvec);
+
+        WARN_ON(!list_is_singular(&dev->msi_list));
+        msidesc = list_entry(dev->msi_list.next, struct msi_desc, list);
+        WARN_ON(msidesc->irq);
+        WARN_ON(msidesc->msi_attrib.multiple);
+
+        node = dev_to_node(&dev->dev);
+        irq = __create_irqs(get_nr_irqs_gsi(), nvec, node);
+        if (irq == 0)
+                return -ENOSPC;
+
+        msidesc->msi_attrib.multiple = ilog2(nvec);
+        for (sub_handle = 0; sub_handle < nvec; sub_handle++) {
+                if (!sub_handle) {
+                        index = msi_alloc_remapped_irq(dev, irq, nvec);
+                        if (index < 0) {
+                                ret = index;
+                                goto error;
+                        }
+                } else {
+                        ret = msi_setup_remapped_irq(dev, irq + sub_handle,
+                                                     index, sub_handle);
+                        if (ret < 0)
+                                goto error;
+                }
+                ret = setup_msi_irq(dev, msidesc, irq, sub_handle);
+                if (ret < 0)
+                        goto error;
+        }
+        return 0;
+
+error:
+        destroy_irqs(irq, nvec);
+
+        /*
+         * Restore altered MSI descriptor fields and prevent just destroyed
+         * IRQs from tearing down again in default_teardown_msi_irqs()
+         */
+        msidesc->irq = 0;
+        msidesc->msi_attrib.multiple = 0;
+
+        return ret;
+}
+
+static int do_setup_msix_irqs(struct pci_dev *dev, int nvec)
+{
+        int node, ret, sub_handle, index = 0;
+        struct msi_desc *msidesc;
+        unsigned int irq;
+
+        node            = dev_to_node(&dev->dev);
+        irq             = get_nr_irqs_gsi();
+        sub_handle      = 0;
+
+        list_for_each_entry(msidesc, &dev->msi_list, list) {
+
+                irq = create_irq_nr(irq, node);
+                if (irq == 0)
+                        return -1;
+
+                if (sub_handle == 0)
+                        ret = index = msi_alloc_remapped_irq(dev, irq, nvec);
+                else
+                        ret = msi_setup_remapped_irq(dev, irq, index, sub_handle);
+
+                if (ret < 0)
+                        goto error;
+
+                ret = setup_msi_irq(dev, msidesc, irq, 0);
+                if (ret < 0)
+                        goto error;
+
+                sub_handle += 1;
+                irq        += 1;
+        }
+
+        return 0;
+
+error:
+        destroy_irq(irq);
+        return ret;
+}
+
+static int irq_remapping_setup_msi_irqs(struct pci_dev *dev,
+                                        int nvec, int type)
+{
+        if (type == PCI_CAP_ID_MSI)
+                return do_setup_msi_irqs(dev, nvec);
+        else
+                return do_setup_msix_irqs(dev, nvec);
+}
+
 static void __init irq_remapping_modify_x86_ops(void)
 {
         x86_io_apic_ops.disable         = irq_remapping_disable_io_apic;
+        x86_msi.setup_msi_irqs          = irq_remapping_setup_msi_irqs;
         x86_msi.setup_hpet_msi          = setup_hpet_msi_remapped;
 }
 
@@ -186,7 +292,7 @@ void compose_remapped_msi_msg(struct pci_dev *pdev,
         remap_ops->compose_msi_msg(pdev, irq, dest, msg, hpet_id);
 }
 
-int msi_alloc_remapped_irq(struct pci_dev *pdev, int irq, int nvec)
+static int msi_alloc_remapped_irq(struct pci_dev *pdev, int irq, int nvec)
 {
         if (!remap_ops || !remap_ops->msi_alloc_irq)
                 return -ENODEV;
@@ -194,8 +300,8 @@ int msi_alloc_remapped_irq(struct pci_dev *pdev, int irq, int nvec)
         return remap_ops->msi_alloc_irq(pdev, irq, nvec);
 }
 
-int msi_setup_remapped_irq(struct pci_dev *pdev, unsigned int irq,
-                           int index, int sub_handle)
+static int msi_setup_remapped_irq(struct pci_dev *pdev, unsigned int irq,
+                                  int index, int sub_handle)
 {
         if (!remap_ops || !remap_ops->msi_setup_irq)
                 return -ENODEV;