From: Brian Starkey <brian.starkey@arm.com>
To: tglx@linutronix.de
Cc: linux-kernel@vger.kernel.org, marc.zyngier@arm.com
Subject: [PATCH] genirq: fix trigger flags check for shared irqs
Date: Tue, 26 Jan 2016 10:31:54 +0000 [thread overview]
Message-ID: <96c068ece0f5d01fc85bdbd9e0798f68180eebb8.1453204950.git.brian.starkey@arm.com> (raw)
For shared interrupts, if one requester passes in any IRQF_TRIGGER_*
flags whilst another doesn't, __setup_irq() can erroneously fail.
The no-flags case should be treated as "already configured", so change
__setup_irq() to only check that the flags match if any have been
provided.
Signed-off-by: Brian Starkey <brian.starkey@arm.com>
Reviewed-by: Marc Zyngier <marc.zyngier@arm.com>
---
kernel/irq/manage.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index a79d267..032c8fa 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -995,14 +995,10 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
old = *old_ptr;
if (old) {
/*
- * Can't share interrupts unless both agree to and are
- * the same type (level, edge, polarity). So both flag
- * fields must have IRQF_SHARED set and the bits which
- * set the trigger type must match. Also all must
- * agree on ONESHOT.
+ * Can't share interrupts unless both agree to and all
+ * must agree on ONESHOT
*/
if (!((old->flags & new->flags) & IRQF_SHARED) ||
- ((old->flags ^ new->flags) & IRQF_TRIGGER_MASK) ||
((old->flags ^ new->flags) & IRQF_ONESHOT))
goto mismatch;
@@ -1014,6 +1010,15 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
/* add new interrupt at end of irq queue */
do {
/*
+ * If 'new' requests a trigger type it must match all
+ * previously requested trigger types.
+ */
+ if (((new->flags & IRQF_TRIGGER_MASK) &&
+ (old->flags & IRQF_TRIGGER_MASK)) &&
+ ((new->flags ^ old->flags) & IRQF_TRIGGER_MASK))
+ goto mismatch;
+
+ /*
* Or all existing action->thread_mask bits,
* so we can find the next zero bit for this
* new action.
--
1.7.9.5
next reply other threads:[~2016-01-26 10:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-26 10:31 Brian Starkey [this message]
2016-01-26 20:45 ` Thomas Gleixner
2016-01-28 9:59 ` Brian Starkey
2016-01-28 10:29 ` Thomas Gleixner
2016-01-28 11:10 ` Brian Starkey
2016-01-28 11:49 ` Thomas Gleixner
2016-01-28 12:22 ` Brian Starkey
2016-01-28 13:37 ` Thomas Gleixner
2016-02-08 11:02 ` Brian Starkey
2016-01-28 15:58 ` Rob Herring
2016-01-28 20:06 ` Thomas Gleixner
2016-01-29 4:17 ` Tomasz Figa
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=96c068ece0f5d01fc85bdbd9e0798f68180eebb8.1453204950.git.brian.starkey@arm.com \
--to=brian.starkey@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@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
all inboxes | Powered by JetHome®