Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752270AbbHSXZM (ORCPT ); Wed, 19 Aug 2015 19:25:12 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57961 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750767AbbHSXZK (ORCPT ); Wed, 19 Aug 2015 19:25:10 -0400 Date: Wed, 19 Aug 2015 16:23:18 -0700 From: tip-bot for Grygorii Strashko Message-ID: Cc: jason@lakedaemon.net, mingo@kernel.org, grygorii.strashko@ti.com, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org, hpa@zytor.com, nsekhar@ti.com, balbi@ti.com, tony@atomide.com, linux-kernel@vger.kernel.org, linux@arm.linux.org.uk, marc.zyngier@arm.com, sudeep.holla@arm.com Reply-To: linux@arm.linux.org.uk, linux-kernel@vger.kernel.org, marc.zyngier@arm.com, sudeep.holla@arm.com, jason@lakedaemon.net, grygorii.strashko@ti.com, mingo@kernel.org, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org, hpa@zytor.com, nsekhar@ti.com, balbi@ti.com, tony@atomide.com In-Reply-To: <1439554830-19502-7-git-send-email-grygorii.strashko@ti.com> References: <1439554830-19502-7-git-send-email-grygorii.strashko@ti.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/urgent] irqchip/crossbar: Restore set_wake functionality Git-Commit-ID: 8200fe4347870d4ad6475048bcdf3e7c106c5268 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 Content-Length: 2640 Lines: 63 Commit-ID: 8200fe4347870d4ad6475048bcdf3e7c106c5268 Gitweb: http://git.kernel.org/tip/8200fe4347870d4ad6475048bcdf3e7c106c5268 Author: Grygorii Strashko AuthorDate: Fri, 14 Aug 2015 15:20:30 +0300 Committer: Thomas Gleixner CommitDate: Thu, 20 Aug 2015 00:25:26 +0200 irqchip/crossbar: Restore set_wake functionality The TI crossbar irqchip doesn't provides any facility to configure the wakeup sources, but the conversion to hierarchical irqdomains set the irq_set_wake callback to irq_chip_set_wake_parent. The parent chip (OMAP wakeupgen) has no irq_set_wake function either so the call will fail with -ENOSYS. As a result the irq_set_wake() call in the resume path will trigger an 'Unbalanced wake disable' warning. Before the conversion the GIC irqchip was the top level irqchip and correctly flagged with IRQCHIP_SKIP_SET_WAKE. Restore the correct behaviour by removing the irq_set_type callback from the crossbar irqchip and set the IRQCHIP_SKIP_SET_WAKE flag which lets the irq_set_irq_wake() call from the driver succeed. [ tglx: Massaged changelog ] Fixes: 783d31863fb8 ('irqchip: crossbar: Convert dra7 crossbar...') Signed-off-by: Grygorii Strashko Cc: Sudeep Holla Cc: Cc: Cc: Cc: Cc: Cc: Cc: Cc: stable@vger.kernel.org # 4.1 Link: http://lkml.kernel.org/r/1439554830-19502-7-git-send-email-grygorii.strashko@ti.com Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-crossbar.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-crossbar.c b/drivers/irqchip/irq-crossbar.c index f5a72cc..c12bb93 100644 --- a/drivers/irqchip/irq-crossbar.c +++ b/drivers/irqchip/irq-crossbar.c @@ -68,9 +68,9 @@ static struct irq_chip crossbar_chip = { .irq_mask = irq_chip_mask_parent, .irq_unmask = irq_chip_unmask_parent, .irq_retrigger = irq_chip_retrigger_hierarchy, - .irq_set_wake = irq_chip_set_wake_parent, .irq_set_type = irq_chip_set_type_parent, - .flags = IRQCHIP_MASK_ON_SUSPEND, + .flags = IRQCHIP_MASK_ON_SUSPEND | + IRQCHIP_SKIP_SET_WAKE, #ifdef CONFIG_SMP .irq_set_affinity = irq_chip_set_affinity_parent, #endif -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/