From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=pass header.oldest-pass=0 smtp.remote-ip=52.101.46.28 ARC-Seal: i=2; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=pass; t=1794899467; b=y30nqEZcSkrMxkN+EYeJmE/rlQTEVVRFHwh+Xl5dDAegOz4jrrXhAS+JJU9jbaD9cv9p 5LCsWJ72QeE6lhBSWKzEjNpf8vByw5mGgYk1MN3CkR1Wy7sEuu+3CkGhNrn5VznjBn9uh Au3KjP07DyozSQW92hrnjh8kbR+H7TJmcfliMV41KpAnkquZhPS2146vU9jO0DCLVl4zu jj4803qGNjiNwF59untfNjgl9jDGKI7gHOOOUPAJ4y1fB97F32FpH1UkctUHWOTHykgn3 tRFT32AgAm3vhClJEYhY8KlnZJOz18GIEyUyxNBeoSHeweiYWqM35G1brXcE6c4vKOw== ARC-Message-Signature: i=2; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794899467; h=DMARC-Filter:DKIM-Signature:Received:Received: X-MS-Exchange-Authentication-Results:Received-SPF:Received:Received: Received:From:To:CC:Subject:Date:Message-ID:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:Content-Type: X-EOPAttributedMessage:X-MS-PublicTrafficType: X-MS-TrafficTypeDiagnostic:X-MS-Office365-Filtering-Correlation-Id: X-MS-Exchange-SenderADCheck:X-MS-Exchange-AntiSpam-Relay: X-Microsoft-Antispam:X-Microsoft-Antispam-Message-Info: X-Forefront-Antispam-Report: X-MS-Exchange-AntiSpam-MessageData-ChunkCount: X-MS-Exchange-AntiSpam-MessageData-0:X-OriginatorOrg: X-MS-Exchange-CrossTenant-OriginalArrivalTime: X-MS-Exchange-CrossTenant-Network-Message-Id: X-MS-Exchange-CrossTenant-Id: X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: X-MS-Exchange-CrossTenant-AuthSource:X-MS-Exchange-CrossTenant-AuthAs: X-MS-Exchange-CrossTenant-FromEntityHeader: X-MS-Exchange-Transport-CrossTenantHeadersStamped; bh=4GfBBXXXQj8sBNBd3MRVgYuiWh3aPD2HJSkMloaswAw=; b=PBkYtXFVVgCMnDKicEguVZXe18+uHBwhrr0ODFn27m/NAaHb73shUEZGkclKAzgKOpYW 3LbkCCUhne+hpy09ZFFngmjt3dDhsLDtzCtxUdXXvrps58L1kzzI6WqzH6yBwzGyt/b5T I6cpaT6u2hs40wLyv9bjn+sv8sZNOkBBHTcTS/jkvPilrOREU+QnMKVvYQGK8EhCgz9ag Dl9+IHqiEiTOTscy8vwbRwmU1sqN6AzQ/uiL3G3cyqwIbMD3etljq5KhNm3kyJZ89WDE9 tx4W5oVYR6m0OMQ6PU1VRLN54BZmqTl5eQM8hQowQ3JpxJjlrB8OdjU2FAC62ahne6g== ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=vmgZfK2p; arc=pass header.oldest-pass=0 smtp.remote-ip=52.101.46.28 Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010028.outbound.protection.outlook.com [52.101.46.28]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (secp384r1) server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 130FF606A336; Tue, 17 Nov 2026 07:11:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 130FF606A336 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=vmgZfK2p ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bjsvdyDTj4B+NtLxkFBvxNSRBgIKpJNzkcn/+8paybxh9YUHmE1uu/xW5wIiSVuPlTKeZew6S2KvttAXfJ8Y1RtM2Kr7WZrIOgnpK+vn4iFSuobeHBU5ZIW/QREu9HLBNmafRDgbnWHrvt+ws259L2Sf9kmUEJ4M5vCV9TnNW+rIIAkvFCP4wqcvvOyqRbTK8vnJHKxHDv60xnE8LS4z9hhU67ZkrBBVcyBY5nDXJrTY5ZBkAJXbIiNH23aFaZr8n9/ONNUjIJleRsPuQA23GF5me571Y5y8BpUIVXVbsxu04Jus34gSznvqPCkjAni323A4amRgxatEGYdPFH8Qhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4GfBBXXXQj8sBNBd3MRVgYuiWh3aPD2HJSkMloaswAw=; b=zGYUy60rQwbFTyscf3FJ18o4Ewgcy/qjYx0u7KUT1G1t0v2IdtUlk7315t4xsXfExPtkAPl85LzkOwZjww3+7W6Ons9iThIsCR55fddhaznBTHo4efh1/OLiMYvTBRTLld0R4f73OIKuneg1afGBNvYSad6B+FZyb8Y1crA1n0mS27U8FhzTuHslvQRtufUhGssxBDdsYGLZoGToi5Nt56uWV+x4VW+NkYAgWEPlWQrqPTnLN8cj30znGj5bqqG6RL9nP48/KyfVB0DY5JoKZ47theFlLVRXqKFa83zB7VObgKoGt90t6UP8yiib1SNlrwU0Sh9tyk7iVY8a+4E81A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4GfBBXXXQj8sBNBd3MRVgYuiWh3aPD2HJSkMloaswAw=; b=vmgZfK2p6OtlVNxfn/UB8uQltWXjdRM7PaWfK9cUtXehuArcjdr69R2XDkebaPlHmOSkyxxpnwU7GQEfqqNXjumWqlc3x45ju8o2/ouypuAgeT1aXLFFHGcUs6lFHPdHUfDlrYOH9iBmWkZNvXGk5HXCMk0uEABM6t/1RIuECdw= Received: from CH0PR03CA0265.namprd03.prod.outlook.com (2603:10b6:610:e5::30) by DS0PR12MB8248.namprd12.prod.outlook.com (2603:10b6:8:f3::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.615.14; Tue, 17 Nov 2026 07:11:01 +0000 Received: from CH3PEPF0002457D.namprd04.prod.outlook.com (2603:10b6:610:e5:cafe::a4) by CH0PR03CA0265.outlook.office365.com (2603:10b6:610:e5::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.615.13 via Frontend Transport; Tue, 17 Nov 2026 07:11:01 +0000 X-MS-Exchange-Authentication-Results: mx.microsoft.com 1; spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CH3PEPF0002457D.mail.protection.outlook.com (10.167.252.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.615.4 via Frontend Transport; Tue, 17 Nov 2026 07:11:01 +0000 Received: from satlexmb08.amd.com (10.181.42.217) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.57; Tue, 17 Nov 2026 01:10:59 -0600 Received: from amd-System-Product-Name.amd.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.57 via Frontend Transport; Tue, 17 Nov 2026 01:10:55 -0600 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , Vijendar Mukunda Subject: [PATCH v6 09/23] soundwire: amd: fix SDW command timeout return value handling Date: Tue, 17 Nov 2026 12:35:44 +0530 Message-ID: <20261117070906.803139-10-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261117070906.803139-1-Vijendar.Mukunda@amd.com> References: <20261117070906.803139-1-Vijendar.Mukunda@amd.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PEPF0002457D:EE_|DS0PR12MB8248:EE_ X-MS-Office365-Filtering-Correlation-Id: f4fc857e-1e11-4e18-041e-08df4479efd2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|1800799024|376014|82310400026|36860700016|10067099003|11063799006|56012099006|261026121527099003|261026135527099003|261026140227099003|261028144727099003|261022115727099003|261021130227099003|261021135927099003|261021133027099003|261022075727099003|261021123027099003|261022113327099003|261021121427099003|261022105027099003|261026130827099003|261102123227099003|261009223027099003|18002099003|22082099003|13003099007; X-Microsoft-Antispam-Message-Info: hbZvBVNzbtzMuRCol+yx53B+KEkQdQ6jRfE4ttBY0LNDq1rhCxlxYJati0mKiclLVTvqMTG6t+LsyMU71xEDKgdSiV4zX37Dv1GppMiXDqURTyjwBiRmxZcjOqFg42PgwGjmkZtuyxzKGrzMPwv7CEMv6AkkMWLBOUShQoLPKc256n1uJI354DHB9wNj7d9Y1m1e7LfbtO2x1Z8H4RPFpiS4xXpKSBNaBxBV8hp0oYBAK0dT2WhApSU00MsbiLj4SIqI8DEfSrfpI3UNdmPJscttT1A8sqW6XTNCpQsRS/7b0zvwSe2ndk10opLZBTCIvoUKL3MdEUNbBZANeW/sQc1QiTo11rvfAaDf4J++gWgLHWMXm6NLpuQjfYHu7gyOxpEj/YaZbAYsiNZJfsRUVGakoyA7oGmfEy4yz4Bf5g9FMQaWgbh8olAIdo9MJLA6mxmvIBHjFCbRzXH+P6V+Co/1yUAYyr8GrQWqCrsEkEFte2O+4/ScmkytMug9lttNvWk+50104MX/keHsUyrZs3mFrR/fOeOpgTkxzh7Laj1vePi7ezik5+1DBuBUZbDl0oAMl+yHZ6JZsjEs8snVMTs1dWo24zX4Tl5+qSf5ckfSvYmOlCP+fern+PqaFHOtt9PQSUIZCB8yRKGD6UAiyw== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(23010399003)(1800799024)(376014)(82310400026)(36860700016)(10067099003)(11063799006)(56012099006)(261026121527099003)(261026135527099003)(261026140227099003)(261028144727099003)(261022115727099003)(261021130227099003)(261021135927099003)(261021133027099003)(261022075727099003)(261021123027099003)(261022113327099003)(261021121427099003)(261022105027099003)(261026130827099003)(261102123227099003)(261009223027099003)(18002099003)(22082099003)(13003099007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HOOwMKvhOBHTupuQ/uLnUdGM7RHaD6J6Qe3Hf7Xi+7jZPRfM27ZDYzkzmIYJGOkttY05keg3VddyZWE/zTUFRKy6gM2tCDlrDprpkiiDV2IoxSXXHjQoap4YKt/sAO/+wB/Ty7ZfPgVvSO6fwiilrCgdpen294axTDGZXOhe8aQxySyBK59TEIX/YfV4VmaxjkRgDR3ltAkIM0hTZvAFhhNFDm4rTa0U6MZab2pn9WTb8H8/4+mvsvVv1PZm2IaY+mhYRNDJKYD6UM9w2eyPgwukTVgECnv0nvOvZMbZIGLeA6uqbFTy0A1feImAFWDqI2en1iIerDiHY6KulrxY41DEEMdGOD9tkWSZBnlrx+VegsD1PytHHgWWsKO85CnRuRpVlCkepMLy+XeJElbF6ouq4dwF+EWCdLpO49ErB7US4b9sjPm+gpYviPTCEGis X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2026 07:11:01.4787 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f4fc857e-1e11-4e18-041e-08df4479efd2 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH3PEPF0002457D.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8248 amd_sdw_send_cmd_get_resp() returned u64 but was returning -ETIMEDOUT (a negative int) on readl_poll_timeout() failures, which silently widens to a large u64 value. Change the return type to int and pass the raw u64 response through an out-parameter. Timeout is detected directly from readl_poll_timeout() return value. Update all callers: amd_program_scp_addr(), _amd_sdw_xfer_msg(), amd_sdw_read_and_process_ping_status(), and amd_sdw_read_ping_status() to check the return value and handle timeout explicitly. Fixes: d8f48fbdfd9a ("soundwire: amd: Add support for AMD Manager driver") Reported-by: Lee Jones Closes: https://sashiko.dev/#/bug/linux-c3a53ed5-eb8f-4982-a3b6-db189e009b68 Signed-off-by: Vijendar Mukunda --- drivers/soundwire/amd_manager.c | 49 ++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c index 3f3fffbd529a..18ddd489ad13 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -348,10 +348,9 @@ static void amd_sdw_ctl_word_prep(u32 *lower_word, u32 *upper_word, struct sdw_m *lower_word = lower_data; } -static u64 amd_sdw_send_cmd_get_resp(struct amd_sdw_manager *amd_manager, u32 lower_data, - u32 upper_data) +static int amd_sdw_send_cmd_get_resp(struct amd_sdw_manager *amd_manager, u32 lower_data, + u32 upper_data, u64 *response) { - u64 resp; u32 lower_resp, upper_resp; u32 sts; int ret; @@ -389,9 +388,8 @@ static u64 amd_sdw_send_cmd_get_resp(struct amd_sdw_manager *amd_manager, u32 lo amd_manager->instance); return ret; } - resp = upper_resp; - resp = (resp << 32) | lower_resp; - return resp; + *response = ((u64)upper_resp << 32) | lower_resp; + return 0; } static enum sdw_command_response @@ -407,19 +405,22 @@ amd_program_scp_addr(struct amd_sdw_manager *amd_manager, struct sdw_msg *msg) scp_msg.buf = &msg->addr_page1; scp_msg.flags = SDW_MSG_FLAG_WRITE; amd_sdw_ctl_word_prep(&lower_data, &upper_data, &scp_msg, 0); - response_buf[0] = amd_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data); + if (amd_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &response_buf[0])) { + dev_err_ratelimited(amd_manager->dev, + "SCP_addrpage command timeout for Slave %d\n", msg->dev_num); + return SDW_CMD_TIMEOUT; + } scp_msg.addr = SDW_SCP_ADDRPAGE2; scp_msg.buf = &msg->addr_page2; amd_sdw_ctl_word_prep(&lower_data, &upper_data, &scp_msg, 0); - response_buf[1] = amd_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data); + if (amd_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &response_buf[1])) { + dev_err_ratelimited(amd_manager->dev, + "SCP_addrpage command timeout for Slave %d\n", msg->dev_num); + return SDW_CMD_TIMEOUT; + } for (index = 0; index < 2; index++) { - if (response_buf[index] == -ETIMEDOUT) { - dev_err_ratelimited(amd_manager->dev, - "SCP_addrpage command timeout for Slave %d\n", - msg->dev_num); - return SDW_CMD_TIMEOUT; - } else if (!(response_buf[index] & AMD_SDW_MCP_RESP_ACK)) { + if (!(response_buf[index] & AMD_SDW_MCP_RESP_ACK)) { if (response_buf[index] & AMD_SDW_MCP_RESP_NACK) { dev_err_ratelimited(amd_manager->dev, "SCP_addrpage NACKed for Slave %d\n", @@ -464,11 +465,7 @@ static enum sdw_command_response amd_sdw_fill_msg_resp(struct amd_sdw_manager *a if (msg->flags == SDW_MSG_FLAG_READ) msg->buf[offset] = FIELD_GET(AMD_SDW_MCP_RESP_RDATA, response); } else { - if (response == -ETIMEDOUT) { - dev_err_ratelimited(amd_manager->dev, "command timeout for Slave %d\n", - msg->dev_num); - return SDW_CMD_TIMEOUT; - } else if (response & AMD_SDW_MCP_RESP_NACK) { + if (response & AMD_SDW_MCP_RESP_NACK) { dev_err_ratelimited(amd_manager->dev, "command response NACK received for Slave %d\n", msg->dev_num); @@ -488,7 +485,11 @@ static unsigned int _amd_sdw_xfer_msg(struct amd_sdw_manager *amd_manager, struc u32 upper_data = 0, lower_data = 0; amd_sdw_ctl_word_prep(&lower_data, &upper_data, msg, cmd_offset); - response = amd_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data); + if (amd_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &response)) { + dev_err_ratelimited(amd_manager->dev, "command timeout for Slave %d\n", + msg->dev_num); + return SDW_CMD_TIMEOUT; + } return amd_sdw_fill_msg_resp(amd_manager, msg, response, cmd_offset); } @@ -544,7 +545,10 @@ static void amd_sdw_read_and_process_ping_status(struct amd_sdw_manager *amd_man u64 response; mutex_lock(&amd_manager->bus.msg_lock); - response = amd_sdw_send_cmd_get_resp(amd_manager, 0, 0); + if (amd_sdw_send_cmd_get_resp(amd_manager, 0, 0, &response)) { + mutex_unlock(&amd_manager->bus.msg_lock); + return; + } mutex_unlock(&amd_manager->bus.msg_lock); amd_sdw_process_ping_status(response, amd_manager); } @@ -555,7 +559,8 @@ static u32 amd_sdw_read_ping_status(struct sdw_bus *bus) u64 response; u32 slave_stat; - response = amd_sdw_send_cmd_get_resp(amd_manager, 0, 0); + if (amd_sdw_send_cmd_get_resp(amd_manager, 0, 0, &response)) + 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.53.0