[PATCH v2] genirq: bug on inconstent flags and flow handler

* [PATCH v2] genirq: bug on inconstent flags and flow handler
@ 2014-07-23 18:45 Florian Fainelli
  2014-07-23 18:49 ` Thomas Gleixner
  0 siblings, 1 reply; 6+ messages in thread
From: Florian Fainelli @ 2014-07-23 18:45 UTC (permalink / raw)
  To: linux-kernel; +Cc: tglx, jason, Florian Fainelli

It is currently possible for a generic irq chip driver to set IRQ_LEVEL
and have its irq flow handler be handle_edge_irq. Setting IRQ_LEVEL in
such a case does not make sense, and will actually prevent e.g: the
software resend logic from kicking, and potential other problems too.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
Changes in v2:
- replaced WARN_ON() with BUG_ON() since we really don't want to continue
  as suggested by Jason Cooper

 kernel/irq/chip.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index a2b28a2fd7b1..17a66b56cd96 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -749,8 +749,13 @@ void irq_modify_status(unsigned int irq, unsigned long clr, unsigned long set)
 		irqd_set(&desc->irq_data, IRQD_PER_CPU);
 	if (irq_settings_can_move_pcntxt(desc))
 		irqd_set(&desc->irq_data, IRQD_MOVE_PCNTXT);
-	if (irq_settings_is_level(desc))
+	if (irq_settings_is_level(desc)) {
+		/* Setting IRQD_LEVEL does not make sense on non-level
+		 * sensitive interrupts
+		 */
+		BUG_ON(desc->handle_irq != handle_level_irq);
 		irqd_set(&desc->irq_data, IRQD_LEVEL);
+	}
 
 	irqd_set(&desc->irq_data, irq_settings_get_trigger_mask(desc));
 
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread