From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751900AbcFWI0K (ORCPT ); Thu, 23 Jun 2016 04:26:10 -0400 Received: from terminus.zytor.com ([198.137.202.10]:48880 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751811AbcFWI0E (ORCPT ); Thu, 23 Jun 2016 04:26:04 -0400 Date: Thu, 23 Jun 2016 01:25:48 -0700 From: tip-bot for Jon Hunter Message-ID: Cc: hpa@zytor.com, jiang.liu@linux.intel.com, tglx@linutronix.de, mingo@kernel.org, marc.zyngier@arm.com, jonathanh@nvidia.com, linux-kernel@vger.kernel.org Reply-To: hpa@zytor.com, tglx@linutronix.de, jiang.liu@linux.intel.com, mingo@kernel.org, marc.zyngier@arm.com, jonathanh@nvidia.com, linux-kernel@vger.kernel.org In-Reply-To: <1466501002-16368-1-git-send-email-jonathanh@nvidia.com> References: <1466501002-16368-1-git-send-email-jonathanh@nvidia.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] irqdomain: Fix disposal of mappings for interrupt hierarchies Git-Commit-ID: d16dcd3d18759eb955e0325572d07457f93494f5 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: d16dcd3d18759eb955e0325572d07457f93494f5 Gitweb: http://git.kernel.org/tip/d16dcd3d18759eb955e0325572d07457f93494f5 Author: Jon Hunter AuthorDate: Tue, 21 Jun 2016 10:23:22 +0100 Committer: Thomas Gleixner CommitDate: Thu, 23 Jun 2016 10:21:06 +0200 irqdomain: Fix disposal of mappings for interrupt hierarchies The function irq_create_of_mapping() is used to create an interrupt mapping. However, depending on whether the irqdomain, to which the interrupt belongs, is part of a hierarchy, determines whether the mapping is created via calling irq_domain_alloc_irqs() or irq_create_mapping(). To dispose of the interrupt mapping, drivers call irq_dispose_mapping(). However, this function does not check to see if the irqdomain is part of a hierarchy or not and simply assumes that it was mapped via calling irq_create_mapping() so calls irq_domain_disassociate() to unmap the interrupt. Fix this by checking to see if the irqdomain is part of a hierarchy and if so call irq_domain_free_irqs() to free/unmap the interrupt. Signed-off-by: Jon Hunter Cc: Marc Zyngier Cc: Jiang Liu Link: http://lkml.kernel.org/r/1466501002-16368-1-git-send-email-jonathanh@nvidia.com Signed-off-by: Thomas Gleixner --- kernel/irq/irqdomain.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index caa6a63..5d89d72 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -680,8 +680,12 @@ void irq_dispose_mapping(unsigned int virq) if (WARN_ON(domain == NULL)) return; - irq_domain_disassociate(domain, virq); - irq_free_desc(virq); + if (irq_domain_is_hierarchy(domain)) { + irq_domain_free_irqs(virq, 1); + } else { + irq_domain_disassociate(domain, virq); + irq_free_desc(virq); + } } EXPORT_SYMBOL_GPL(irq_dispose_mapping);