From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751756AbbIHTGf (ORCPT ); Tue, 8 Sep 2015 15:06:35 -0400 Received: from www.linutronix.de ([62.245.132.108]:49061 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751136AbbIHTGc (ORCPT ); Tue, 8 Sep 2015 15:06:32 -0400 Date: Tue, 8 Sep 2015 21:05:49 +0200 (CEST) From: Thomas Gleixner To: Geert Uytterhoeven cc: Jason Cooper , Marc Zyngier , Sudeep Holla , Magnus Damm , linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/2] irqchip: renesas-intc-irqpin: Propagate wake-up settings to parent In-Reply-To: <1441731636-17610-2-git-send-email-geert+renesas@glider.be> Message-ID: References: <1441731636-17610-1-git-send-email-geert+renesas@glider.be> <1441731636-17610-2-git-send-email-geert+renesas@glider.be> User-Agent: Alpine 2.11 (DEB 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 8 Sep 2015, Geert Uytterhoeven wrote: > The renesas-intc-irqpin interrupt controller is cascaded to the GIC, but > its driver doesn't propagate wake-up settings to the parent interrupt > controller. > > Since commit aec89ef72ba6c944 ("irqchip/gic: Enable SKIP_SET_WAKE and > MASK_ON_SUSPEND"), the GIC driver masks interrupts during suspend, and > wake-up through gpio-keys now fails on r8a7740/armadillo and > sh73a0/kzm9g. > > Fix this by propagating wake-up settings to the parent interrupt > controller. There's no need to handle irq_set_irq_wake() failures, as > the renesas-intc-irqpin interrupt controller is always cascaded to a > GIC, and the GIC driver always sets SKIP_SET_WAKE since the > aforementioned commit. > > Signed-off-by: Geert Uytterhoeven > --- > drivers/irqchip/irq-renesas-intc-irqpin.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c > index 0670ab4e3897bf61..457d22c09e352d56 100644 > --- a/drivers/irqchip/irq-renesas-intc-irqpin.c > +++ b/drivers/irqchip/irq-renesas-intc-irqpin.c > @@ -283,6 +283,9 @@ static int intc_irqpin_irq_set_type(struct irq_data *d, unsigned int type) > static int intc_irqpin_irq_set_wake(struct irq_data *d, unsigned int on) > { > struct intc_irqpin_priv *p = irq_data_get_irq_chip_data(d); > + int hw_irq = irqd_to_hwirq(d); > + > + irq_set_irq_wake(p->irq[hw_irq].requested_irq, on); Are you sure that this does not make lockdep unhappy due to lock nesting? Thanks, tglx