iommu/vt-d: Simplify intel_irq_remapping_select()

Now that the old get_irq_domain() method has gone, consolidate on just the
map_XXX_to_iommu() functions.

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20201024213535.443185-31-dwmw2@infradead.org

diff --git a/drivers/iommu/intel/irq_remapping.c b/drivers/iommu/intel/irq_remapping.c
index bca4401..aeffda9 100644 (file)
--- a/drivers/iommu/intel/irq_remapping.c
+++ b/drivers/iommu/intel/irq_remapping.c
@@ -203,13 +203,13 @@ static int modify_irte(struct irq_2_iommu *irq_iommu,
        return rc;
 }
 
-static struct irq_domain *map_hpet_to_ir(u8 hpet_id)
+static struct intel_iommu *map_hpet_to_iommu(u8 hpet_id)
 {
        int i;
 
        for (i = 0; i < MAX_HPET_TBS; i++) {
                if (ir_hpet[i].id == hpet_id && ir_hpet[i].iommu)
-                       return ir_hpet[i].iommu->ir_domain;
+                       return ir_hpet[i].iommu;
        }
        return NULL;
 }
@@ -225,13 +225,6 @@ static struct intel_iommu *map_ioapic_to_iommu(int apic)
        return NULL;
 }
 
-static struct irq_domain *map_ioapic_to_ir(int apic)
-{
-       struct intel_iommu *iommu = map_ioapic_to_iommu(apic);
-
-       return iommu ? iommu->ir_domain : NULL;
-}
-
 static struct irq_domain *map_dev_to_ir(struct pci_dev *dev)
 {
        struct dmar_drhd_unit *drhd = dmar_find_matched_drhd_unit(dev);
@@ -1418,12 +1411,14 @@ static int intel_irq_remapping_select(struct irq_domain *d,
                                      struct irq_fwspec *fwspec,
                                      enum irq_domain_bus_token bus_token)
 {
+       struct intel_iommu *iommu = NULL;
+
        if (x86_fwspec_is_ioapic(fwspec))
-               return d == map_ioapic_to_ir(fwspec->param[0]);
+               iommu = map_ioapic_to_iommu(fwspec->param[0]);
        else if (x86_fwspec_is_hpet(fwspec))
-               return d == map_hpet_to_ir(fwspec->param[0]);
+               iommu = map_hpet_to_iommu(fwspec->param[0]);
 
-       return 0;
+       return iommu && d == iommu->ir_domain;
 }
 
 static const struct irq_domain_ops intel_ir_domain_ops = {