From: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
To: <vkoul@kernel.org>
Cc: <yung-chuan.liao@linux.intel.com>,
<pierre-louis.bossart@linux.dev>, <Basavaraj.Hiregoudar@amd.com>,
<Sunil-kumar.Dommati@amd.com>, <venkataprasad.potturu@amd.com>,
<Syed.SabaKareem@amd.com>, <Mario.Limonciello@amd.com>,
<Richard.Gong@amd.com>, <Poojitha.N@amd.com>,
<linux-sound@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
"Vijendar Mukunda" <Vijendar.Mukunda@amd.com>
Subject: [PATCH v2 11/11] soundwire: amd: add interrupt_enabled synchronization for ACP7B/7E/7F
Date: Tue, 17 Nov 2026 13:31:50 +0530 [thread overview]
Message-ID: <20261117080239.918428-12-Vijendar.Mukunda@amd.com> (raw)
In-Reply-To: <20261117080239.918428-1-Vijendar.Mukunda@amd.com>
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@amd.com>
---
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
prev parent reply other threads:[~2026-11-17 8:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 8:01 [PATCH v2 00/11] soundwire: amd: add ACP7B/7E/7F SoundWire manager support Vijendar Mukunda
2026-11-17 8:01 ` [PATCH v2 01/11] soundwire: amd: add ACP7B/7E/7F register definitions and revision IDs Vijendar Mukunda
2026-11-17 8:01 ` [PATCH v2 02/11] soundwire: amd: add ACP7B/7E/7F hardware backend Vijendar Mukunda
2026-11-17 8:01 ` [PATCH v2 03/11] soundwire: amd: extend ctl_word_prep to set SSP_TAG for ACP7B/7E/7F Vijendar Mukunda
2026-11-17 8:01 ` [PATCH v2 04/11] soundwire: amd: add ACP7B/7E/7F DAI PCM capabilities in register_dais() Vijendar Mukunda
2026-11-17 8:01 ` [PATCH v2 05/11] soundwire: amd: enable host wake support for ACP7B/7E/7F Vijendar Mukunda
2026-11-17 8:01 ` [PATCH v2 06/11] soundwire: amd: add ACP7B/7E/7F clock-stop support Vijendar Mukunda
2026-11-17 8:01 ` [PATCH v2 07/11] soundwire: amd: add IO pad enable/disable for ACP7B/7E/7F D0/D3 sequence Vijendar Mukunda
2026-11-17 8:01 ` [PATCH v2 08/11] soundwire: generic_bandwidth_allocation: fix hwidth for skipped block offset Vijendar Mukunda
2026-11-17 8:01 ` [PATCH v2 09/11] soundwire: generic_bandwidth_allocation: export bandwidth helper functions Vijendar Mukunda
2026-11-17 8:01 ` [PATCH v2 10/11] soundwire: amd: add ACP7x generic bandwidth allocation support Vijendar Mukunda
2026-11-17 8:01 ` Vijendar Mukunda [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261117080239.918428-12-Vijendar.Mukunda@amd.com \
--to=vijendar.mukunda@amd.com \
--cc=Basavaraj.Hiregoudar@amd.com \
--cc=Mario.Limonciello@amd.com \
--cc=Poojitha.N@amd.com \
--cc=Richard.Gong@amd.com \
--cc=Sunil-kumar.Dommati@amd.com \
--cc=Syed.SabaKareem@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=pierre-louis.bossart@linux.dev \
--cc=venkataprasad.potturu@amd.com \
--cc=vkoul@kernel.org \
--cc=yung-chuan.liao@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®