The following commit has been merged into the x86/apic branch of tip:

Commit-ID:     a1a785b572425ab3ca5494a4be02ab59a796df51
Gitweb:        
https://git.kernel.org/tip/a1a785b572425ab3ca5494a4be02ab59a796df51
Author:        David Woodhouse <[email protected]>
AuthorDate:    Sat, 24 Oct 2020 22:35:24 +01:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Wed, 28 Oct 2020 20:26:27 +01:00

iommu/amd: Implement select() method on remapping irqdomain

Preparatory change to remove irq_remapping_get_irq_domain().

Signed-off-by: David Woodhouse <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Link: https://lore.kernel.org/r/[email protected]

---
 drivers/iommu/amd/iommu.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 9744cdb..31b2224 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -3882,7 +3882,26 @@ static void irq_remapping_deactivate(struct irq_domain 
*domain,
                                            irte_info->index);
 }
 
+static int irq_remapping_select(struct irq_domain *d, struct irq_fwspec 
*fwspec,
+                               enum irq_domain_bus_token bus_token)
+{
+       struct amd_iommu *iommu;
+       int devid = -1;
+
+       if (x86_fwspec_is_ioapic(fwspec))
+               devid = get_ioapic_devid(fwspec->param[0]);
+       else if (x86_fwspec_is_hpet(fwspec))
+               devid = get_hpet_devid(fwspec->param[0]);
+
+       if (devid < 0)
+               return 0;
+
+       iommu = amd_iommu_rlookup_table[devid];
+       return iommu && iommu->ir_domain == d;
+}
+
 static const struct irq_domain_ops amd_ir_domain_ops = {
+       .select = irq_remapping_select,
        .alloc = irq_remapping_alloc,
        .free = irq_remapping_free,
        .activate = irq_remapping_activate,

Reply via email to