[PATCH v6 20/23] soundwire: amd: fix interrupt gate and work drain ordering in PM ops

From: Vijendar Mukunda

Date: Tue Nov 17 2026 - 02:12:14 EST


Fix ordering and sequencing bugs across the CLK_STOP_MODE and
POWER_OFF_MODE suspend paths:

amd_suspend():
- CLK_STOP_MODE: cancel_work_sync(&amd_sdw_work) ran without first
closing the ACP_EXTERNAL_INTR_CNTL delivery gate or draining
amd_sdw_irq_thread. An ISR already in flight when the drain
completed could re-queue work after cancel_work_sync() returned,
racing amd_sdw_clock_stop(). amd_sdw_wake_enable(false) preceding
the work drain was also redundant: amd_disable_sdw_interrupts()
already masks all SDW interrupt delivery including wake. The
amd_enable_sdw_interrupts() call after clock stop restores all
state-change, error, and delivery masks; in CLK_STOP_MODE only the
SDW clock is gated so no state-change interrupt can be asserted after
clock stop. The wake bit is not part of the restored masks; wake
interrupts are only asserted when the system transitions to D3.
If amd_sdw_host_wake_enable_by_rev() returns -EINVAL the operation
aborts; this indicates an unrecognized acp_rev, which is an
unsupported configuration on this driver.
- POWER_OFF_MODE: same missing gate closure and irq_thread drain
before the work drain; a redundant amd_disable_sdw_interrupts()
call was placed after clock stop instead of before the drains;
amd_sdw_wake_enable(false) at the top of this branch was
redundant because amd_disable_sdw_interrupts() (now moved first)
already zeroes ACP_SW_STATE_CHANGE_STATUS_MASK_8TO11, which
covers the wake bit.

amd_suspend_runtime():
- CLK_STOP_MODE: neither amd_sdw_irq_thread nor amd_sdw_work was
drained at all before amd_sdw_clock_stop(); the interrupt delivery
gate was not closed before the drains and not reopened after clock
stop; amd_sdw_wake_enable(true) was placed before the drains
instead of after clock stop. If amd_sdw_host_wake_enable_by_rev()
returns -EINVAL the operation aborts; this indicates an unrecognized
acp_rev, which is an unsupported configuration on this driver.
- POWER_OFF_MODE: missing gate closure, irq_thread drain, and work
drain before clock stop; amd_disable_sdw_interrupts() was placed
after clock stop instead of before.

Fixes: 86a4371b7697 ("soundwire: amd: fix for handling slave alerts after link is down")
Reported-by: Lee Jones <lee@xxxxxxxxxx>
Closes: https://sashiko.dev/#/bug/linux-3b774ace-00cf-41e6-82eb-85cd43f5e1d6
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@xxxxxxx>
---
drivers/soundwire/amd_manager.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c
index ecef22baffc0..4f997198f5fe 100644
--- a/drivers/soundwire/amd_manager.c
+++ b/drivers/soundwire/amd_manager.c
@@ -1431,17 +1431,20 @@ static int __maybe_unused amd_suspend(struct device *dev)
}

if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) {
+ amd_disable_sdw_interrupts(amd_manager);
+ cancel_work_sync(&amd_manager->amd_sdw_irq_thread);
cancel_work_sync(&amd_manager->amd_sdw_work);
- amd_sdw_wake_enable(amd_manager, false);
ret = amd_sdw_host_wake_enable_by_rev(amd_manager, false);
if (ret)
return ret;
ret = amd_sdw_clock_stop(amd_manager);
if (ret)
return ret;
+ amd_enable_sdw_interrupts(amd_manager);
} else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) {
+ amd_disable_sdw_interrupts(amd_manager);
+ cancel_work_sync(&amd_manager->amd_sdw_irq_thread);
cancel_work_sync(&amd_manager->amd_sdw_work);
- amd_sdw_wake_enable(amd_manager, false);
ret = amd_sdw_host_wake_enable_by_rev(amd_manager, false);
if (ret)
return ret;
@@ -1452,7 +1455,6 @@ static int __maybe_unused amd_suspend(struct device *dev)
ret = amd_sdw_clock_stop(amd_manager);
if (ret)
return ret;
- amd_disable_sdw_interrupts(amd_manager);
ret = amd_disable_sdw_manager(amd_manager);
if (ret)
return ret;
@@ -1492,18 +1494,24 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev)
return 0;
}
if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) {
- amd_sdw_wake_enable(amd_manager, true);
+ amd_disable_sdw_interrupts(amd_manager);
+ cancel_work_sync(&amd_manager->amd_sdw_irq_thread);
+ cancel_work_sync(&amd_manager->amd_sdw_work);
ret = amd_sdw_host_wake_enable_by_rev(amd_manager, true);
if (ret)
return ret;
ret = amd_sdw_clock_stop(amd_manager);
if (ret)
return ret;
+ amd_enable_sdw_interrupts(amd_manager);
+ amd_sdw_wake_enable(amd_manager, true);
} else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) {
+ amd_disable_sdw_interrupts(amd_manager);
+ cancel_work_sync(&amd_manager->amd_sdw_irq_thread);
+ cancel_work_sync(&amd_manager->amd_sdw_work);
ret = amd_sdw_clock_stop(amd_manager);
if (ret)
return ret;
- amd_disable_sdw_interrupts(amd_manager);
ret = amd_disable_sdw_manager(amd_manager);
if (ret)
return ret;
--
2.53.0