[PATCH v2 06/11] soundwire: amd: add ACP7B/7E/7F clock-stop support

From: Vijendar Mukunda

Date: Tue Nov 17 2026 - 03:04:31 EST


Extend amd_sdw_clock_stop() to handle ACP7B/7E/7F revisions.

Set clk_resume_ctrl to ACP7X_SW_CLK_RESUME_CTRL for the ACP7x
clock-stop sequence. For wake enable, ACP7B/7E/7F use a single
shared ACP7X_SW_WAKE_EN register with one bit per manager instance,
unlike older revisions which have dedicated per-instance registers.
Perform a read-modify-write under acp_sdw_lock to safely set the
instance bit without racing against other manager instances.

Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@xxxxxxx>
---
drivers/soundwire/amd_manager_common.c | 32 +++++++++++++++++++++++---
1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/drivers/soundwire/amd_manager_common.c b/drivers/soundwire/amd_manager_common.c
index 65eb17669d54..3589c4c33d4a 100644
--- a/drivers/soundwire/amd_manager_common.c
+++ b/drivers/soundwire/amd_manager_common.c
@@ -552,7 +552,7 @@ int amd_sdw_manager_start(struct amd_sdw_manager *amd_manager)
*/
int amd_sdw_clock_stop(struct amd_sdw_manager *amd_manager)
{
- u32 clk_resume_ctrl, val;
+ u32 clk_resume_ctrl, val, wake_en;
int ret;

ret = sdw_bus_prep_clk_stop(&amd_manager->bus);
@@ -573,6 +573,11 @@ int amd_sdw_clock_stop(struct amd_sdw_manager *amd_manager)
case ACP72_PCI_REV_ID:
clk_resume_ctrl = ACP_SW_CLK_RESUME_CTRL;
break;
+ case ACP7B_PCI_REV_ID:
+ case ACP7E_PCI_REV_ID:
+ case ACP7F_PCI_REV_ID:
+ clk_resume_ctrl = ACP7X_SW_CLK_RESUME_CTRL;
+ break;
default:
dev_err(amd_manager->dev, "unexpected acp_rev 0x%x\n", amd_manager->acp_rev);
return -EINVAL;
@@ -587,8 +592,29 @@ int amd_sdw_clock_stop(struct amd_sdw_manager *amd_manager)
}

amd_manager->clk_stopped = true;
- if (amd_manager->wake_en_mask)
- writel(0x01, amd_manager->acp_mmio + ACP_SW_WAKE_EN(amd_manager->instance));
+ if (amd_manager->wake_en_mask) {
+ switch (amd_manager->acp_rev) {
+ case ACP63_PCI_REV_ID:
+ case ACP70_PCI_REV_ID:
+ case ACP71_PCI_REV_ID:
+ case ACP72_PCI_REV_ID:
+ writel(0x01, amd_manager->acp_mmio + ACP_SW_WAKE_EN(amd_manager->instance));
+ break;
+ case ACP7B_PCI_REV_ID:
+ case ACP7E_PCI_REV_ID:
+ case ACP7F_PCI_REV_ID:
+ mutex_lock(amd_manager->acp_sdw_lock);
+ wake_en = readl(amd_manager->acp_mmio + ACP7X_SW_WAKE_EN);
+ wake_en |= BIT(amd_manager->instance);
+ writel(wake_en, amd_manager->acp_mmio + ACP7X_SW_WAKE_EN);
+ mutex_unlock(amd_manager->acp_sdw_lock);
+ break;
+ default:
+ dev_err(amd_manager->dev, "unexpected acp_rev 0x%x\n",
+ amd_manager->acp_rev);
+ return -EINVAL;
+ }
+ }

dev_dbg(amd_manager->dev, "SDW%x clock stop successful\n", amd_manager->instance);
return 0;
--
2.53.0