[PATCH v6 15/23] soundwire: amd: use interrupt_enabled flag to guard IRQ work scheduling

From: Vijendar Mukunda

Date: Tue Nov 17 2026 - 02:11:52 EST


Add an interrupt_enabled boolean to struct amd_sdw_manager to prevent
already-queued work from executing during the window between starting to
disable interrupts and the hardware masks taking effect.

- Add interrupt_enabled to struct amd_sdw_manager.
- Set it to true at the start of amd_enable_sdw_interrupts(), before
unmasking any hardware registers, so no IRQ can fire with the flag false.
- Clear it to false at the start of amd_disable_sdw_interrupts(), before
touching any hardware registers, so that queued work items that start
executing after the flag is cleared will return early.
- Guard execution of amd_sdw_irq_thread() with an early-return flag check.
- Restore interrupt_enabled inside the ACP6.3-specific wake-re-enable
block in amd_suspend_runtime() POWER_OFF_MODE, so that wake events are
processed after hardware wake delivery is re-armed.
- Use WRITE_ONCE() for all stores to interrupt_enabled and READ_ONCE()
for the load in amd_sdw_irq_thread() to annotate the intended
single-writer/single-reader cross-context access and prevent compiler
caching under LKMM.

Reported-by: Lee Jones <lee@xxxxxxxxxx>
Closes: https://sashiko.dev/#/bug/linux-ab458b2e-f505-4a41-8238-a93ceb5d9c77
Fixes: 65f93e4096a0 ("soundwire: amd: add SoundWire manager interrupt handling")
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@xxxxxxx>
---
drivers/soundwire/amd_manager.c | 17 +++++++++++++++++
include/linux/soundwire/sdw_amd.h | 4 ++++
2 files changed, 21 insertions(+)

diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c
index 93c96613b5d8..1a3d3af4e0a4 100644
--- a/drivers/soundwire/amd_manager.c
+++ b/drivers/soundwire/amd_manager.c
@@ -119,6 +119,7 @@ static void amd_enable_sdw_interrupts(struct amd_sdw_manager *amd_manager)
{
u32 val;

+ WRITE_ONCE(amd_manager->interrupt_enabled, true);
mutex_lock(amd_manager->acp_sdw_lock);
val = sdw_manager_reg_mask_array[amd_manager->instance];
amd_updatel(amd_manager->acp_mmio, ACP_EXTERNAL_INTR_CNTL(amd_manager->instance), val, val);
@@ -135,6 +136,18 @@ static void amd_disable_sdw_interrupts(struct amd_sdw_manager *amd_manager)
{
u32 irq_mask;

+ /*
+ * Clear the flag before updating hardware masks. Work items already
+ * queued but not yet started will see the flag false at entry and
+ * return early; work items already running will complete their current
+ * invocation. Callers that need to ensure no instance of
+ * amd_sdw_irq_thread() is executing on return must follow this call
+ * with cancel_work_sync(&amd_manager->amd_sdw_irq_thread). Once the
+ * mask registers are written, the ACP hardware will not assert any new
+ * SDW interrupt.
+ */
+ WRITE_ONCE(amd_manager->interrupt_enabled, false);
+
mutex_lock(amd_manager->acp_sdw_lock);
irq_mask = sdw_manager_reg_mask_array[amd_manager->instance];
amd_updatel(amd_manager->acp_mmio, ACP_EXTERNAL_INTR_CNTL(amd_manager->instance),
@@ -1112,6 +1125,9 @@ static void amd_sdw_irq_thread(struct work_struct *work)
u32 status_change_8to11;
u32 status_change_0to7;

+ if (!READ_ONCE(amd_manager->interrupt_enabled))
+ return;
+
status_change_8to11 = readl(amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_8TO11);
status_change_0to7 = readl(amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_0TO7);
if (!status_change_0to7 && !status_change_8to11)
@@ -1482,6 +1498,7 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev)
return ret;
} else if ((amd_manager->acp_rev == ACP63_PCI_REV_ID) &&
amd_manager->wake_en_mask) {
+ WRITE_ONCE(amd_manager->interrupt_enabled, true);
mutex_lock(amd_manager->acp_sdw_lock);
val = sdw_manager_reg_mask_array[amd_manager->instance];
amd_updatel(amd_manager->acp_mmio,
diff --git a/include/linux/soundwire/sdw_amd.h b/include/linux/soundwire/sdw_amd.h
index bf97c790c669..2213eea4afe1 100644
--- a/include/linux/soundwire/sdw_amd.h
+++ b/include/linux/soundwire/sdw_amd.h
@@ -85,6 +85,9 @@ struct sdw_amd_dai_runtime {
* @ping_slave_stat: cached slave status from the last ping
* transaction that returned a response;
* initialised to U32_MAX ("no valid reading yet")
+ * @interrupt_enabled: set when hardware interrupts are enabled; cleared
+ * before disabling to prevent queued work from executing
+ * interrupt events during teardown
* @dai_runtime_array: dai runtime array
*/
struct amd_sdw_manager {
@@ -117,6 +120,7 @@ struct amd_sdw_manager {
u32 ping_slave_stat;
bool clk_stopped;
bool pad_fully_torn_down;
+ bool interrupt_enabled;

struct sdw_amd_dai_runtime **dai_runtime_array;
};
--
2.53.0