[tip: irq/core] genirq: Set IRQF_COND_ONESHOT in request_irq()

From: tip-bot2 for Rafael J. Wysocki
Date: Thu Jul 11 2024 - 17:04:47 EST


The following commit has been merged into the irq/core branch of tip:

Commit-ID: 513fbe762f644872cc2ff47407cbc24422a33fb5
Gitweb: https://git.kernel.org/tip/513fbe762f644872cc2ff47407cbc24422a33fb5
Author: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
AuthorDate: Thu, 11 Jul 2024 12:20:04 +02:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Thu, 11 Jul 2024 22:59:33 +02:00

genirq: Set IRQF_COND_ONESHOT in request_irq()

The callers of request_irq() don't care about IRQF_ONESHOT because they
don't provide threaded handlers, but if they happen to share the IRQ with
the ACPI SCI, which has a threaded handler and sets IRQF_ONESHOT,
request_irq() will fail for them due to a flags mismatch.

Address this by making request_irq() add IRQF_COND_ONESHOT to the flags
passed to request_threaded_irq() for all of its callers.

Fixes: 7a36b901a6eb ("ACPI: OSL: Use a threaded interrupt handler for SCI")
Reported-by: Stefan Seyfried <stefan.seyfried@xxxxxxxxxxxxxx>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Tested-by: Stefan Seyfried <stefan.seyfried@xxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxx
Link: https://lore.kernel.org/r/5800834.DvuYhMxLoT@xxxxxxxxxxxxx
Closes: https://lore.kernel.org/lkml/205bd84a-fe8e-4963-968e-0763285f35ba@xxxxxxxxxxxxxxxxxxxxxxxxx
---
include/linux/interrupt.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 5c9bdd3..dac7466 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -168,7 +168,7 @@ static inline int __must_check
request_irq(unsigned int irq, irq_handler_t handler, unsigned long flags,
const char *name, void *dev)
{
- return request_threaded_irq(irq, handler, NULL, flags, name, dev);
+ return request_threaded_irq(irq, handler, NULL, flags | IRQF_COND_ONESHOT, name, dev);
}

extern int __must_check