[PATCH v4 11/11] soundwire: amd: guard clock-stop register access by acp_rev
From: Vijendar Mukunda
Date: Tue Nov 17 2026 - 02:21:49 EST
Wrap the readl_poll_timeout call in amd_sdw_clock_stop() in an explicit
switch/case block on acp_rev covering ACP63, ACP70, ACP71, and ACP72,
selecting the register offset via clk_resume_ctrl.
An unrecognised revision returns -EINVAL before clk_stopped is set.
The wake-enable writel follows unconditionally under wake_en_mask since
the revision check above already guarantees a known acp_rev at that point,
avoiding a second switch that would leave clk_stopped = true on an
unexpected default branch.
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@xxxxxxx>
---
drivers/soundwire/amd_manager_common.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/drivers/soundwire/amd_manager_common.c b/drivers/soundwire/amd_manager_common.c
index 987283d06cb9..7712469d6ce7 100644
--- a/drivers/soundwire/amd_manager_common.c
+++ b/drivers/soundwire/amd_manager_common.c
@@ -520,7 +520,7 @@ int amd_sdw_manager_start(struct amd_sdw_manager *amd_manager)
*/
int amd_sdw_clock_stop(struct amd_sdw_manager *amd_manager)
{
- u32 val;
+ u32 clk_resume_ctrl, val;
int ret;
ret = sdw_bus_prep_clk_stop(&amd_manager->bus);
@@ -534,8 +534,21 @@ int amd_sdw_clock_stop(struct amd_sdw_manager *amd_manager)
return 0;
}
- ret = readl_poll_timeout(amd_manager->mmio + ACP_SW_CLK_RESUME_CTRL, val,
- (val & AMD_SDW_CLK_STOP_DONE), ACP_DELAY_US, AMD_SDW_TIMEOUT);
+ 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:
+ clk_resume_ctrl = ACP_SW_CLK_RESUME_CTRL;
+ break;
+ default:
+ dev_err(amd_manager->dev, "unexpected acp_rev 0x%x\n", amd_manager->acp_rev);
+ return -EINVAL;
+ }
+
+ ret = readl_poll_timeout(amd_manager->mmio + clk_resume_ctrl, val,
+ (val & AMD_SDW_CLK_STOP_DONE),
+ ACP_DELAY_US, AMD_SDW_TIMEOUT);
if (ret) {
dev_err(amd_manager->dev, "SDW%x clock stop failed\n", amd_manager->instance);
return 0;
--
2.53.0