Skip to contentSkip to conversation

genirq: warn on inconstent flags and flow handler

PATCH In review Florian Fainelli 1 participant 2 messages Aug 27, 2014 – Sep 17, 2014 IRQ

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 genirq: warn on inconstent flags and flow handler

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.

---
Changes in v3:
- replaced BUG_ON() with WARN_ON(), essentially making it similar to v1

Changes in v2:
- replaced WARN_ON() with BUG_ON()

 kernel/irq/chip.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
kernel/irq/chip.c +6 -1
index a2b28a2fd7b1..939ae1283ec9 100644
@@ -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
+		 */
+		WARN_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));
 
Signature · 1 line
1.9.1
#1 lore raw
Quoted 6 lines · 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.

Thomas, do you need me to resubmit this patch? It still applies cleanly on top of irq/core db985cbd67c45f875ef43cb5febfaa8cbd203c27 ("Merge tag 'irqchip-core-3.18' of git://git.infradead.org/users/jcooper/linux into irq/core").

Thanks!

Quoted 30 lines

---
Changes in v3:
- replaced BUG_ON() with WARN_ON(), essentially making it similar to v1

Changes in v2:
- replaced WARN_ON() with BUG_ON()

 kernel/irq/chip.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
kernel/irq/chip.c +6 -1
index a2b28a2fd7b1..939ae1283ec9 100644
@@ -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
+		 */
+		WARN_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));