iommu/vt-d: Use named irq domain interface

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Joerg Roedel <joro@8bytes.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Keith Busch <keith.busch@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: iommu@lists.linux-foundation.org
Cc: Christoph Hellwig <hch@lst.de>
Link: http://lkml.kernel.org/r/20170619235444.063083997@linutronix.de

diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c
index ba5b580..8fc641e 100644 (file)
--- a/drivers/iommu/intel_irq_remapping.c
+++ b/drivers/iommu/intel_irq_remapping.c
@@ -500,8 +500,9 @@ static void iommu_enable_irq_remapping(struct intel_iommu *iommu)
 static int intel_setup_irq_remapping(struct intel_iommu *iommu)
 {
        struct ir_table *ir_table;
-       struct page *pages;
+       struct fwnode_handle *fn;
        unsigned long *bitmap;
+       struct page *pages;
 
        if (iommu->ir_table)
                return 0;
@@ -525,15 +526,24 @@ static int intel_setup_irq_remapping(struct intel_iommu *iommu)
                goto out_free_pages;
        }
 
-       iommu->ir_domain = irq_domain_add_hierarchy(arch_get_ir_parent_domain(),
-                                                   0, INTR_REMAP_TABLE_ENTRIES,
-                                                   NULL, &intel_ir_domain_ops,
-                                                   iommu);
+       fn = irq_domain_alloc_named_id_fwnode("INTEL-IR", iommu->seq_id);
+       if (!fn)
+               goto out_free_bitmap;
+
+       iommu->ir_domain =
+               irq_domain_create_hierarchy(arch_get_ir_parent_domain(),
+                                           0, INTR_REMAP_TABLE_ENTRIES,
+                                           fn, &intel_ir_domain_ops,
+                                           iommu);
+       irq_domain_free_fwnode(fn);
        if (!iommu->ir_domain) {
                pr_err("IR%d: failed to allocate irqdomain\n", iommu->seq_id);
                goto out_free_bitmap;
        }
-       iommu->ir_msi_domain = arch_create_msi_irq_domain(iommu->ir_domain);
+       iommu->ir_msi_domain =
+               arch_create_remap_msi_irq_domain(iommu->ir_domain,
+                                                "INTEL-IR-MSI",
+                                                iommu->seq_id);
 
        ir_table->base = page_address(pages);
        ir_table->bitmap = bitmap;