[irqchip: irq/irqchip-next] genirq: Let purely flow-masked ONESHOT irqs through unmask_threaded_irq()

[irqchip-bot for Valentin Schneider]

The following commit has been merged into the irq/irqchip-next branch of irqchip:

Commit-ID:     a4ea2933cc4581e70203a48c60bc26b69a936eeb
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/a4ea2933cc4581e70203a48c60bc26b69a936eeb
Author:        Valentin Schneider <valentin.schneider@xxxxxxx>
AuthorDate:    Tue, 29 Jun 2021 13:50:02 +01:00
Committer:     Marc Zyngier <maz@xxxxxxxxxx>
CommitterDate: Thu, 12 Aug 2021 15:48:20 +01:00

genirq: Let purely flow-masked ONESHOT irqs through unmask_threaded_irq()

A subsequent patch will let IRQs end up in irq_finalize_oneshot() without
IRQD_IRQ_MASKED, but with IRQD_IRQ_FLOW_MASKED set instead. Let such IRQs
receive their final ->irq_eoi().

Signed-off-by: Valentin Schneider <valentin.schneider@xxxxxxx>
Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20210629125010.458872-6-valentin.schneider@xxxxxxx
---
 kernel/irq/manage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index ef30b47..e6d6d32 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1107,7 +1107,7 @@ again:
 	desc->threads_oneshot &= ~action->thread_mask;
 
 	if (!desc->threads_oneshot && !irqd_irq_disabled(&desc->irq_data) &&
-	    irqd_irq_masked(&desc->irq_data))
+	    (irqd_irq_masked(&desc->irq_data) | irqd_irq_flow_masked(&desc->irq_data)))
 		unmask_threaded_irq(desc);
 
 out_unlock: