[PATCH v3] genirq: warn on inconstent flags and flow handler

[PATCH v3] genirq: warn on inconstent flags and flow handler

[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 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(-)

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index a2b28a2fd7b1..939ae1283ec9 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
+		 */
+		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));
 
-- 
1.9.1

Re: [PATCH v3] genirq: warn on inconstent flags and flow handler

[Florian Fainelli]

On 08/27/2014 11:38 AM, Florian Fainelli wrote:
> 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>

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!

> ---
> 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(-)
> 
> diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
> index a2b28a2fd7b1..939ae1283ec9 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
> +		 */
> +		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));
>  
>