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>, <lee@kernel.org>,
<linux-sound@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Subject: [PATCH v6 00/23] soundwire: amd: SoundWire manager driver bug fixes
Date: Tue, 17 Nov 2026 12:35:35 +0530 [thread overview]
Message-ID: <20261117070906.803139-1-Vijendar.Mukunda@amd.com> (raw)
This series collects bug fixes for the AMD SoundWire manager driver
(ACP6.3/7.0/7.1/7.2). The patches address correctness issues across
five areas. Patches 9, 12, 13, 15, 20, and 21 fix issues reported by
Lee Jones <lee@kernel.org>.
Wake interrupt handling (patches 1-8): fixes reported on OEM platforms
running ACP6.3/7.0/7.1/7.2. Consolidate pad register macros into
amd_init.h, add correct SCHMEN/OE programming for ACP 7.0/7.1/7.2,
introduce D0/D3 PM pad helpers, track full pad teardown across
suspend/resume, fix missing wake interrupt and group wake-arming calls
in runtime suspend, fix the IRQ thread dropping STATUS_0TO7 on
simultaneous wake and state-change events, remove the spurious
STATUS_8TO11 clear in amd_sdw_process_wake_event(), and fix a missing
wake interrupt for ACP6.3 in POWER_OFF suspend.
Command response handling (patches 9-11): fix silent widening of
-ETIMEDOUT to u64 (reported by Lee Jones), cache the last successful
PING result to avoid spurious disconnect warnings on transient timeouts,
and add lockdep_assert_held() to enforce the msg_lock contract.
Work-queue and driver lifecycle (patches 12-16): fix drain ordering in
the remove path and defer dev_set_drvdata() until after INIT_WORK() to
close a concurrent-remove window (both reported by Lee Jones), guard
pm_runtime_disable() against unpaired calls, guard IRQ work execution
with the interrupt_enabled flag using WRITE_ONCE/READ_ONCE to annotate
the cross-context access (reported by Lee Jones), and delay *sdw_ctx
publication until after sdw_amd_startup() succeeds. The corresponding
NULL-check fixes for the IRQ handler window opened by patch 16 have
been posted as ASoC companion patches and are already merged:
34ea81a7f284 ("ASoC: SOF: amd: guard adata->sdw dereferences with
NULL check in IRQ handler")
41e06aaef9c0 ("ASoC: amd: ps: guard adata->sdw dereferences with
NULL check in IRQ handler")
Power management (patches 17-20): propagate amd_init_sdw_manager()
errors on POWER_OFF resume, drop amd_deinit_sdw_manager() in POWER_OFF
suspend, replace the open-coded >= ACP70 comparison with an explicit
switch/case, and fix interrupt-gate and work-drain ordering in PM ops
(reported by Lee Jones).
Drvdata and register safety (patches 21-23): add a NULL drvdata guard
in sdw_amd_startup() (reported by Lee Jones), and fix shared-register
read-modify-write races in amd_sdw_set_device_state() and
amd_sdw_host_wake_enable() by holding acp_sdw_lock.
Changes since v5:
- Drop patch 10 (return response on IMM status cleanup timeout) and
patch 11 (clarify bad-state guard poll omission in IMM_RES_VALID
path): dropped after review feedback.
- Patch 2: rename disable_oe to needs_schmen_oe for clarity; update
Fixes tags to cite ACP 7.x introduction commits instead of the
ACP 6.3-only refactor commit:
commit 2c0ae8ef1e5e ("soundwire: amd: add support for ACP7.0 & ACP7.1 platforms")
commit 34b1cb4ec286 ("soundwire: amd: Add support for acp7.2 platform")
- Patch 4: use "POWER_OFF_MODE runtime suspend" instead of
"wake-armed runtime suspend" for precision.
- Patch 5: add commit description explaining why the early return
before wake-arming is correct when amd_deinit_sdw_manager() fails;
update Fixes tag to commit dcc48a73eae7 ("soundwire: amd: change the
soundwire wake enable/disable sequence").
- Patch 8: update Fixes tag to correct commit SHA.
- Patch 9: drop dev_err_ratelimited() calls for ping status timeout;
the error is already tracked via the cache introduced in patch 10.
- Patch 14: update Fixes tag to commit ed5e8741b8db ("soundwire: amd:
refactor amd soundwire manager device node creation"), which introduced
the partial-init startup sequence that makes the unconditional
pm_runtime_disable() incorrect.
- Patch 15: add WRITE_ONCE() for all stores to interrupt_enabled and
READ_ONCE() for the load in amd_sdw_irq_thread(); restore
interrupt_enabled in the ACP6.3-specific wake-re-enable block in
amd_suspend_runtime() POWER_OFF_MODE; guard IRQ work execution
instead of scheduling.
- Patch 16: simplify to single-problem description (ctx leak on
startup failure); remove the concurrent IRQ handler race rationale.
Two ASoC companion patches addressing the IRQ handler NULL dereference
window (adata->sdw dereferenced without NULL check between
amd_enable_sdw_interrupts() and *sdw_ctx assignment) have been posted
and merged in Mark Brown's ASoC tree:
34ea81a7f284 ("ASoC: SOF: amd: guard adata->sdw dereferences with
NULL check in IRQ handler")
41e06aaef9c0 ("ASoC: amd: ps: guard adata->sdw dereferences with
NULL check in IRQ handler")
- Patch 19: add WRITE_ONCE(interrupt_enabled, true) in the ACP6.3
wake-re-enable block in amd_suspend_runtime() POWER_OFF_MODE.
- Patch 20: expand description to explain the redundant
amd_sdw_wake_enable(false) calls and clarify CLK_STOP_MODE
interrupt handling through D3.
- Link to v5:
https://lore.kernel.org/linux-sound/20261107154659.3358223-1-Vijendar.Mukunda@amd.com/
Changes since v4:
- Add patches 1-8 (OEM-reported wake interrupt fixes for
ACP6.3/7.0/7.1/7.2): pad register macro consolidation, SCHMEN/OE
programming for ACP 7.0/7.1/7.2, D0/D3 PM helpers, pad teardown
tracking, missing wake interrupt in runtime suspend, STATUS_0TO7
race fix (promoted from patch 12/13 in v4), STATUS_8TO11 fix
reworked to a targeted removal of the clear in
amd_sdw_process_wake_event(), and ACP6.3 POWER_OFF wake fix.
- Add patch 11: clarify bad-state guard poll omission in
IMM_RES_VALID path.
- Add patch 15: defer dev_set_drvdata() until after INIT_WORK().
- Add patches 17-18: guard IRQ work with interrupt_enabled flag;
delay *sdw_ctx publication until after startup succeeds
(supersedes v4 patch 7 ctx-leak fix with a more robust approach).
- Add patches 23-25: NULL drvdata guard in sdw_amd_startup(), and
shared-register RMW races in amd_sdw_set_device_state() and
amd_sdw_host_wake_enable().
- Drop v4 patch 7 (fix ctx leak when sdw_amd_startup() fails):
superseded by patch 18.
- Link to v4:
https://lore.kernel.org/all/20261026044507.2310694-1-Vijendar.Mukunda@amd.com/
Changes since v3:
- Add patch 12/13 to fix IRQ thread dropping STATUS_0TO7 when a
wake event and a device-state change arrive simultaneously.
- Add patch 13/13 to fix STATUS_8TO11 double-clear race in the
wake handler introduced by the simultaneous-wake fix.
- Add lockdep_assert_held() to amd_sdw_read_ping_status() (patch 4/13)
to enforce the msg_lock contract machine-checkably.
- Add return response on IMM status cleanup timeout (patch 2/13).
- Update patch 11/13 (fix interrupt gate and work drain ordering in PM
ops) to also fix amd_sdw_wake_enable() ordering in both CLK_STOP_MODE
paths: move the call to after amd_enable_sdw_interrupts() so the
unconditional interrupt mask write does not clobber the wake bit.
Changes since v2:
- Update comment for ping_slave_stat variable description in patch 3/13.
- Split the remove path work drain and pm ops guard patch into separate
patches (patches 5/13 and 6/13) to improve clarity and maintainability.
Changes since v1:
- Rework patch 1 to fix the u64 return type properly via out-parameter.
Vijendar Mukunda (23):
soundwire: amd: consolidate pad register macros into amd_init.h
soundwire: amd: program pad SCHMEN and OE control for ACP 7.0/7.1/7.2
soundwire: amd: add pad ctrl helpers for D0/D3 PM transitions
soundwire: amd: track full pad teardown across suspend/resume
soundwire: amd: fix missing wake interrupt and group wake-arming calls
in runtime suspend
soundwire: amd: fix IRQ thread dropping STATUS_0TO7 on simultaneous
wake
soundwire: amd: remove STATUS_8TO11 clear from
amd_sdw_process_wake_event()
soundwire: amd: fix missing wake interrupt for ACP6.3 in POWER_OFF
suspend
soundwire: amd: fix SDW command timeout return value handling
soundwire: amd: cache ping slave status to avoid spurious disconnect
on timeout
soundwire: amd: assert msg_lock is held in amd_sdw_read_ping_status()
soundwire: amd: fix work drain ordering in remove path
soundwire: amd: defer dev_set_drvdata() until after INIT_WORK()
soundwire: amd: pm_runtime guard in remove path
soundwire: amd: use interrupt_enabled flag to guard IRQ work
scheduling
soundwire: amd: delay *sdw_ctx publication until after startup
succeeds
soundwire: amd: propagate amd_init_sdw_manager() error on resume
soundwire: amd: drop amd_deinit_sdw_manager() in POWER_OFF suspend
soundwire: amd: replace >= ACP70 with explicit switch/case in PM paths
soundwire: amd: fix interrupt gate and work drain ordering in PM ops
soundwire: amd: check for NULL manager drvdata in sdw_amd_startup()
soundwire: amd: fix shared-register RMW race in
amd_sdw_set_device_state()
soundwire: amd: fix shared-register RMW race in
amd_sdw_host_wake_enable()
drivers/soundwire/amd_init.c | 75 +++++--
drivers/soundwire/amd_init.h | 18 ++
drivers/soundwire/amd_manager.c | 351 ++++++++++++++++++++++++------
drivers/soundwire/amd_manager.h | 10 -
include/linux/soundwire/sdw_amd.h | 15 ++
5 files changed, 365 insertions(+), 104 deletions(-)
--
2.53.0
next reply other threads:[~2026-11-17 7:10 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 7:05 Vijendar Mukunda [this message]
2026-11-17 7:05 ` [PATCH v6 01/23] soundwire: amd: consolidate pad register macros into amd_init.h Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 02/23] soundwire: amd: program pad SCHMEN and OE control for ACP 7.0/7.1/7.2 Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 03/23] soundwire: amd: add pad ctrl helpers for D0/D3 PM transitions Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 04/23] soundwire: amd: track full pad teardown across suspend/resume Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 05/23] soundwire: amd: fix missing wake interrupt and group wake-arming calls in runtime suspend Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 06/23] soundwire: amd: fix IRQ thread dropping STATUS_0TO7 on simultaneous wake Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 07/23] soundwire: amd: remove STATUS_8TO11 clear from amd_sdw_process_wake_event() Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 08/23] soundwire: amd: fix missing wake interrupt for ACP6.3 in POWER_OFF suspend Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 09/23] soundwire: amd: fix SDW command timeout return value handling Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 10/23] soundwire: amd: cache ping slave status to avoid spurious disconnect on timeout Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 11/23] soundwire: amd: assert msg_lock is held in amd_sdw_read_ping_status() Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 12/23] soundwire: amd: fix work drain ordering in remove path Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 13/23] soundwire: amd: defer dev_set_drvdata() until after INIT_WORK() Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 14/23] soundwire: amd: pm_runtime guard in remove path Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 15/23] soundwire: amd: use interrupt_enabled flag to guard IRQ work scheduling Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 16/23] soundwire: amd: delay *sdw_ctx publication until after startup succeeds Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 17/23] soundwire: amd: propagate amd_init_sdw_manager() error on resume Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 18/23] soundwire: amd: drop amd_deinit_sdw_manager() in POWER_OFF suspend Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 19/23] soundwire: amd: replace >= ACP70 with explicit switch/case in PM paths Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 20/23] soundwire: amd: fix interrupt gate and work drain ordering in PM ops Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 21/23] soundwire: amd: check for NULL manager drvdata in sdw_amd_startup() Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 22/23] soundwire: amd: fix shared-register RMW race in amd_sdw_set_device_state() Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 23/23] soundwire: amd: fix shared-register RMW race in amd_sdw_host_wake_enable() Vijendar Mukunda
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=20261117070906.803139-1-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=lee@kernel.org \
--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®