Commit-ID: cea29b656a5e5f1a7b7de42795c3ae6fc417ab0b Gitweb: http://git.kernel.org/tip/cea29b656a5e5f1a7b7de42795c3ae6fc417ab0b Author: Thomas Gleixner <t...@linutronix.de> AuthorDate: Tue, 20 Jun 2017 01:37:11 +0200 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Thu, 22 Jun 2017 18:21:10 +0200
iommu/vt-d: 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.063083...@linutronix.de --- drivers/iommu/intel_irq_remapping.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index ba5b580..8fc641e 100644 --- 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;
