genirq/manage: Fix lock in irq_set_irq_wake()
Subsystems (2)
Jon Hunter
maintainerPATCH 1/1 genirq/manage: Fix lock in irq_set_irq_wake()
Commit 8589e325ba4f ("genirq/manage: Rework irq_set_irq_wake()") updated the irq_set_irq_wake() to use the new guards for locking the interrupt descriptor. However, in doing so inadvertently changed irq_set_irq_wake() such that the 'chip_bus_lock' is no longer acquired. This has caused system suspend tests to fail on some Tegra platforms. Fix this by correcting the guard used in irq_set_irq_wake() to ensure the 'chip_bus_lock' is held.
---
I know that this is in -next and so I am not sure if the commit hash will get updated before it is actually merged to mainline. Please advise if you want me to adjust the commit message.
kernel/irq/manage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/irq/manage.c +1 -1
@@ -846,7 +846,7 @@ static int set_irq_wake_real(unsigned int irq, unsigned int on)*/ int irq_set_irq_wake (unsigned int irq,unsigned int on) { - scoped_irqdesc_get_and_lock(irq, IRQ_GET_DESC_CHECK_GLOBAL) { + scoped_irqdesc_get_and_buslock(irq, IRQ_GET_DESC_CHECK_GLOBAL) {struct irq_desc *desc = scoped_irqdesc;int ret =0 ;
Signature · 1 line
2.43.0
[tip: irq/core] genirq/manage: Use the correct lock guard in irq_set_irq_wake()
The following commit has been merged into the irq/core branch of tip:
The following commit has been merged into the irq/core branch of tip:
Commit-ID: 58eb5721a445ea0af310d1410d7117a1910627bc Gitweb: https://git.kernel.org/tip/58eb5721a445ea0af310d1410d7117a1910627bc Author: Jon Hunter <[email protected]> AuthorDate: Wed, 14 May 2025 10:50:41 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 14 May 2025 12:05:58 +02:00
genirq/manage: Use the correct lock guard in irq_set_irq_wake()
Commit 8589e325ba4f ("genirq/manage: Rework irq_set_irq_wake()") updated the irq_set_irq_wake() to use the new guards for locking the interrupt descriptor.
However, in doing so it inadvertently changed irq_set_irq_wake() such that the 'chip_bus_lock' is no longer acquired. This has caused system suspend tests to fail on some Tegra platforms.
Fix this by correcting the guard used in irq_set_irq_wake() to ensure the 'chip_bus_lock' is held.
--- kernel/irq/manage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/irq/manage.c +1 -1
@@ -846,7 +846,7 @@ static int set_irq_wake_real(unsigned int irq, unsigned int on)*/ int irq_set_irq_wake (unsigned int irq,unsigned int on) { - scoped_irqdesc_get_and_lock(irq, IRQ_GET_DESC_CHECK_GLOBAL) { + scoped_irqdesc_get_and_buslock(irq, IRQ_GET_DESC_CHECK_GLOBAL) {struct irq_desc *desc = scoped_irqdesc;int ret =0 ;