irq_remapping/amd: Clean up unused MSI related code

Now MSI interrupt has been converted to new hierarchical irqdomain
interfaces, so remove legacy MSI related code.

Signed-off-by: Jiang Liu <[email protected]>
Acked-by: Joerg Roedel <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: David Cohen <[email protected]>
Cc: Sander Eikelenboom <[email protected]>
Cc: David Vrabel <[email protected]>
Cc: Tony Luck <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: [email protected]
Cc: Bjorn Helgaas <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Rafael J. Wysocki <[email protected]>
Cc: Randy Dunlap <[email protected]>
Cc: Yinghai Lu <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Dimitri Sivanich <[email protected]>
Cc: Joerg Roedel <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Thomas Gleixner <[email protected]>

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index a14ba26564a35a1602a95a2c905ec24e27e6f33e..8858cb6c70ded2bfd70d6566bfe09ec9271e2721 100644 (file)
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -3955,8 +3955,7 @@ out_unlock:
        return table;
 }
 
-static int alloc_irq_index(struct irq_cfg *cfg, struct irq_2_irte *irte_info,
-                          u16 devid, int count)
+static int alloc_irq_index(u16 devid, int count)
 {
        struct irq_remap_table *table;
        unsigned long flags;
@@ -3982,11 +3981,6 @@ static int alloc_irq_index(struct irq_cfg *cfg, struct irq_2_irte *irte_info,
                                table->table[index - c + 1] = IRTE_ALLOCATED;
 
                        index -= count - 1;
-
-                       cfg->remapped         = 1;
-                       irte_info->devid      = devid;
-                       irte_info->index      = index;
-
                        goto out;
                }
        }
@@ -4186,106 +4180,6 @@ static int free_irq(int irq)
        return 0;
 }
 
-static void compose_msi_msg(struct pci_dev *pdev,
-                           unsigned int irq, unsigned int dest,
-                           struct msi_msg *msg, u8 hpet_id)
-{
-       struct irq_2_irte *irte_info;
-       struct irq_cfg *cfg;
-       union irte irte;
-
-       cfg = irq_cfg(irq);
-       if (!cfg)
-               return;
-
-       irte_info = &cfg->irq_2_irte;
-
-       irte.val                = 0;
-       irte.fields.vector      = cfg->vector;
-       irte.fields.int_type    = apic->irq_delivery_mode;
-       irte.fields.destination = dest;
-       irte.fields.dm          = apic->irq_dest_mode;
-       irte.fields.valid       = 1;
-
-       modify_irte(irte_info->devid, irte_info->index, irte);
-
-       msg->address_hi = MSI_ADDR_BASE_HI;
-       msg->address_lo = MSI_ADDR_BASE_LO;
-       msg->data       = irte_info->index;
-}
-
-static int msi_alloc_irq(struct pci_dev *pdev, int irq, int nvec)
-{
-       struct irq_cfg *cfg;
-       int index;
-       u16 devid;
-
-       if (!pdev)
-               return -EINVAL;
-
-       cfg = irq_cfg(irq);
-       if (!cfg)
-               return -EINVAL;
-
-       devid = get_device_id(&pdev->dev);
-       index = alloc_irq_index(cfg, &cfg->irq_2_irte, devid, nvec);
-
-       return index < 0 ? MAX_IRQS_PER_TABLE : index;
-}
-
-static int msi_setup_irq(struct pci_dev *pdev, unsigned int irq,
-                        int index, int offset)
-{
-       struct irq_2_irte *irte_info;
-       struct irq_cfg *cfg;
-       u16 devid;
-
-       if (!pdev)
-               return -EINVAL;
-
-       cfg = irq_cfg(irq);
-       if (!cfg)
-               return -EINVAL;
-
-       if (index >= MAX_IRQS_PER_TABLE)
-               return 0;
-
-       devid           = get_device_id(&pdev->dev);
-       irte_info       = &cfg->irq_2_irte;
-
-       cfg->remapped         = 1;
-       irte_info->devid      = devid;
-       irte_info->index      = index + offset;
-
-       return 0;
-}
-
-static int alloc_hpet_msi(unsigned int irq, unsigned int id)
-{
-       struct irq_2_irte *irte_info;
-       struct irq_cfg *cfg;
-       int index, devid;
-
-       cfg = irq_cfg(irq);
-       if (!cfg)
-               return -EINVAL;
-
-       irte_info = &cfg->irq_2_irte;
-       devid     = get_hpet_devid(id);
-       if (devid < 0)
-               return devid;
-
-       index = alloc_irq_index(cfg, &cfg->irq_2_irte, devid, 1);
-       if (index < 0)
-               return index;
-
-       cfg->remapped         = 1;
-       irte_info->devid      = devid;
-       irte_info->index      = index;
-
-       return 0;
-}
-
 static int get_devid(struct irq_alloc_info *info)
 {
        int devid = -1;
@@ -4361,10 +4255,6 @@ struct irq_remap_ops amd_iommu_irq_ops = {
        .setup_ioapic_entry     = setup_ioapic_entry,
        .set_affinity           = set_affinity,
        .free_irq               = free_irq,
-       .compose_msi_msg        = compose_msi_msg,
-       .msi_alloc_irq          = msi_alloc_irq,
-       .msi_setup_irq          = msi_setup_irq,
-       .alloc_hpet_msi         = alloc_hpet_msi,
        .get_ir_irq_domain      = get_ir_irq_domain,
        .get_irq_domain         = get_irq_domain,
 };
@@ -4462,8 +4352,7 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq,
                else
                        ret = -ENOMEM;
        } else {
-               cfg = irq_cfg(virq);
-               index = alloc_irq_index(cfg, &data->irq_2_irte, devid, nr_irqs);
+               index = alloc_irq_index(devid, nr_irqs);
        }
        if (index < 0) {
                pr_warn("Failed to allocate IRTE\n");