From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753536AbdFVQwI (ORCPT ); Thu, 22 Jun 2017 12:52:08 -0400 Received: from terminus.zytor.com ([65.50.211.136]:41387 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753454AbdFVQwF (ORCPT ); Thu, 22 Jun 2017 12:52:05 -0400 Date: Thu, 22 Jun 2017 09:45:43 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: tglx@linutronix.de, keith.busch@intel.com, hch@lst.de, axboe@kernel.dk, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, joro@8bytes.org, peterz@infradead.org, mpe@ellerman.id.au, marc.zyngier@arm.com Reply-To: hpa@zytor.com, peterz@infradead.org, mpe@ellerman.id.au, joro@8bytes.org, mingo@kernel.org, linux-kernel@vger.kernel.org, marc.zyngier@arm.com, tglx@linutronix.de, keith.busch@intel.com, axboe@kernel.dk, hch@lst.de In-Reply-To: <20170619235444.063083997@linutronix.de> References: <20170619235444.063083997@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] iommu/vt-d: Use named irq domain interface Git-Commit-ID: cea29b656a5e5f1a7b7de42795c3ae6fc417ab0b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: cea29b656a5e5f1a7b7de42795c3ae6fc417ab0b Gitweb: http://git.kernel.org/tip/cea29b656a5e5f1a7b7de42795c3ae6fc417ab0b Author: Thomas Gleixner AuthorDate: Tue, 20 Jun 2017 01:37:11 +0200 Committer: Thomas Gleixner CommitDate: Thu, 22 Jun 2017 18:21:10 +0200 iommu/vt-d: Use named irq domain interface Signed-off-by: Thomas Gleixner Acked-by: Joerg Roedel Cc: Jens Axboe Cc: Marc Zyngier Cc: Michael Ellerman Cc: Keith Busch Cc: Peter Zijlstra Cc: iommu@lists.linux-foundation.org Cc: Christoph Hellwig Link: http://lkml.kernel.org/r/20170619235444.063083997@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;