[PATCH v2 11/11] soundwire: amd: add interrupt_enabled synchronization for ACP7B/7E/7F

From: Vijendar Mukunda

Date: Tue Nov 17 2026 - 03:05:46 EST


Mirror the interrupt_enabled guard already used by the ACP6.3/7.0/7.1/7.2
manager to prevent new work from being queued during teardown.

- amd_acp7x_enable_sdw_interrupts(): set interrupt_enabled to true before
unmasking any hardware registers, so no IRQ can fire with the flag false
and lose an event by skipping schedule_work() while clearing status regs.
- amd_acp7x_disable_sdw_interrupts(): clear interrupt_enabled before
writing the hardware mask registers so any in-flight IRQ that arrives
during the mask writes sees the flag as false and skips scheduling.
- amd_acp7x_sdw_irq_thread(): guard schedule_work() with the
interrupt_enabled flag to avoid queueing new work once the driver
has begun teardown.

Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@xxxxxxx>
---
drivers/soundwire/amd_acp7x_manager.c | 11 +++++++++++
1 file changed, 11 insertions(+)

diff --git a/drivers/soundwire/amd_acp7x_manager.c b/drivers/soundwire/amd_acp7x_manager.c
index 34d159dcc991..8e080c81a47b 100644
--- a/drivers/soundwire/amd_acp7x_manager.c
+++ b/drivers/soundwire/amd_acp7x_manager.c
@@ -343,6 +343,7 @@ static void amd_acp7x_enable_sdw_interrupts(struct amd_sdw_manager *amd_manager)
{
u32 val, acp_ext_intr_cntl, sdw_intr_cntl;

+ WRITE_ONCE(amd_manager->interrupt_enabled, true);
mutex_lock(amd_manager->acp_sdw_lock);
val = acp7x_sdw_manager_reg_mask_array[amd_manager->instance];
acp_ext_intr_cntl = readl(amd_manager->acp_mmio + ACP7X_EXTERNAL_INTR_CNTL);
@@ -365,6 +366,13 @@ static void amd_acp7x_disable_sdw_interrupts(struct amd_sdw_manager *amd_manager
{
u32 val, acp_ext_intr_cntl, sdw_intr_cntl;

+ /*
+ * Clear the flag before updating hardware masks so that any IRQ
+ * that fires during the mask-register writes sees the flag as false
+ * and does not queue new work.
+ */
+ WRITE_ONCE(amd_manager->interrupt_enabled, false);
+
mutex_lock(amd_manager->acp_sdw_lock);
val = acp7x_sdw_manager_reg_mask_array[amd_manager->instance];
acp_ext_intr_cntl = readl(amd_manager->acp_mmio + ACP7X_EXTERNAL_INTR_CNTL);
@@ -539,6 +547,9 @@ void amd_acp7x_sdw_irq_thread(struct amd_sdw_manager *amd_manager)
u32 status_change_8to11;
u32 status_change_0to7;

+ if (!READ_ONCE(amd_manager->interrupt_enabled))
+ return;
+
status_change_8to11 = readl(amd_manager->mmio + ACP7X_SW_STATE_CHANGE_STATUS_8TO11);
status_change_0to7 = readl(amd_manager->mmio + ACP7X_SW_STATE_CHANGE_STATUS_0TO7);
if (!status_change_0to7 && !status_change_8to11)
--
2.53.0