From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755792AbcHVPPF (ORCPT ); Mon, 22 Aug 2016 11:15:05 -0400 Received: from terminus.zytor.com ([198.137.202.10]:55142 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755211AbcHVPO6 (ORCPT ); Mon, 22 Aug 2016 11:14:58 -0400 Date: Mon, 22 Aug 2016 08:14:24 -0700 From: tip-bot for Paul Burton Message-ID: Cc: marc.zyngier@arm.com, paul.burton@imgtec.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com, jason@lakedaemon.net, mingo@kernel.org Reply-To: hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, marc.zyngier@arm.com, paul.burton@imgtec.com, mingo@kernel.org, jason@lakedaemon.net In-Reply-To: <20160819170715.27820-2-paul.burton@imgtec.com> References: <20160819170715.27820-2-paul.burton@imgtec.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] irqchip/mips-gic: Implement activate op for device domain Git-Commit-ID: 758f7981d114535e23e7c3dd98b4c11d5d02ff32 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: 758f7981d114535e23e7c3dd98b4c11d5d02ff32 Gitweb: http://git.kernel.org/tip/758f7981d114535e23e7c3dd98b4c11d5d02ff32 Author: Paul Burton AuthorDate: Fri, 19 Aug 2016 18:07:15 +0100 Committer: Thomas Gleixner CommitDate: Mon, 22 Aug 2016 17:07:34 +0200 irqchip/mips-gic: Implement activate op for device domain If an IRQ is setup using __setup_irq(), which is used by the request_irq() family of functions, and we are using an SMP kernel then the affinity of the IRQ will be set via setup_affinity() immediately after the IRQ is enabled. This call to gic_set_affinity() will lead to the interrupt being mapped to a VPE. However there are other ways to use IRQs which don't cause affinity to be set, for example if it is used to chain to another IRQ controller with irq_set_chained_handler_and_data(). The irq_set_chained_handler_and_data() code path will enable the IRQ, but will not trigger a call to gic_set_affinity() and in this case nothing will map the interrupt to a VPE, meaning that the interrupt is never received. Fix this by implementing the activate operation for the GIC device IRQ domain, using gic_shared_irq_domain_map() to map the interrupt to the correct pin of cpu 0. Fixes: c98c1822ee13 ("irqchip/mips-gic: Add device hierarchy domain") Signed-off-by: Paul Burton Cc: linux-mips@linux-mips.org Cc: Jason Cooper Cc: Marc Zyngier Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/20160819170715.27820-2-paul.burton@imgtec.com Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-mips-gic.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c index 2e0f499..83f4983 100644 --- a/drivers/irqchip/irq-mips-gic.c +++ b/drivers/irqchip/irq-mips-gic.c @@ -893,10 +893,17 @@ void gic_dev_domain_free(struct irq_domain *d, unsigned int virq, return; } +static void gic_dev_domain_activate(struct irq_domain *domain, + struct irq_data *d) +{ + gic_shared_irq_domain_map(domain, d->irq, d->hwirq, 0); +} + static struct irq_domain_ops gic_dev_domain_ops = { .xlate = gic_dev_domain_xlate, .alloc = gic_dev_domain_alloc, .free = gic_dev_domain_free, + .activate = gic_dev_domain_activate, }; static int gic_ipi_domain_xlate(struct irq_domain *d, struct device_node *ctrlr,