From: Lee Jones <lee@kernel.org>
To: lee@kernel.org, Vinod Koul <vkoul@kernel.org>,
Bard Liao <yung-chuan.liao@linux.intel.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>,
Vijendar Mukunda <Vijendar.Mukunda@amd.com>,
linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: stable@vger.kernel.org
Subject: [PATCH 13/21] soundwire: amd: Check ping command response for timeout
Date: Fri, 30 Oct 2026 10:46:52 +0000 [thread overview]
Message-ID: <20261030104840.3361217-14-lee@kernel.org> (raw)
In-Reply-To: <20261030104840.3361217-1-lee@kernel.org>
When amd_sdw_send_cmd_get_resp() times out, it returns -ETIMEDOUT as a
sign-extended 64-bit value. amd_sdw_read_and_process_ping_status() and
amd_sdw_read_ping_status() extract peripheral status bits directly from
the returned value without checking for -ETIMEDOUT, interpreting the
error code bits as peripheral status values.
Check for -ETIMEDOUT before extracting peripheral status from the ping
response, matching amd_program_scp_addr() and amd_sdw_fill_msg_resp().
Fixes: d8f48fbdfd9a ("soundwire: amd: Add support for AMD Manager driver")
Closes: https://sashiko.dev/#/bug/linux-c3a53ed5-eb8f-4982-a3b6-db189e009b68
Cc: stable@vger.kernel.org
Signed-off-by: Lee Jones <lee@kernel.org>
---
drivers/soundwire/amd_manager.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c
index a3316efdf8ac..a8220235a2ae 100644
--- a/drivers/soundwire/amd_manager.c
+++ b/drivers/soundwire/amd_manager.c
@@ -448,6 +448,8 @@ static void amd_sdw_read_and_process_ping_status(struct amd_sdw_manager *amd_man
mutex_lock(&amd_manager->bus.msg_lock);
response = amd_sdw_send_cmd_get_resp(amd_manager, 0, 0);
mutex_unlock(&amd_manager->bus.msg_lock);
+ if (response == -ETIMEDOUT)
+ return;
amd_sdw_process_ping_status(response, amd_manager);
}
@@ -458,6 +460,8 @@ static u32 amd_sdw_read_ping_status(struct sdw_bus *bus)
u32 slave_stat;
response = amd_sdw_send_cmd_get_resp(amd_manager, 0, 0);
+ if (response == -ETIMEDOUT)
+ return 0;
/* slave status from ping response */
slave_stat = FIELD_GET(AMD_SDW_MCP_SLAVE_STAT_0_3, response);
slave_stat |= FIELD_GET(AMD_SDW_MCP_SLAVE_STAT_4_11, response) << 8;
--
2.56.0.317.g454f8302e1-goog
next prev parent reply other threads:[~2026-10-30 10:51 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-30 10:46 [PATCH 00/21] soundwire: Fix Critical and High issues reported by Sashiko Lee Jones
2026-10-30 10:46 ` [PATCH 01/21] soundwire: bus: Hold bus_lock when looking up slave devices Lee Jones
2026-10-30 10:46 ` [PATCH 02/21] soundwire: sysfs: Use sysfs_emit_at() in array show callbacks Lee Jones
2026-10-30 10:46 ` [PATCH 03/21] soundwire: stream: Prevent m_rt_count underflow in sdw_stream_remove_master() Lee Jones
2026-10-30 11:09 ` sashiko-bot
2026-10-30 10:46 ` [PATCH 04/21] soundwire: stream: Clean up allocated runtime resources on config failure Lee Jones
2026-10-30 10:46 ` [PATCH 05/21] ASoC: SOF: Intel: hda-sdw-bpt: Stop active DMA before closing BPT streams Lee Jones
2026-10-30 11:14 ` Mark Brown
2026-10-30 11:38 ` Vinod Koul
2026-10-30 12:03 ` Lee Jones
2026-10-30 12:25 ` Péter Ujfalusi
2026-10-30 13:09 ` Liao, Bard
2026-10-30 10:46 ` [PATCH 06/21] soundwire: intel_ace2x: Protect bus.bpt_stream with bus_lock Lee Jones
2026-10-30 11:26 ` sashiko-bot
2026-10-30 10:46 ` [PATCH 07/21] soundwire: qcom: Prevent pconfig buffer overflow in qcom_swrm_stream_alloc_ports() Lee Jones
2026-10-30 11:43 ` sashiko-bot
2026-10-30 10:46 ` [PATCH 08/21] soundwire: qcom: Disable runtime PM and avoid clock underflow in qcom_swrm_remove() Lee Jones
2026-10-30 10:46 ` [PATCH 09/21] soundwire: qcom: Check clk_prepare_enable() return value Lee Jones
2026-10-30 10:46 ` [PATCH 10/21] soundwire: qcom: Serialise ctrl->intr_mask updates Lee Jones
2026-10-30 10:46 ` [PATCH 11/21] soundwire: qcom: Prevent stale broadcast IRQ from completing subsequent command Lee Jones
2026-10-30 10:46 ` [PATCH 12/21] soundwire: amd: Check for NULL manager drvdata in sdw_amd_startup() Lee Jones
2026-10-30 13:04 ` Mukunda,Vijendar
2026-10-30 10:46 ` Lee Jones [this message]
2026-10-30 11:37 ` [PATCH 13/21] soundwire: amd: Check ping command response for timeout Mukunda,Vijendar
2026-10-30 12:04 ` Lee Jones
2026-10-30 12:15 ` sashiko-bot
2026-10-30 10:46 ` [PATCH 14/21] soundwire: amd: Preserve lane control bits in amd_sdw_port_enable() Lee Jones
2026-10-30 11:45 ` Mukunda,Vijendar
2026-10-30 11:52 ` Lee Jones
2026-10-30 10:46 ` [PATCH 15/21] soundwire: amd: Avoid static port offset leak in amd_sdw_compute_params() Lee Jones
2026-10-30 11:57 ` Mukunda,Vijendar
2026-10-30 12:04 ` Lee Jones
2026-10-30 10:46 ` [PATCH 16/21] soundwire: amd: Initialise and cancel IRQ work around manager lifetime Lee Jones
2026-10-30 12:13 ` Mukunda,Vijendar
2026-10-30 12:17 ` Lee Jones
2026-10-30 12:48 ` Mario Limonciello
2026-10-30 10:46 ` [PATCH 17/21] soundwire: amd: Resume manager before hardware teardown in amd_sdw_manager_remove() Lee Jones
2026-10-30 12:21 ` Mukunda,Vijendar
2026-10-30 12:21 ` Mukunda,Vijendar
2026-10-30 10:46 ` [PATCH 18/21] soundwire: amd: Synchronise parent IRQ and disable work on manager removal Lee Jones
2026-10-30 12:28 ` Mukunda,Vijendar
2026-10-30 10:46 ` [PATCH 19/21] soundwire: amd: Cancel pending work before suspending manager Lee Jones
2026-10-30 12:34 ` Mukunda,Vijendar
2026-10-30 13:16 ` sashiko-bot
2026-10-30 10:46 ` [PATCH 20/21] soundwire: amd: Check clock resume timeout in amd_resume_runtime() Lee Jones
2026-10-30 12:51 ` Mukunda,Vijendar
2026-10-30 12:55 ` Mukunda,Vijendar
2026-10-30 10:47 ` [PATCH 21/21] soundwire: amd: Disable interrupts if enabling manager fails Lee Jones
2026-10-30 12:58 ` Mukunda,Vijendar
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=20261030104840.3361217-14-lee@kernel.org \
--to=lee@kernel.org \
--cc=Vijendar.Mukunda@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=pierre-louis.bossart@linux.dev \
--cc=stable@vger.kernel.org \
--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