[PATCH v3 24/35] iommu/amd: Update set_dte_irq_entry

[Vasant Hegde via iommu]

From: Suravee Suthikulpanit <suravee.suthikulpa...@amd.com>

Start using per PCI segment device table instead of global
device table.

Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpa...@amd.com>
Signed-off-by: Vasant Hegde <vasant.he...@amd.com>
---
 drivers/iommu/amd/iommu.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 8c99e2e161aa..ebae64711691 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -2729,18 +2729,20 @@ EXPORT_SYMBOL(amd_iommu_device_info);
 static struct irq_chip amd_ir_chip;
 static DEFINE_SPINLOCK(iommu_table_lock);
 
-static void set_dte_irq_entry(u16 devid, struct irq_remap_table *table)
+static void set_dte_irq_entry(struct amd_iommu *iommu, u16 devid,
+                             struct irq_remap_table *table)
 {
        u64 dte;
+       struct dev_table_entry *dev_table = get_dev_table(iommu);
 
-       dte     = amd_iommu_dev_table[devid].data[2];
+       dte     = dev_table[devid].data[2];
        dte     &= ~DTE_IRQ_PHYS_ADDR_MASK;
        dte     |= iommu_virt_to_phys(table->table);
        dte     |= DTE_IRQ_REMAP_INTCTL;
        dte     |= DTE_INTTABLEN;
        dte     |= DTE_IRQ_REMAP_ENABLE;
 
-       amd_iommu_dev_table[devid].data[2] = dte;
+       dev_table[devid].data[2] = dte;
 }
 
 static struct irq_remap_table *get_irq_table(struct amd_iommu *iommu, u16 
devid)
@@ -2791,7 +2793,7 @@ static void set_remap_table_entry(struct amd_iommu 
*iommu, u16 devid,
        struct amd_iommu_pci_seg *pci_seg = iommu->pci_seg;
 
        pci_seg->irq_lookup_table[devid] = table;
-       set_dte_irq_entry(devid, table);
+       set_dte_irq_entry(iommu, devid, table);
        iommu_flush_dte(iommu, devid);
 }
 
@@ -2807,8 +2809,7 @@ static int set_remap_table_entry_alias(struct pci_dev 
*pdev, u16 alias,
 
        pci_seg = iommu->pci_seg;
        pci_seg->irq_lookup_table[alias] = table;
-       set_dte_irq_entry(alias, table);
-
+       set_dte_irq_entry(iommu, alias, table);
        iommu_flush_dte(pci_seg->rlookup_table[alias], alias);
 
        return 0;
-- 
2.27.0

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu