Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752279AbbHSXXn (ORCPT ); Wed, 19 Aug 2015 19:23:43 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57924 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750947AbbHSXXl (ORCPT ); Wed, 19 Aug 2015 19:23:41 -0400 Date: Wed, 19 Aug 2015 16:22:58 -0700 From: tip-bot for Grygorii Strashko Message-ID: Cc: grygorii.strashko@ti.com, linux@arm.linux.org.uk, mingo@kernel.org, nsekhar@ti.com, jason@lakedaemon.net, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, tglx@linutronix.de, marc.zyngier@arm.com, hpa@zytor.com, sudeep.holla@arm.com, tony@atomide.com, balbi@ti.com Reply-To: tglx@linutronix.de, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, jason@lakedaemon.net, nsekhar@ti.com, mingo@kernel.org, linux@arm.linux.org.uk, grygorii.strashko@ti.com, balbi@ti.com, tony@atomide.com, sudeep.holla@arm.com, hpa@zytor.com, marc.zyngier@arm.com In-Reply-To: <1439554830-19502-6-git-send-email-grygorii.strashko@ti.com> References: <1439554830-19502-6-git-send-email-grygorii.strashko@ti.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/urgent] irqchip/crossbar: Restore the mask on suspend behaviour Git-Commit-ID: 4fd8f47e7e5b64a74b60f23c2e08ba8234d659d1 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: 2483 Lines: 61 Commit-ID: 4fd8f47e7e5b64a74b60f23c2e08ba8234d659d1 Gitweb: http://git.kernel.org/tip/4fd8f47e7e5b64a74b60f23c2e08ba8234d659d1 Author: Grygorii Strashko AuthorDate: Fri, 14 Aug 2015 15:20:29 +0300 Committer: Thomas Gleixner CommitDate: Thu, 20 Aug 2015 00:25:25 +0200 irqchip/crossbar: Restore the mask on suspend behaviour The ARM GIC requires that all interrupts which are not used as a wakeup source have to be masked during suspend. The conversion of the crossbar irqchip to hierarchical irq domains failed to mark the crossbar irqchip with the IRQCHIP_MASK_ON_SUSPEND flag and therefor broke the suspend requirement of the GIC. Before the conversion the flags were visible because the GIC was the top level irqchip. After the conversion the crossbar irqchip is the top level irq chip whose flags are evaluated in suspend_device_irq(). As the flag is not set the masking of the non-wakeup irqs is not invoked which breaks suspend. Add the IRQCHIP_MASK_ON_SUSPEND flag to the crossbar irqchip, so the GIC interrupts get masked properly. [ 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-6-git-send-email-grygorii.strashko@ti.com Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-crossbar.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/irqchip/irq-crossbar.c b/drivers/irqchip/irq-crossbar.c index 3ba58e7..f5a72cc 100644 --- a/drivers/irqchip/irq-crossbar.c +++ b/drivers/irqchip/irq-crossbar.c @@ -70,6 +70,7 @@ static struct irq_chip crossbar_chip = { .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, #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/