Linux Sound subsystem development
 help / color / mirror / Atom feed
From: sashiko-bot@kernel.org
To: "Vijendar Mukunda" <Vijendar.Mukunda@amd.com>
Cc: linux-sound@vger.kernel.org
Subject: Re: [PATCH v6 20/23] soundwire: amd: fix interrupt gate and work drain ordering in PM ops
Date: Tue, 17 Nov 2026 07:48:54 +0000	[thread overview]
Message-ID: <sashiko-outbox-218381@kernel.org> (raw)
In-Reply-To: <20261117070906.803139-21-Vijendar.Mukunda@amd.com>

Thank you for your contribution! Sashiko AI review found 2 potential
issues to consider:
- [High] soundwire: amd: runtime PM deadlock in amd_suspend_runtime()
  work drain
- [Medium] soundwire: amd: stale status bits and early IRQ enable in
  amd_suspend()
--

commit 9fb00434cce0e9e4cd0523448b2e4bde7b333b08
Author: Vijendar Mukunda <Vijendar.Mukunda@amd.com>

soundwire: amd: fix interrupt gate and work drain ordering in PM ops

This commit reorders interrupt masking, workqueue draining, and wake
configuration across the CLK_STOP_MODE and POWER_OFF_MODE paths in
amd_suspend() and amd_suspend_runtime().

> diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c
> index 57238c81997a2..220abf73cb25e 100644
> --- a/drivers/soundwire/amd_manager.c
> +++ b/drivers/soundwire/amd_manager.c
> @@ -1430,17 +1430,20 @@ static int __maybe_unused amd_suspend(struct device *dev)
>  	}
>  
>  	if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) {
> +		amd_disable_sdw_interrupts(amd_manager);
> +		cancel_work_sync(&amd_manager->amd_sdw_irq_thread);
>  		cancel_work_sync(&amd_manager->amd_sdw_work);
> -		amd_sdw_wake_enable(amd_manager, false);
>  		ret = amd_sdw_host_wake_enable_by_rev(amd_manager, false);
>  		if (ret)
>  			return ret;
>  		ret = amd_sdw_clock_stop(amd_manager);
>  		if (ret)
>  			return ret;
> +		amd_enable_sdw_interrupts(amd_manager);

[Severity: Medium]
Can calling amd_enable_sdw_interrupts() after amd_sdw_clock_stop() without
clearing ACP_SW_STATE_CHANGE_STATUS_0TO7 and
ACP_SW_STATE_CHANGE_STATUS_8TO11 cause amd_sdw_irq_thread() to process
stale peripheral status bits while the SoundWire clock is stopped?

When a SoundWire interrupt fires just before amd_disable_sdw_interrupts(),
the parent ACP hard IRQ handler clears ACP_EXTERNAL_INTR_STAT and schedules
amd_sdw_irq_thread, but the status registers are only cleared at the end of
amd_sdw_irq_thread():

drivers/soundwire/amd_manager.c:amd_sdw_irq_thread() {
	if (!READ_ONCE(amd_manager->interrupt_enabled))
		return;

	status_change_8to11 = readl(amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_8TO11);
	status_change_0to7 = readl(amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_0TO7);
    ...
}

Because amd_disable_sdw_interrupts() sets interrupt_enabled to false and
cancels amd_sdw_irq_thread without clearing those registers, any pending
status bits (or bits latched during amd_sdw_clock_stop()) remain set in
hardware.  In amd_suspend_runtime(), when a subsequent wake event triggers
amd_sdw_irq_thread(), amd_sdw_process_wake_event() only queues an
asynchronous pm_request_resume() before falling through to read the stale
status_change_8to11 and status_change_0to7 bits and schedule amd_sdw_work
while the link is still down, resulting in MIPI command timeouts
(-ETIMEDOUT).

In addition, the parent ACP IRQ handlers do not check interrupt_enabled
before calling schedule_work(&amd_manager->amd_sdw_irq_thread), so an
in-flight hard IRQ can queue amd_sdw_irq_thread after cancel_work_sync()
returns and run once amd_enable_sdw_interrupts() sets interrupt_enabled
back to true.  Finally, amd_sdw_clock_stop() returns 0 on its error paths,
so if clock stop fails, amd_enable_sdw_interrupts() re-enables state-change
interrupts with the bus clock still running.

[ ... ]

> @@ -1491,18 +1493,24 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev)
>  		return 0;
>  	}
>  	if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) {
> -		amd_sdw_wake_enable(amd_manager, true);
> +		amd_disable_sdw_interrupts(amd_manager);
> +		cancel_work_sync(&amd_manager->amd_sdw_irq_thread);
> +		cancel_work_sync(&amd_manager->amd_sdw_work);
>  		ret = amd_sdw_host_wake_enable_by_rev(amd_manager, true);
>  		if (ret)
>  			return ret;
>  		ret = amd_sdw_clock_stop(amd_manager);
>  		if (ret)
>  			return ret;
> +		amd_enable_sdw_interrupts(amd_manager);
> +		amd_sdw_wake_enable(amd_manager, true);
>  	} else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) {
> +		amd_disable_sdw_interrupts(amd_manager);
> +		cancel_work_sync(&amd_manager->amd_sdw_irq_thread);
> +		cancel_work_sync(&amd_manager->amd_sdw_work);

[Severity: High]
Can cancel_work_sync(&amd_manager->amd_sdw_work) in amd_suspend_runtime()
deadlock with amd_sdw_update_slave_status_work()?

kworker/0                          kworker/1
rpm_suspend(amd_manager->dev)
  runtime_status = RPM_SUSPENDING
  amd_suspend_runtime()
                                   amd_sdw_update_slave_status_work()
                                     sdw_handle_slave_status()
                                       sdw_handle_slave_alerts()
                                         pm_runtime_get_sync(&slave->dev)
                                           rpm_resume(bus->dev, 0)
                                             rpm_resume(amd_manager->dev, 0)
                                               /* waits on RPM_SUSPENDING */
    cancel_work_sync(&amd_sdw_work)  <-- deadlock

In the SoundWire device hierarchy, slave->dev is a child of bus->dev, which
is a child of amd_manager->dev, so both children are in RPM_SUSPENDED when
amd_manager->dev enters rpm_suspend().  If a peripheral alert schedules
amd_sdw_work just before amd_disable_sdw_interrupts() masks interrupts,
sdw_handle_slave_alerts() calls pm_runtime_get_sync(&slave->dev), which
synchronously resumes the parent chain up to amd_manager->dev and sleeps on
amd_manager->dev->power.wait_queue waiting for amd_suspend_runtime() to
finish, while amd_suspend_runtime() waits in cancel_work_sync() for
amd_sdw_work to complete.

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261117070906.803139-1-Vijendar.Mukunda@amd.com?part=20

  reply	other threads:[~2026-11-17  7:48 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-17  7:05 [PATCH v6 00/23] soundwire: amd: SoundWire manager driver bug fixes Vijendar Mukunda
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:26   ` sashiko-bot
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:30   ` sashiko-bot
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:37   ` sashiko-bot
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:31   ` sashiko-bot
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:48   ` sashiko-bot [this message]
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=sashiko-outbox-218381@kernel.org \
    --to=sashiko-bot@kernel.org \
    --cc=Vijendar.Mukunda@amd.com \
    --cc=linux-sound@vger.kernel.org \
    --cc=sashiko-reviews@lists.linux.dev \
    /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