Commit-ID:  3e49a8182277ea57736285aede5f43bfa6aa11b1
Gitweb:     http://git.kernel.org/tip/3e49a8182277ea57736285aede5f43bfa6aa11b1
Author:     Thomas Gleixner <t...@linutronix.de>
AuthorDate: Tue, 20 Jun 2017 01:37:12 +0200
Committer:  Thomas Gleixner <t...@linutronix.de>
CommitDate: Thu, 22 Jun 2017 18:21:11 +0200

iommu/amd: Use named irq domain interface

Signed-off-by: Thomas Gleixner <t...@linutronix.de>
Acked-by: Joerg Roedel <j...@8bytes.org>
Cc: Jens Axboe <ax...@kernel.dk>
Cc: Marc Zyngier <marc.zyng...@arm.com>
Cc: Michael Ellerman <m...@ellerman.id.au>
Cc: Keith Busch <keith.bu...@intel.com>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: io...@lists.linux-foundation.org
Cc: Christoph Hellwig <h...@lst.de>
Link: http://lkml.kernel.org/r/20170619235444.142270...@linutronix.de

---
 drivers/iommu/amd_iommu.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 590e1e8..503849d 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -4395,13 +4395,20 @@ static struct irq_chip amd_ir_chip = {
 
 int amd_iommu_create_irq_domain(struct amd_iommu *iommu)
 {
-       iommu->ir_domain = irq_domain_add_tree(NULL, &amd_ir_domain_ops, iommu);
+       struct fwnode_handle *fn;
+
+       fn = irq_domain_alloc_named_id_fwnode("AMD-IR", iommu->index);
+       if (!fn)
+               return -ENOMEM;
+       iommu->ir_domain = irq_domain_create_tree(fn, &amd_ir_domain_ops, 
iommu);
+       irq_domain_free_fwnode(fn);
        if (!iommu->ir_domain)
                return -ENOMEM;
 
        iommu->ir_domain->parent = arch_get_ir_parent_domain();
-       iommu->msi_domain = arch_create_msi_irq_domain(iommu->ir_domain);
-
+       iommu->msi_domain = arch_create_remap_msi_irq_domain(iommu->ir_domain,
+                                                            "AMD-IR-MSI",
+                                                            iommu->index);
        return 0;
 }
 

Reply via email to