Commit-ID: 1984e075915cbae65336a99b1879865080d8e55e
Gitweb: http://git.kernel.org/tip/1984e075915cbae65336a99b1879865080d8e55e
Author: Marc Zyngier <marc.zyng...@arm.com>
AuthorDate: Mon, 19 Sep 2016 09:49:27 +0100
Committer: Thomas Gleixner <t...@linutronix.de>
CommitDate: Mon, 19 Sep 2016 11:31:36 +0200
genirq: Skip chained interrupt trigger setup if type is IRQ_TYPE_NONE
There is no point in trying to configure the trigger of a chained
interrupt if no trigger information has been configured. At best
this is ignored, and at the worse this confuses the underlying
irqchip (which is likely not to handle such a thing), and
unnecessarily alarms the user.
Only apply the configuration if type is not IRQ_TYPE_NONE.
Fixes: 1e12c4a9393b ("genirq: Correctly configure the trigger on chained
interrupts")
Reported-and-tested-by: Geert Uytterhoeven <ge...@linux-m68k.org>
Signed-off-by: Marc Zyngier <marc.zyng...@arm.com>
Link:
https://lkml.kernel.org/r/CAMuHMdVW1eTn20=etycj8hkvwohasuh_yqxry2mgbevz8fp...@mail.gmail.com
Link:
http://lkml.kernel.org/r/1474274967-15984-1-git-send-email-marc.zyng...@arm.com
Signed-off-by: Thomas Gleixner <t...@linutronix.de>
---
kernel/irq/chip.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 6373890..26ba565 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -820,6 +820,8 @@ __irq_do_set_handler(struct irq_desc *desc,
irq_flow_handler_t handle,
desc->name = name;
if (handle != handle_bad_irq && is_chained) {
+ unsigned int type = irqd_get_trigger_type(&desc->irq_data);
+
/*
* We're about to start this interrupt immediately,
* hence the need to set the trigger configuration.
@@ -828,8 +830,10 @@ __irq_do_set_handler(struct irq_desc *desc,
irq_flow_handler_t handle,
* chained interrupt. Reset it immediately because we
* do know better.
*/
- __irq_set_trigger(desc, irqd_get_trigger_type(&desc->irq_data));
- desc->handle_irq = handle;
+ if (type != IRQ_TYPE_NONE) {
+ __irq_set_trigger(desc, type);
+ desc->handle_irq = handle;
+ }
irq_settings_set_noprobe(desc);
irq_settings_set_norequest(desc);
