All of lore.kernel.org
 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 v7 15/23] soundwire: amd: use interrupt_enabled flag to guard IRQ work scheduling
Date: Wed, 18 Nov 2026 11:16:44 +0000	[thread overview]
Message-ID: <sashiko-outbox-220814@kernel.org> (raw)
In-Reply-To: <20261118104353.331556-16-Vijendar.Mukunda@amd.com>

Thank you for your contribution! Sashiko AI review found 2 potential
issues to consider:
- [Medium] soundwire: amd: uncleared status registers on
  amd_sdw_irq_thread() early return
- [Medium] soundwire: amd: race re-enabling IRQ masks in
  amd_disable_sdw_interrupts()
--

commit 269c03a96e80686f35053a07e902e710a24e59b0
Author: Vijendar Mukunda <Vijendar.Mukunda@amd.com>

soundwire: amd: use interrupt_enabled flag to guard IRQ work scheduling

This commit adds an interrupt_enabled flag to struct amd_sdw_manager to
prevent queued amd_sdw_irq_thread() work from running after interrupt
disabling begins, and restores the flag when re-arming wake interrupts on
ACP6.3 during runtime suspend.

> diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c
> index f3e9614b9ac82..5536a4fd137aa 100644
> --- a/drivers/soundwire/amd_manager.c
> +++ b/drivers/soundwire/amd_manager.c
[ ... ]
> @@ -135,6 +136,18 @@ static void amd_disable_sdw_interrupts(struct amd_sdw_manager *amd_manager)
>  {
>  	u32 irq_mask;
>  
> +	/*
> +	 * Clear the flag before updating hardware masks. Work items already
> +	 * queued but not yet started will see the flag false at entry and
> +	 * return early; work items already running will complete their current
> +	 * invocation. Callers that need to ensure no instance of
> +	 * amd_sdw_irq_thread() is executing on return must follow this call
> +	 * with cancel_work_sync(&amd_manager->amd_sdw_irq_thread). Once the
> +	 * mask registers are written, the ACP hardware will not assert any new
> +	 * SDW interrupt.
> +	 */
> +	WRITE_ONCE(amd_manager->interrupt_enabled, false);
> +
>  	mutex_lock(amd_manager->acp_sdw_lock);
>  	irq_mask = sdw_manager_reg_mask_array[amd_manager->instance];
>  	amd_updatel(amd_manager->acp_mmio, ACP_EXTERNAL_INTR_CNTL(amd_manager->instance),

[Severity: Medium]
Can an in-flight amd_sdw_update_slave_status_work() overwrite the zeroed
ACP_SW_STATE_CHANGE_STATUS_MASK_0TO7 and
ACP_SW_STATE_CHANGE_STATUS_MASK_8TO11 registers after
amd_disable_sdw_interrupts() returns?

CPU0                                  CPU1 (kworker)
amd_suspend_runtime()
  ...
  amd_disable_sdw_interrupts()
    WRITE_ONCE(interrupt_enabled,
               false)
    writel(0, ..._MASK_0TO7)
    writel(0, ..._MASK_8TO11)
                                      amd_sdw_update_slave_status_work()
                                        sdw_handle_slave_status()
                                        writel(AMD_SDW_IRQ_MASK_0TO7,
                                               ..._MASK_0TO7)
                                        writel(AMD_SDW_IRQ_MASK_8TO11,
                                               ..._MASK_8TO11)
  amd_sdw_wake_enable(..., true)
  WRITE_ONCE(interrupt_enabled, true)
  amd_updatel(...,
              ACP_EXTERNAL_INTR_CNTL,
              val, val)  <-- non-wake state-change IRQs left unmasked

Unlike sdw_cdns_enable_interrupt(), amd_disable_sdw_interrupts() zeroes
the mask registers before callers drain amd_manager->amd_sdw_work with
cancel_work_sync() (including after commit "soundwire: amd: fix interrupt
gate and work drain ordering in PM ops"), and
amd_sdw_update_slave_status_work() restores AMD_SDW_IRQ_MASK_0TO7 and
AMD_SDW_IRQ_MASK_8TO11 without checking interrupt_enabled:

drivers/soundwire/amd_manager.c:amd_sdw_update_slave_status_work() {
	...
	if (amd_manager->status[0] == SDW_SLAVE_ATTACHED) {
		if (retry_count++ < SDW_MAX_DEVICES) {
			writel(AMD_SDW_IRQ_MASK_0TO7, amd_manager->mmio +
			       ACP_SW_STATE_CHANGE_STATUS_MASK_0TO7);
			writel(AMD_SDW_IRQ_MASK_8TO11, amd_manager->mmio +
			       ACP_SW_STATE_CHANGE_STATUS_MASK_8TO11);
	...
}

In AMD_SDW_POWER_OFF_MODE runtime suspend, amd_sdw_wake_enable() then
performs a read-modify-write on ACP_SW_STATE_CHANGE_STATUS_MASK_8TO11
that preserves those re-enabled mask bits, and on ACP6.3 with
wake_en_mask set, amd_suspend_runtime() sets interrupt_enabled back to
true and re-opens ACP_EXTERNAL_INTR_CNTL, leaving non-wake state-change
interrupts unmasked and deliverable while the manager is suspended.

> @@ -1111,6 +1124,9 @@ static void amd_sdw_irq_thread(struct work_struct *work)
>  	u32 status_change_8to11;
>  	u32 status_change_0to7;
>  
> +	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);
>  	if (!status_change_0to7 && !status_change_8to11)

[Severity: Medium]
Does returning early here leave ACP_SW_STATE_CHANGE_STATUS_8TO11 and
ACP_SW_STATE_CHANGE_STATUS_0TO7 latched in hardware across runtime
suspend?

When a SoundWire interrupt fires shortly before
amd_disable_sdw_interrupts(), the hardirq handler clears
ACP_EXTERNAL_INTR_STAT and queues amd_sdw_irq_thread, leaving the status
bits latched in ACP_SW_STATE_CHANGE_STATUS_8TO11 and
ACP_SW_STATE_CHANGE_STATUS_0TO7 until the end of amd_sdw_irq_thread().
Because neither amd_disable_sdw_interrupts() nor this early return clears
those status registers (even after commit "soundwire: amd: fix interrupt
gate and work drain ordering in PM ops" drains the workqueues), the
pre-suspend status bits remain set when amd_suspend_runtime() restores
interrupt_enabled to true on ACP6.3 in AMD_SDW_POWER_OFF_MODE.

When a wake interrupt later arrives, amd_sdw_irq_thread() reads the stale
PREQ or state-change bits alongside AMD_SDW_WAKE_STAT_MASK, calls
asynchronous pm_request_resume() in amd_sdw_process_wake_event(), clears
only AMD_SDW_WAKE_STAT_MASK, and falls through to
amd_sdw_read_and_process_ping_status() or amd_sdw_update_slave_status()
and schedule_work(&amd_manager->amd_sdw_work) while the manager is still
disabled and clock-stopped.

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

  reply	other threads:[~2026-11-18 11:16 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-18 10:42 [PATCH v7 00/23] soundwire: amd: SoundWire manager driver bug fixes Vijendar Mukunda
2026-11-18 10:42 ` [PATCH v7 01/23] soundwire: amd: consolidate pad register macros into amd_init.h Vijendar Mukunda
2026-11-18 10:42 ` [PATCH v7 02/23] soundwire: amd: program pad SCHMEN and OE control for ACP 7.0/7.1/7.2 Vijendar Mukunda
2026-11-18 10:42 ` [PATCH v7 03/23] soundwire: amd: add pad ctrl helpers for D0/D3 PM transitions Vijendar Mukunda
2026-11-18 10:42 ` [PATCH v7 04/23] soundwire: amd: track full pad teardown across suspend/resume Vijendar Mukunda
2026-11-18 10:42 ` [PATCH v7 05/23] soundwire: amd: fix missing wake interrupt and group wake-arming calls in runtime suspend Vijendar Mukunda
2026-11-18 10:42 ` [PATCH v7 06/23] soundwire: amd: fix IRQ thread dropping STATUS_0TO7 on simultaneous wake Vijendar Mukunda
2026-11-18 10:42 ` [PATCH v7 07/23] soundwire: amd: remove STATUS_8TO11 clear from amd_sdw_process_wake_event() Vijendar Mukunda
2026-11-18 10:42 ` [PATCH v7 08/23] soundwire: amd: fix missing wake interrupt for ACP6.3 in POWER_OFF suspend Vijendar Mukunda
2026-11-18 10:42 ` [PATCH v7 09/23] soundwire: amd: fix SDW command timeout return value handling Vijendar Mukunda
2026-11-18 10:42 ` [PATCH v7 10/23] soundwire: amd: cache ping slave status to avoid spurious disconnect on timeout Vijendar Mukunda
2026-11-18 10:42 ` [PATCH v7 11/23] soundwire: amd: assert msg_lock is held in amd_sdw_read_ping_status() Vijendar Mukunda
2026-11-18 10:42 ` [PATCH v7 12/23] soundwire: amd: fix work drain ordering in remove path Vijendar Mukunda
2026-11-18 11:11   ` sashiko-bot
2026-11-18 10:42 ` [PATCH v7 13/23] soundwire: amd: defer dev_set_drvdata() until after INIT_WORK() Vijendar Mukunda
2026-11-18 10:42 ` [PATCH v7 14/23] soundwire: amd: pm_runtime guard in remove path Vijendar Mukunda
2026-11-18 10:42 ` [PATCH v7 15/23] soundwire: amd: use interrupt_enabled flag to guard IRQ work scheduling Vijendar Mukunda
2026-11-18 11:16   ` sashiko-bot [this message]
2026-11-18 10:42 ` [PATCH v7 16/23] soundwire: amd: fix *sdw_ctx leak when sdw_amd_startup() fails Vijendar Mukunda
2026-11-18 10:42 ` [PATCH v7 17/23] soundwire: amd: propagate amd_init_sdw_manager() error on resume Vijendar Mukunda
2026-11-18 10:42 ` [PATCH v7 18/23] soundwire: amd: drop amd_deinit_sdw_manager() in POWER_OFF suspend Vijendar Mukunda
2026-11-18 10:42 ` [PATCH v7 19/23] soundwire: amd: replace >= ACP70 with explicit switch/case in PM paths Vijendar Mukunda
2026-11-18 10:42 ` [PATCH v7 20/23] soundwire: amd: fix interrupt gate and work drain ordering in PM ops Vijendar Mukunda
2026-11-18 11:21   ` sashiko-bot
2026-11-18 10:42 ` [PATCH v7 21/23] soundwire: amd: check for NULL manager drvdata in sdw_amd_startup() Vijendar Mukunda
2026-11-18 10:42 ` [PATCH v7 22/23] soundwire: amd: fix shared-register RMW race in amd_sdw_set_device_state() Vijendar Mukunda
2026-11-18 10:42 ` [PATCH v7 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-220814@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.