iommu/vt-d: Convert MSI remapping setup to remap_ops

This patch introduces remapping-ops for setting ups MSI
interrupts.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>

3 files changed, 148 insertions, 0 deletions

diff --git a/drivers/iommu/intel_intr_remapping.c b/drivers/iommu/intel_intr_remapping.c
index 44a6e04a070b..a3bae67ec43c 100644
--- a/drivers/iommu/intel_intr_remapping.c
+++ b/drivers/iommu/intel_intr_remapping.c
@@ -13,6 +13,7 @@
 #include <acpi/acpi.h>
 #include <asm/intr_remapping.h>
 #include <asm/pci-direct.h>
+#include <asm/msidef.h>
 
 #include "intr_remapping.h"
 
@@ -955,6 +956,98 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,
         return 0;
 }
 
+static void intel_compose_msi_msg(struct pci_dev *pdev,
+                                  unsigned int irq, unsigned int dest,
+                                  struct msi_msg *msg, u8 hpet_id)
+{
+        struct irq_cfg *cfg;
+        struct irte irte;
+        u16 sub_handle;
+        int ir_index;
+
+        cfg = irq_get_chip_data(irq);
+
+        ir_index = map_irq_to_irte_handle(irq, &sub_handle);
+        BUG_ON(ir_index == -1);
+
+        prepare_irte(&irte, cfg->vector, dest);
+
+        /* Set source-id of interrupt request */
+        if (pdev)
+                set_msi_sid(&irte, pdev);
+        else
+                set_hpet_sid(&irte, hpet_id);
+
+        modify_irte(irq, &irte);
+
+        msg->address_hi = MSI_ADDR_BASE_HI;
+        msg->data = sub_handle;
+        msg->address_lo = MSI_ADDR_BASE_LO | MSI_ADDR_IR_EXT_INT |
+                          MSI_ADDR_IR_SHV |
+                          MSI_ADDR_IR_INDEX1(ir_index) |
+                          MSI_ADDR_IR_INDEX2(ir_index);
+}
+
+/*
+ * Map the PCI dev to the corresponding remapping hardware unit
+ * and allocate 'nvec' consecutive interrupt-remapping table entries
+ * in it.
+ */
+static int intel_msi_alloc_irq(struct pci_dev *dev, int irq, int nvec)
+{
+        struct intel_iommu *iommu;
+        int index;
+
+        iommu = map_dev_to_ir(dev);
+        if (!iommu) {
+                printk(KERN_ERR
+                       "Unable to map PCI %s to iommu\n", pci_name(dev));
+                return -ENOENT;
+        }
+
+        index = alloc_irte(iommu, irq, nvec);
+        if (index < 0) {
+                printk(KERN_ERR
+                       "Unable to allocate %d IRTE for PCI %s\n", nvec,
+                       pci_name(dev));
+                return -ENOSPC;
+        }
+        return index;
+}
+
+static int intel_msi_setup_irq(struct pci_dev *pdev, unsigned int irq,
+                               int index, int sub_handle)
+{
+        struct intel_iommu *iommu;
+
+        iommu = map_dev_to_ir(pdev);
+        if (!iommu)
+                return -ENOENT;
+        /*
+         * setup the mapping between the irq and the IRTE
+         * base index, the sub_handle pointing to the
+         * appropriate interrupt remap table entry.
+         */
+        set_irte_irq(irq, iommu, index, sub_handle);
+
+        return 0;
+}
+
+static int intel_setup_hpet_msi(unsigned int irq, unsigned int id)
+{
+        struct intel_iommu *iommu = map_hpet_to_ir(id);
+        int index;
+
+        if (!iommu)
+                return -1;
+
+        index = alloc_irte(iommu, irq, 1);
+        if (index < 0)
+                return -1;
+
+        return 0;
+}
+
 struct irq_remap_ops intel_irq_remap_ops = {
         .supported              = intel_intr_remapping_supported,
         .hardware_init          = dmar_table_init,
@@ -965,4 +1058,8 @@ struct irq_remap_ops intel_irq_remap_ops = {
         .setup_ioapic_entry     = intel_setup_ioapic_entry,
         .set_affinity           = intel_ioapic_set_affinity,
         .free_irq               = free_irte,
+        .compose_msi_msg        = intel_compose_msi_msg,
+        .msi_alloc_irq          = intel_msi_alloc_irq,
+        .msi_setup_irq          = intel_msi_setup_irq,
+        .setup_hpet_msi         = intel_setup_hpet_msi,
 };
diff --git a/drivers/iommu/intr_remapping.c b/drivers/iommu/intr_remapping.c
index a68d304f9729..9dc179316ba1 100644
--- a/drivers/iommu/intr_remapping.c
+++ b/drivers/iommu/intr_remapping.c
@@ -127,3 +127,38 @@ void intr_free_irq(int irq)
 
         remap_ops->free_irq(irq);
 }
+
+void intr_compose_msi_msg(struct pci_dev *pdev,
+                          unsigned int irq, unsigned int dest,
+                          struct msi_msg *msg, u8 hpet_id)
+{
+        if (!remap_ops || !remap_ops->compose_msi_msg)
+                return;
+
+        remap_ops->compose_msi_msg(pdev, irq, dest, msg, hpet_id);
+}
+
+int intr_msi_alloc_irq(struct pci_dev *pdev, int irq, int nvec)
+{
+        if (!remap_ops || !remap_ops->msi_alloc_irq)
+                return -ENODEV;
+
+        return remap_ops->msi_alloc_irq(pdev, irq, nvec);
+}
+
+int intr_msi_setup_irq(struct pci_dev *pdev, unsigned int irq,
+                       int index, int sub_handle)
+{
+        if (!remap_ops || !remap_ops->msi_setup_irq)
+                return -ENODEV;
+
+        return remap_ops->msi_setup_irq(pdev, irq, index, sub_handle);
+}
+
+int intr_setup_hpet_msi(unsigned int irq, unsigned int id)
+{
+        if (!remap_ops || !remap_ops->setup_hpet_msi)
+                return -ENODEV;
+
+        return remap_ops->setup_hpet_msi(irq, id);
+}
diff --git a/drivers/iommu/intr_remapping.h b/drivers/iommu/intr_remapping.h
index 57485539383d..6f4ea0a387b1 100644
--- a/drivers/iommu/intr_remapping.h
+++ b/drivers/iommu/intr_remapping.h
@@ -28,6 +28,8 @@ struct IO_APIC_route_entry;
 struct io_apic_irq_attr;
 struct irq_data;
 struct cpumask;
+struct pci_dev;
+struct msi_msg;
 
 extern int disable_intremap;
 extern int disable_sourceid_checking;
@@ -63,6 +65,20 @@ struct irq_remap_ops {
 
         /* Free an IRQ */
         int (*free_irq)(int);
+
+        /* Create MSI msg to use for interrupt remapping */
+        void (*compose_msi_msg)(struct pci_dev *,
+                                unsigned int, unsigned int,
+                                struct msi_msg *, u8);
+
+        /* Allocate remapping resources for MSI */
+        int (*msi_alloc_irq)(struct pci_dev *, int, int);
+
+        /* Setup the remapped MSI irq */
+        int (*msi_setup_irq)(struct pci_dev *, unsigned int, int, int);
+
+        /* Setup interrupt remapping for an HPET MSI */
+        int (*setup_hpet_msi)(unsigned int, unsigned int);
 };
 
 extern struct irq_remap_ops intel_irq_remap_ops;