From: tip-bot for Geert Uytterhoeven <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, marc.zyngier@arm.com,
linux-kernel@vger.kernel.org, jason@lakedaemon.net,
sudeep.holla@arm.com, geert+renesas@glider.be, hpa@zytor.com,
magnus.damm@gmail.com, mingo@kernel.org
Subject: [tip:irq/urgent] irqchip/renesas-irqc: Propagate wake-up settings to parent
Date: Tue, 15 Sep 2015 08:50:39 -0700 [thread overview]
Message-ID: <tip-4cd7863ecb90010533c178fba6ecc84d5529b402@git.kernel.org> (raw)
In-Reply-To: <1441731636-17610-3-git-send-email-geert+renesas@glider.be>
Commit-ID: 4cd7863ecb90010533c178fba6ecc84d5529b402
Gitweb: http://git.kernel.org/tip/4cd7863ecb90010533c178fba6ecc84d5529b402
Author: Geert Uytterhoeven <geert+renesas@glider.be>
AuthorDate: Tue, 8 Sep 2015 19:00:36 +0200
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Tue, 15 Sep 2015 17:06:29 +0200
irqchip/renesas-irqc: Propagate wake-up settings to parent
The renesas-irqc 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 r8a73a4/ape6evm.
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-irqc 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 <geert+renesas@glider.be>
Cc: Sudeep Holla <sudeep.holla@arm.com>
Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Link: http://lkml.kernel.org/r/1441731636-17610-3-git-send-email-geert%2Brenesas@glider.be
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
drivers/irqchip/irq-renesas-irqc.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
index 4652cc3..35bf97b 100644
--- a/drivers/irqchip/irq-renesas-irqc.c
+++ b/drivers/irqchip/irq-renesas-irqc.c
@@ -121,6 +121,9 @@ static int irqc_irq_set_type(struct irq_data *d, unsigned int type)
static int irqc_irq_set_wake(struct irq_data *d, unsigned int on)
{
struct irqc_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);
if (!p->clk)
return 0;
next prev parent reply other threads:[~2015-09-15 15:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-08 17:00 [PATCH 0/2] irqchip: renesas: " Geert Uytterhoeven
2015-09-08 17:00 ` [PATCH 1/2] irqchip: renesas-intc-irqpin: " Geert Uytterhoeven
2015-09-08 19:05 ` Thomas Gleixner
2015-09-08 19:36 ` Geert Uytterhoeven
2015-09-08 20:03 ` Thomas Gleixner
2015-09-09 8:43 ` Grygorii Strashko
2015-09-09 8:53 ` Thomas Gleixner
2015-09-09 9:16 ` Grygorii Strashko
2015-09-15 15:50 ` [tip:irq/urgent] irqchip/renesas-intc-irqpin: " tip-bot for Geert Uytterhoeven
2015-09-08 17:00 ` [PATCH 2/2] irqchip: renesas-irqc: " Geert Uytterhoeven
2015-09-15 15:50 ` tip-bot for Geert Uytterhoeven [this message]
2015-09-08 17:26 ` [PATCH 0/2] irqchip: renesas: " Sudeep Holla
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-4cd7863ecb90010533c178fba6ecc84d5529b402@git.kernel.org \
--to=tipbot@zytor.com \
--cc=geert+renesas@glider.be \
--cc=hpa@zytor.com \
--cc=jason@lakedaemon.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=magnus.damm@gmail.com \
--cc=marc.zyngier@arm.com \
--cc=mingo@kernel.org \
--cc=sudeep.holla@arm.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome