Now that we enjoy threaded interrupts, we're starting to see irq_chip
implementations (wm831x, pca953x) that make use of threaded interrupts
for the controller, and nested interrupts for the client interrupt. It
all works very well, with one drawback:
Drivers requesting an IRQ must know whether the IRQ is configured as
nested or not, and call request_threaded_irq() or request_irq()
accordingly. The problem is that the requesting driver sometimes
doesn't know about the nature of the interrupt, specially when the
interrupt controller is a discrete chip that can be connected to a
wide variety of otherwise perfectly supported hardware. pca953x is an
example of such a case (see the thread starting at
http://lists.infradead.org/pipermail/linux-arm-kernel/2009-December/006651.html).
The following patch introduces the IRQF_ALLOW_NESTED flag, which acts
as a "contract" between the driver and the genirq framework. By using
this flag as part of the request_irq() call, the driver signals that
the handler will happilly run either in hardirq or nested context,
without any ill effect. The benefit of this is a single API for
drivers. It still requires the driver to be audited, and the flag
added to the request_irq() call.
Signed-off-by: Marc Zyngier <[email protected]>
---
include/linux/interrupt.h | 3 +++
kernel/irq/manage.c | 12 +++++++++---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 75f3f00..d166e24 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -52,6 +52,8 @@
* IRQF_ONESHOT - Interrupt is not reenabled after the hardirq handler finished.
* Used by threaded interrupts which need to keep the
* irq line disabled until the threaded handler has been run.
+ * IRQF_ALLOW_NESTED - Handler can be either run as hardirq or nested
+ * interrupt.
*/
#define IRQF_DISABLED 0x00000020
#define IRQF_SAMPLE_RANDOM 0x00000040
@@ -62,6 +64,7 @@
#define IRQF_NOBALANCING 0x00000800
#define IRQF_IRQPOLL 0x00001000
#define IRQF_ONESHOT 0x00002000
+#define IRQF_ALLOW_NESTED 0x00004000
/*
* Bits used by threaded handlers:
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index eb6078c..3635276 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -641,12 +641,18 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
/*
* Check whether the interrupt nests into another interrupt
- * thread.
+ * thread. Nested interrupt must provide a thread function
+ * unless it raises the IRQF_ALLOW_NESTED flag.
*/
nested = desc->status & IRQ_NESTED_THREAD;
if (nested) {
- if (!new->thread_fn)
- return -EINVAL;
+ if (!new->thread_fn) {
+ if (new->flags & IRQF_ALLOW_NESTED)
+ new->thread_fn = new->handler;
+ else
+ return -EINVAL;
+ }
+
/*
* Replace the primary handler which was provided from
* the driver for non nested interrupt handling by the
--
1.6.5.7
--
I'm the slime oozin' out from your TV set...