From nobody Fri Sep 25 16:03:02 2026 Received: from SN4PR0501CU005.outbound.protection.outlook.com (mail-southcentralusazon11011052.outbound.protection.outlook.com [40.93.194.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CA7A74BB289; Thu, 10 Sep 2026 16:18:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.194.52 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789057121; cv=fail; b=mMlBVOIB5LLt0tfRlLayI7ig+GCqyQWVxQoNbnINfqFVvkOcx16f6EdGlIMyAcjWcA5OSTYfxL2LAE3RIgXN2P2UGcgc8tG5ME6le2TFbED9eBq4K0Dh1RgOl0zxJceMwbObYy0AivWNOlcpMUhNa/Hatf5nHH2Su3Lr+ute8Ec= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789057121; c=relaxed/simple; bh=oXGa7F+q/T0wGtgsOuIscshiD+QnNdWsljF3HXs69e8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=V1mV6FytNuNTnhsSBt51dhUm/g+fgXxhr2vXcojpK0f6lNNi4lOs9UWIQ5PmStlf0EfqtxxUCsPTCcBvIkmyUFX9uD087u8lkxrdZjr6NXNXoEDDuE2SSfsQEvGTEQDqCNWLDgL05Il3uLvSoTesfQ9EavnRzLZDl1DtblRxZPs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=tqf+xOnB; arc=fail smtp.client-ip=40.93.194.52 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) header.d=amd.com header.i=@amd.com header.b="tqf+xOnB" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=b0eSeDrHmaG4sxgzXrW57DEE84gvvUWukKAobK78tfHqBxQhoOJvVxirhMoJpugk8ifa+GhLXX6oFHoUyeX1aAzFakRZfSNGTlpQK3k/yLs6c5uw+kZupEsL3NazyzzkPnb+IlhB5/j78TZQ7tGyR3wOrlQivT8dYADPbuVVB9e0Nu92PrFTG8pYdkQjbjSvrNi/E48dBc1brLqOXIxzxRRTPxX1w1l0cz2d1bNSwsS7a6xTiGBrPNk8DGNsE9ldFu59I1Y89AxK8Yrnln/br8r0KgoyE9gvtGA8W2au83onXqEItU+lghIywOojo7L22qys/h1lSs0nSr9F5zYpoA== 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=YV27tm8r7e315xBXbVL96z8xmEFSZtt8F2BwHxwZlT0=; b=y1+/vwQTWoPVV6eHfQnZdzr8zdx7O7EkjFCCeVqHZZplm1g7MqlXyRCzddEsL04Rsn8/2EfHt34ofdJ6QFIj8LeQB2KPLSnD7oElCpcPH0RGS0DTqrqdPRZsjTkag2hBhCSNJxVJkkwDxq7Y3/OKa10iaaOlg0f+al2T2ImpPpsgqEDKwUqM4QWm9IyM3pi6wqYtGSnSJiJg58MqbfAY8Yo3dQPlg6/sjldup3TEEWiLRdf/FONF3upws3GMg2Xt03w5+UolRt9qw2XKM34V7xlTS5QMV7ae2SVW7W29CFwlPo+DEMKkd4LUUuLloCmHe2/CnsLHHVcrP8YlipN6nQ== 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=YV27tm8r7e315xBXbVL96z8xmEFSZtt8F2BwHxwZlT0=; b=tqf+xOnBbWC93idlxhEWqOqXTh6MP0qWQA72FTkHvimb7vLSS/53vCsnzGHr5LFvaeNJYXAjqU2MTUj6WpXcQbMmm/XpnsnsERA+jd/kZgqXgeiJwBKjBSJKsdn64VjNBrTg8OmA8jUsCPPSR1HTJjeC0U5HKr8zDYLSpO8K9RM= Received: from BY5PR03CA0010.namprd03.prod.outlook.com (2603:10b6:a03:1e0::20) by PH7PR12MB7114.namprd12.prod.outlook.com (2603:10b6:510:1ed::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.9; Thu, 10 Sep 2026 16:18:36 +0000 Received: from SJ1PEPF00002311.namprd03.prod.outlook.com (2603:10b6:a03:1e0:cafe::79) by BY5PR03CA0010.outlook.office365.com (2603:10b6:a03:1e0::20) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.382.10 via Frontend Transport; Thu, 10 Sep 2026 16:18:36 +0000 X-MS-Exchange-Authentication-Results: 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 SJ1PEPF00002311.mail.protection.outlook.com (10.167.242.165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.5 via Frontend Transport; Thu, 10 Sep 2026 16:18:36 +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.46; Thu, 10 Sep 2026 11:18:34 -0500 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.46 via Frontend Transport; Thu, 10 Sep 2026 11:18:30 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , , , Vijendar Mukunda Subject: [PATCH 1/4] ASoC: amd: acp: bounds-check SoundWire link ID in machine drivers Date: Thu, 10 Sep 2026 21:46:46 +0530 Message-ID: <20260910161728.1452808-2-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20260910161728.1452808-1-Vijendar.Mukunda@amd.com> References: <20260910161728.1452808-1-Vijendar.Mukunda@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00002311:EE_|PH7PR12MB7114:EE_ X-MS-Office365-Filtering-Correlation-Id: 39b3b798-2c75-44ba-f1da-08df0f572aa5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700016|82310400026|23010399003|1800799024|10067099003|22082099003|56012099006|11063799006|18002099003; X-Microsoft-Antispam-Message-Info: LFjo75MfmDQ42edpZbFGiHncXUrlqkfCXShbNkpRkgRvflxh/QpmlhVg+FmRB9PMmid2wwtlQ+axcEmpcy//lekPcAbbuTekYjcYZ9zDsCsRaecfyTdmzBUcxX04MP2NnftcKXPgnCprcwUVF3o63p8sVsGjA+dt9vCL29YoTTDfZMOHF2JtfG2qErOwidJGqIx/NTFiFZVe3IIzr66W5Ortkn7ZfM9IJoYsQ1Q/LOnznycNNnEsAqDoWVx1IsGUOHs5hk7DyRZsTNrSJ4FNwvzfPzaXX7cNq6kLfey2w0RF4Fkx47heOmu1WNdJTsNGtW85G7t+qXdy8itjsuP1UFbx92RWuW9UGuOViCGRBDAH5HVXsYkuv6u2TiQmPBxVee5NKqydA931EeJWsx5nKI6mX6PGKdhWrD8ZTXWEeJvw9UryodOeudOPshNoSTPy2aLHmoyrHWhOC/qMPG1eXCjda0ROS3hkGP9UFrr7+TSr8wBe7wjMEyBSnWu27Dzx1fBmq0X+5ObYQrrD++197P2EY1j4u3MbodV+2aqoBHZqf5KNKOG5tAvxeMB9yipvlBnQnNbEF/JIBcnglghDyAXG2A/A0xzonYQCfiXE6BBh7yEUV5yU75adguO2bGGcS2YDOMb94xqfm5fkEh/QNdVk8jxMceMEUpMcCOEPCEKKN4/eviYh3vJ6OvOPzb1ujLBBkCypVfoOHQCKRNMZ/A== 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)(376014)(36860700016)(82310400026)(23010399003)(1800799024)(10067099003)(22082099003)(56012099006)(11063799006)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 491w2W0w7rN14GLLvLJZELBo3IdflDwkumLv27ZcOvKBL2m/Du+VTalanosiIX4e0inGaiqXLb+GbOvDywK7etOILKh6dwy1WF272egMCRjAElSpoBB0yQz73KsLwSOapYtIFBuVrCSzRcg+TVgDakgUUT16IQEuPIut3mFCYHvkFsz9pvzUC85QnHjPBOUwqR74dM8uS/zK2PzDHWzWO1MFWwc7SoBf9woC3+ujqcUHZqSeOUPhZvwJNj6+duKikaRJb+VFPcvGFAbknTKLQjHG3VuJ2HyQWdEGo000grVJ3hjHnapcUh6c7Qe6T/OXGL1buM7T7m6K10hYQKB2fxO7w90mpypxvt+M/3ctVnfy53ki5j2hXrOYwGTH+2wpq9IO7/yc5HAB25eIKmL+jyV99Kvh2K5PkHsbGvskaoVRzKLAXRlE1HxFqKCX8jhu X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2026 16:18:36.0256 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 39b3b798-2c75-44ba-f1da-08df0f572aa5 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: SJ1PEPF00002311.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7114 Content-Type: text/plain; charset="utf-8" Add a bounds check in create_sdw_dailink() to validate that the SoundWire link ID derived from link_mask does not exceed the maximum supported by the platform. If the link ID is out of range or link_mask is zero, log an error and return -EINVAL to prevent accessing invalid CPU pin ID tables. Applied to both acp-sdw-sof-mach.c and acp-sdw-legacy-mach.c. Fixes: 6d8348ddc56e ("ASoC: amd: acp: refactor SoundWire machine driver cod= e") Signed-off-by: Vijendar Mukunda Reviewed-by: Mario Limonciello (AMD) --- sound/soc/amd/acp/acp-sdw-legacy-mach.c | 10 ++++++++++ sound/soc/amd/acp/acp-sdw-sof-mach.c | 9 +++++++++ 2 files changed, 19 insertions(+) diff --git a/sound/soc/amd/acp/acp-sdw-legacy-mach.c b/sound/soc/amd/acp/ac= p-sdw-legacy-mach.c index 6eac42bac855..2ea226a195c3 100644 --- a/sound/soc/amd/acp/acp-sdw-legacy-mach.c +++ b/sound/soc/amd/acp/acp-sdw-legacy-mach.c @@ -205,6 +205,16 @@ static int create_sdw_dailink(struct snd_soc_card *car= d, return -EINVAL; } =20 + if (!soc_end->link_mask) { + dev_err(dev, "invalid zero link_mask\n"); + return -EINVAL; + } + if ((ffs(soc_end->link_mask) - 1) >=3D amd_ctx->max_sdw_links) { + dev_err(dev, "link_id %d exceeds max_sdw_links %d\n", + ffs(soc_end->link_mask) - 1, amd_ctx->max_sdw_links); + return -EINVAL; + } + switch (amd_ctx->acp_rev) { case ACP63_PCI_REV: ret =3D get_acp63_cpu_pin_id(ffs(soc_end->link_mask - 1), diff --git a/sound/soc/amd/acp/acp-sdw-sof-mach.c b/sound/soc/amd/acp/acp-s= dw-sof-mach.c index a9cd1f335167..6c74e67b134f 100644 --- a/sound/soc/amd/acp/acp-sdw-sof-mach.c +++ b/sound/soc/amd/acp/acp-sdw-sof-mach.c @@ -121,6 +121,15 @@ static int create_sdw_dailink(struct snd_soc_card *car= d, return -EINVAL; } =20 + if (!sof_end->link_mask) { + dev_err(dev, "invalid zero link_mask\n"); + return -EINVAL; + } + if ((ffs(sof_end->link_mask) - 1) >=3D amd_ctx->max_sdw_links) { + dev_err(dev, "link_id %d exceeds max_sdw_links %d\n", + ffs(sof_end->link_mask) - 1, amd_ctx->max_sdw_links); + return -EINVAL; + } switch (amd_ctx->acp_rev) { case ACP63_PCI_REV: ret =3D get_acp63_cpu_pin_id(ffs(sof_end->link_mask - 1), --=20 2.48.1 From nobody Fri Sep 25 16:03:02 2026 Received: from DM5PR21CU001.outbound.protection.outlook.com (mail-centralusazon11011051.outbound.protection.outlook.com [52.101.62.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 863504CC27F; Thu, 10 Sep 2026 16:18:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.62.51 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789057134; cv=fail; b=GZ5wPBCZDc/UrdxUV8zVxPtzxcEglcQjfO/5iyiHD39IYsGHSixn8dDykC5G4e3PkFVQsLcAfQfKcDTrsPbY78/0lRY0uoHac/+AEuTscUjp1WyUpK4bsKrvwtcpDUnfXuGBHSDERzFSEGNd32QuLrACZ2JWunFtXdlhhZQcXew= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789057134; c=relaxed/simple; bh=4cDhTGsyArA6UGmdwFEw1+ENEZh0SWmGNO+1DXaqZO4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GTPQZkxx6lKZp+mFLNl8SDCPh/Oya2BgBxzrEN8hn2CM3CKFJYlH03rtfLtFgV62C1+bWnmQ9E4oDTMrb/FABZZdiF4LICJpiwQOCg7SHmTC98Q63sLaKR01NmygiIFJEMYoQN40xhVgtM2jWmUfY5EnK7ctfSwW3pX7FOOcuxI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=B4T9PCU0; arc=fail smtp.client-ip=52.101.62.51 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) header.d=amd.com header.i=@amd.com header.b="B4T9PCU0" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lB9f5zxMkvRtOkEGbNrubyIl09wmxH6l6u9bJvfAEhNkRk2VrII0KhVevuZSh+dV8ZXoStrVRUdOpMo9TWJz6XaVT0uuAIbOSfthBFe2G5EV7drHdIyJlvhVhRYJgXG9Ccw4h+l8aMZsjYvKXQ503B4hNmpI0YhCa+FFlHfmnYTGD/bB5lnecLAdl32+qZotKMPnuCsI8FeN4YaA9hkPYwuPymKsHTshn6ttQgD+NUBEJ1joajHcI9K+IPHqp4+ICk8c7CLrGyZhsopgO7fWM+lF8S2wfrtuTdcBpQ8K02SkIsWsUZvV9O8tnDgEEwfG3ASwaRlPLsnJugBDwViNSg== 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=Ii00OqlJeDRHIJZiOnnyAqSLyaWMCUvdJ/VQYw+oTdk=; b=vfhJB9gT4jI2/vFsdDas2mzl/ha02PQqr/9yxrytvPaci/qYiBzf1CUFtwNzO+irPOXHS48o/g6/hg4UkW0v/IhFuwOLVSQZMaxx9y9QKhTPmxEgHJqaLpk0/QWoqHh1x37L0Q0b4g1Cd6ervXI+5jvYima6pVPDhFXJT8IVsW0secnU/2X/fA0MdX1mJ2HjW6VbVQJdKcOoNVurj0KjrTjh5zVpYWdJan6BY8AnEwrzzJG8tlHifGGig/Tjx8VYjX6ALXOKunZJG5j8oGvo6Da37hNm/pQEBadVvBgGRljO/v2SLCYkbR6pqNdGnoOINRK30h8gFuJrLOsTZ2hZCQ== 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=Ii00OqlJeDRHIJZiOnnyAqSLyaWMCUvdJ/VQYw+oTdk=; b=B4T9PCU0HiSd6GpQMvspnBlYSHDUbifD7h0Z2wa0mGXDDbX7aiqaD92KdAiwPTsVDK0GCeFJi0NGUup8IZ2dnmMklj8xKv+GkpJvkMg15XsMscVDIzN0BMcxymFm/g+sctPmxMnS4K+G9Z3R3nyj0Ks4NMHlrEUcIfvZXOonF4Y= Received: from BY5PR04CA0006.namprd04.prod.outlook.com (2603:10b6:a03:1d0::16) by LV8PR12MB9450.namprd12.prod.outlook.com (2603:10b6:408:202::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.9; Thu, 10 Sep 2026 16:18:41 +0000 Received: from SJ1PEPF00002317.namprd03.prod.outlook.com (2603:10b6:a03:1d0:cafe::2c) by BY5PR04CA0006.outlook.office365.com (2603:10b6:a03:1d0::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.406.9 via Frontend Transport; Thu, 10 Sep 2026 16:18:40 +0000 X-MS-Exchange-Authentication-Results: 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 SJ1PEPF00002317.mail.protection.outlook.com (10.167.242.171) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.5 via Frontend Transport; Thu, 10 Sep 2026 16:18:40 +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.46; Thu, 10 Sep 2026 11:18:39 -0500 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.46 via Frontend Transport; Thu, 10 Sep 2026 11:18:35 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , , , Vijendar Mukunda Subject: [PATCH 2/4] ASoC: amd: acp: refactor codec config count in SOF SoundWire machine driver Date: Thu, 10 Sep 2026 21:46:47 +0530 Message-ID: <20260910161728.1452808-3-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20260910161728.1452808-1-Vijendar.Mukunda@amd.com> References: <20260910161728.1452808-1-Vijendar.Mukunda@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00002317:EE_|LV8PR12MB9450:EE_ X-MS-Office365-Filtering-Correlation-Id: 815e17bf-63f9-4bd9-884c-08df0f572d0c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700016|82310400026|23010399003|1800799024|10067099003|6133799003|3023799007|22082099003|18002099003|11063799006|56012099006; X-Microsoft-Antispam-Message-Info: wEdSF8oM3Af/01dvrkBuXzWPcknp6Xtnc1K3neFUQY8QFsSDhzN2SRE5P/Ai0IM5xgSRO1w3EWN0VFGoBPC8QGjI0ctyJxMY2ZxgYexgiiS/wveZfXZlm/UhGJrn5ah7WlbmwvqT9EmFU+yXbckvlaoZjOk46gNp28OUT7rbld+Z6hn5RwKF603ZENBNzYPXwXHBShcB2neCVIBYg2PzopbjpxDYTNy14PQjjA1yYb5J66fHvH2NIx4Jdp2q0szxBHOCKu7lTR4lpDnsMLSDiVd3L1bt+1TmM9XYTxuqVAxuMIVjIy54lTZoZWN6qvk8L3tm//ALLZ0Ayh5e5Tkh4uvg9N+v41j+F9thgw7CBv8h3hqj0Fb2OiQZiH7IspP44iKwitIn2qqQV3ITtly4DTtRmkpwWiGOWnYBZi1cL4smzU/c9MoksU53SW4EO/VLQzIlKq4vruv/FwWmN022/f9/4tBr6h+1BDEbXcV5h0M503lfJ+G6XcOVAAZnrP8EJRFp9tRVA2ZWyPjhA45Z9xpMb1G4DqNIM24BbOD0zSDq+HHYNPBNIeqtFK5vV0qRtmbhWvbAoETSj6Dhz7BYtCLQNtqMn7FJQPQLda9090HMz4r064gf/ePxHOZuRg2dc8fCkuqHHIxNvXdR3uCbRPP39O1lj5NHHT/U/UDilEAIhhqDJfgW8xb/TfEOkODMMBMZu04UHzrJC6drP2p2yQ== 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)(376014)(36860700016)(82310400026)(23010399003)(1800799024)(10067099003)(6133799003)(3023799007)(22082099003)(18002099003)(11063799006)(56012099006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SQh4MdFEeVk7Dxe5isLg+z/nDvkmxG021QNLda3SBBo4b0+X/+UeRkV36coqqKLIE/xfXlgvkYsogxPVN7Fta2sUyrRBFVb2QBruBxgCNfsyWrFrC+KGRSFiuC6CWftmxYKUEE5MhviLTJjSo0pT+ripsdmsn//7jCcISqck24lbguXsvSl3pqSWvFQpDebeAwP0oe4fXftWe5HL5WDG9O8l0uR5IzBoY1eCad66iueoMir/SQchkhz0RBnRefjRSbEbBnm1tH3lEqjD1nSInVzLDswmr0uApYAeZBPpPuLSv07cM3CuDKc6ir9IQbBydu8IP/6w2sysNBuc/7vVJGyUdMyWPOEiDiEBtwHYg11CWWG8DDr85PWh/RiWfhGSvQZM5nuT5b8BkjwA7Fz+u2PLBLgILXA6bW3mVMa1JdFnq0KRNe2X1ueLtG2BNZZa X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2026 16:18:40.0999 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 815e17bf-63f9-4bd9-884c-08df0f572d0c 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: SJ1PEPF00002317.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9450 Content-Type: text/plain; charset="utf-8" num_devs was used both as the endpoint count and as the output for asoc_sdw_parse_sdw_endpoints(), which overwrites it with the codec configuration count. Introduce a separate num_confs variable to hold the codec conf count so the two values remain distinct across codec_conf allocation and card->num_configs assignment. Fixes: 6d8348ddc56e ("ASoC: amd: acp: refactor SoundWire machine driver cod= e") Signed-off-by: Vijendar Mukunda Reviewed-by: Mario Limonciello (AMD) --- sound/soc/amd/acp/acp-sdw-sof-mach.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sound/soc/amd/acp/acp-sdw-sof-mach.c b/sound/soc/amd/acp/acp-s= dw-sof-mach.c index 6c74e67b134f..b7926967593f 100644 --- a/sound/soc/amd/acp/acp-sdw-sof-mach.c +++ b/sound/soc/amd/acp/acp-sdw-sof-mach.c @@ -286,6 +286,7 @@ static int sof_card_dai_links_create(struct snd_soc_car= d *card) int num_devs =3D 0; int num_ends =3D 0; int num_aux =3D 0; + int num_confs; int num_links; int be_id =3D 0; int ret; @@ -296,6 +297,7 @@ static int sof_card_dai_links_create(struct snd_soc_car= d *card) return ret; } =20 + num_confs =3D num_ends; /* One per DAI link, worst case is a DAI link for every endpoint */ struct asoc_sdw_dailink *sof_dais __free(kfree) =3D kzalloc_objs(*sof_dais, num_ends); @@ -312,7 +314,7 @@ static int sof_card_dai_links_create(struct snd_soc_car= d *card) if (!sof_aux) return -ENOMEM; =20 - ret =3D asoc_sdw_parse_sdw_endpoints(dev, ctx, sof_aux, sof_dais, sof_end= s, &num_devs); + ret =3D asoc_sdw_parse_sdw_endpoints(dev, ctx, sof_aux, sof_dais, sof_end= s, &num_confs); if (ret < 0) return ret; =20 @@ -324,7 +326,7 @@ static int sof_card_dai_links_create(struct snd_soc_car= d *card) =20 dev_dbg(dev, "sdw %d, dmic %d", sdw_be_num, dmic_num); =20 - codec_conf =3D devm_kcalloc(dev, num_devs, sizeof(*codec_conf), GFP_KERNE= L); + codec_conf =3D devm_kcalloc(dev, num_confs, sizeof(*codec_conf), GFP_KERN= EL); if (!codec_conf) return -ENOMEM; =20 @@ -335,7 +337,7 @@ static int sof_card_dai_links_create(struct snd_soc_car= d *card) return -ENOMEM; =20 card->codec_conf =3D codec_conf; - card->num_configs =3D num_devs; + card->num_configs =3D num_confs; card->dai_link =3D dai_links; card->num_links =3D num_links; card->aux_dev =3D sof_aux; --=20 2.48.1 From nobody Fri Sep 25 16:03:02 2026 Received: from CY3PR05CU001.outbound.protection.outlook.com (mail-westcentralusazon11013044.outbound.protection.outlook.com [40.93.201.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E59DF4CCDCC; Thu, 10 Sep 2026 16:18:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.201.44 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789057133; cv=fail; b=JCXsQbz4UBPI3e9nDfPyt45M/lXFEDIJ4RLlsjOw2CMSnZBU3WOFwBR6Fv+z47zZfPPmHYzLPzIz9eCFkbTaCkx8ktXCE++Bb6hzamW8tqek6cH9LtyUmpn6fftFBrds5PufAYxjLKbJGmQL6aUcKoxWk7fgwz1u4eaOUkdNRDI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789057133; c=relaxed/simple; bh=Q4D3UGIR61PLhxtCy9m6tVpZ+botHtv61D9LUxo3TDk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=g3ZfcWA5pnXQOEE0XfhJuPY8YzEGZY1tPS3HosJmT1wF1bVwZYROimweABQZz/yRCJyzhEVvEsw3bhZXJbe/EtqdRyEf5HQk0TqksMs73Uccs5bG/dqlSgEggp787V5U8H6yawQTanE7BXoXz6ZF/wFYvf7Q8VMdPMFNMyt8rJI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=jDF9MhKo; arc=fail smtp.client-ip=40.93.201.44 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) header.d=amd.com header.i=@amd.com header.b="jDF9MhKo" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=c4xllRoLv4y1L8EO/Da0xQY9Bgeqg+E6rLpJ3JvZALjCsuhvmPkt9ExW3JSJWuNuoTTyr8UCI+l7s9zo9+qLly6WTgjuSOu9RtBo9qQDhvT8WsrzYOdPFnBQ5eC14WC+l3dRDpWD0whxXAHQaNLA51U/dLEQ0Lxj9Vzcq29bhVBPrdF908XVdYnJvRrI9pyasL534G3Qm+v20mAqgkcxLvtrJHho80cIFmoerhRIehUK6bH/jOzdKGwMX45cq1cGyg6cwf9/dB+MN3XMxNPqZx92DUbXO83kq5cBoh/PEeUA8to+GdTT6a3Uae8pHy1ZZkGdWwDQfei2MDbIv5pj3g== 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=vcl2UPvwOwwNG0c/raBTqZFPn4DGYP20yAIWQ7TzzD8=; b=M0/VyqzafOOkbZY9Xmkj2yV7Dmbi3mujwaD8sh2w4TVNXAaTx8LSZ7T+jmjW5S15X6G0EPIVA55XG0DDqLRkvjbcMjvcZ3uoYzOJcKsJI3fmhWN6HyFE5DVJM7lyq0XM0jo6hjCYvJX394AR6KvOtkUrVY7Xml2kfshuq6vjRWGLrLbr9X1zg9nX/2JJNzE3k/6Wu3h44ilwGn4XGcWDbt/hDOCNSW+MspkPTNSFBAUbFOkiF2Xx9LuClxYNBix4wDyaMmz8Qpjg9AvpAwwoLiGHMSgtjSXE10EWMJAaZmExxIq4LqTrhfVWj+iJaw4yB6thqE9U6UsZ/Ydy5ii+XQ== 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=vcl2UPvwOwwNG0c/raBTqZFPn4DGYP20yAIWQ7TzzD8=; b=jDF9MhKoN4M5QS7RnAXzt2RdhngxDlS5d8OKOr1fbyk/g1+y7yo0eOHxsd/QyFUQ0VO0NAdCMjOtXlHHvDQNNi9hv9cp1+MjfzJgRnLPXFiLt4B5ygK0efr/JsGJZtxuyPwB0OCEEJL4zoAVp2L2/pi6leVmzHKwlzFp0zyHCtM= Received: from SJ0PR05CA0210.namprd05.prod.outlook.com (2603:10b6:a03:330::35) by PH7PR12MB6935.namprd12.prod.outlook.com (2603:10b6:510:1b9::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.9; Thu, 10 Sep 2026 16:18:45 +0000 Received: from SJ1PEPF000026C4.namprd04.prod.outlook.com (2603:10b6:a03:330:cafe::6b) by SJ0PR05CA0210.outlook.office365.com (2603:10b6:a03:330::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.406.7 via Frontend Transport; Thu, 10 Sep 2026 16:18:45 +0000 X-MS-Exchange-Authentication-Results: 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=satlexmb08.amd.com; pr=C Received: from satlexmb08.amd.com (165.204.84.17) by SJ1PEPF000026C4.mail.protection.outlook.com (10.167.244.101) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.5 via Frontend Transport; Thu, 10 Sep 2026 16:18:45 +0000 Received: from satlexmb10.amd.com (10.181.42.219) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.46; Thu, 10 Sep 2026 11:18:44 -0500 Received: from satlexmb08.amd.com (10.181.42.217) by satlexmb10.amd.com (10.181.42.219) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.46; Thu, 10 Sep 2026 11:18:43 -0500 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.46 via Frontend Transport; Thu, 10 Sep 2026 11:18:39 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , , , Vijendar Mukunda Subject: [PATCH 3/4] ASoC: amd: acp: fix ffs() operator precedence for SoundWire link ID Date: Thu, 10 Sep 2026 21:46:48 +0530 Message-ID: <20260910161728.1452808-4-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20260910161728.1452808-1-Vijendar.Mukunda@amd.com> References: <20260910161728.1452808-1-Vijendar.Mukunda@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF000026C4:EE_|PH7PR12MB6935:EE_ X-MS-Office365-Filtering-Correlation-Id: fafe15fd-e9be-4fe0-fcec-08df0f57305d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700016|82310400026|23010399003|1800799024|10067099003|11063799006|56012099006|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: vmFfkMHEVtURC4ocR4Iw4ckwkpyichp870g2/H8FNXdnOT60ht+1GP4YAKFnxnQS1k2psHL8Pyg3P0acQRo+HhaS8FNuyZq+mIwBscuuFx3q5d/1D5XzBw/t/OuhhgZPwVTYO8MlPkHH7nL5aciaPgski/6MF5bydcoSnB3zwn9fyCHmHPlL6USerR1qn4PvcPieZeG0eyEHJW5dfpH3F1SuL9y0kRbeNapeMt5XVCCBzHzMssBRqBk4142wQWs3JD1wYDFW/aCj+hCeU6xb7wg51MJeZl9jr9c2rwqNCpXXk+1hmpJmmqwKElSbznWrpJ4e4WgPVQLlBreTz4V/b1TWslkem84M8S1wL6ggaW/d540vQQOUayiH5RJYA/MLCngQtwOCAm7r4gf6IMFL3y/+Y2jKUFgaFynRKSFznVNIP14fe0ebcWHTmrtciqzZofefoVt+WfDKOTxJR+5rSMgk/qIN6ibWghsI4EF3qmHqPpZpZERKm/jHju0a1/laoyo4PeCrx6VpaIkddAFXOHyvkMNvTx3Yj/iaHH527hKzTIRxMcMIsUvCdugCVWTyBINLH4sGNVFO91UwFYCnKd45gY94fOvkUvd9Vb5X0C/nDtBBN3DYJRwBmhDpT/G1fWUWA0ofVSO4JctQZFv50JQz6H8rpBvtLoOmflXlzwYmnUmT7zxPjFZTob3K6f2a8uCQ5lo0Q1e2K17nWFIVbg== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb08.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(36860700016)(82310400026)(23010399003)(1800799024)(10067099003)(11063799006)(56012099006)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BnfsyvRqIkt3wZRldYu6dfzT6EmfsoRoY3uQGvP8BXLyBKCgMqdAbZ3/Oe99x6YLON0xNVWuyjsPs3UmQUG/IBqyHmb5KRANixOjnmtghunlDDrI9Jc1/G2hflbdv3k08N9UNbbmueltd4Ut2Qlda8OTHIx+Pz/GVvlm6fih7qV9NWTP3AygftdyUZH7jxl6spswhVyVrHz0wrjQ4IUq8OpebWM33UpWGnSOmjTey5TlrNY8TdQKjhhyViJsQVPCjubMQvJMjWFEA2cmsPbheU0nJdZctRcpt9ZlydOADVWWUCns1iWEYNEANr1c/pAC2YUVAodxiOeGviIy/MMh4cpTfGor6+QY1Bkuv1TPKS87DGkqbijGGT/iBXlkzinhZV7XJ4dzCM7/91gfBeXoq0vdw8aB2WOYUXCbLC4F2v4WVn6I+CT5mUUCF7ikt1N4 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2026 16:18:45.6649 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fafe15fd-e9be-4fe0-fcec-08df0f57305d 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=[satlexmb08.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF000026C4.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6935 Content-Type: text/plain; charset="utf-8" ffs(link_mask - 1) computes ffs on (link_mask - 1) instead of subtracting 1 from the result of ffs(link_mask). For a typical power-of-2 link_mask this returns the wrong link ID, causing cpu_pin_id lookup to select the incorrect SoundWire manager. Fix the operator precedence to ffs(link_mask) - 1 in both acp-sdw-sof-mach.c and acp-sdw-legacy-mach.c. Fixes: 6d8348ddc56e ("ASoC: amd: acp: refactor SoundWire machine driver cod= e") Signed-off-by: Vijendar Mukunda Reviewed-by: Mario Limonciello (AMD) --- sound/soc/amd/acp/acp-sdw-legacy-mach.c | 4 ++-- sound/soc/amd/acp/acp-sdw-sof-mach.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/amd/acp/acp-sdw-legacy-mach.c b/sound/soc/amd/acp/ac= p-sdw-legacy-mach.c index 2ea226a195c3..1a05d4288a46 100644 --- a/sound/soc/amd/acp/acp-sdw-legacy-mach.c +++ b/sound/soc/amd/acp/acp-sdw-legacy-mach.c @@ -217,7 +217,7 @@ static int create_sdw_dailink(struct snd_soc_card *card, =20 switch (amd_ctx->acp_rev) { case ACP63_PCI_REV: - ret =3D get_acp63_cpu_pin_id(ffs(soc_end->link_mask - 1), + ret =3D get_acp63_cpu_pin_id(ffs(soc_end->link_mask) - 1, *be_id, &cpu_pin_id, dev); if (ret) return ret; @@ -225,7 +225,7 @@ static int create_sdw_dailink(struct snd_soc_card *card, case ACP70_PCI_REV: case ACP71_PCI_REV: case ACP72_PCI_REV: - ret =3D get_acp70_cpu_pin_id(ffs(soc_end->link_mask - 1), + ret =3D get_acp70_cpu_pin_id(ffs(soc_end->link_mask) - 1, *be_id, &cpu_pin_id, dev); if (ret) return ret; diff --git a/sound/soc/amd/acp/acp-sdw-sof-mach.c b/sound/soc/amd/acp/acp-s= dw-sof-mach.c index b7926967593f..e6d545fd665e 100644 --- a/sound/soc/amd/acp/acp-sdw-sof-mach.c +++ b/sound/soc/amd/acp/acp-sdw-sof-mach.c @@ -132,7 +132,7 @@ static int create_sdw_dailink(struct snd_soc_card *card, } switch (amd_ctx->acp_rev) { case ACP63_PCI_REV: - ret =3D get_acp63_cpu_pin_id(ffs(sof_end->link_mask - 1), + ret =3D get_acp63_cpu_pin_id(ffs(sof_end->link_mask) - 1, *be_id, &cpu_pin_id, dev); if (ret) return ret; @@ -140,7 +140,7 @@ static int create_sdw_dailink(struct snd_soc_card *card, case ACP70_PCI_REV: case ACP71_PCI_REV: case ACP72_PCI_REV: - ret =3D get_acp70_cpu_pin_id(ffs(sof_end->link_mask - 1), + ret =3D get_acp70_cpu_pin_id(ffs(sof_end->link_mask) - 1, *be_id, &cpu_pin_id, dev); if (ret) return ret; --=20 2.48.1 From nobody Fri Sep 25 16:03:02 2026 Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azon11010010.outbound.protection.outlook.com [52.101.56.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 057FB466B57; Thu, 10 Sep 2026 16:19:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.56.10 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789057147; cv=fail; b=dub+44d358ldX8Q565MLtDlzu+bvWPbqkoUX8zbCq86CKXEFx5ztBhxe97nn8kn32e46biE5sW/6sqpQzxoKHjE7rSO8GBX47Fx8H7CB1dlhJvUkhPSRD/wraxjiQqjpwFCYNvGwrvQdySUdlTjSmnJ3dcp/wkrDY2LGvJAqmGk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789057147; c=relaxed/simple; bh=Yrys5e57L0rhXCc2Dv36dgOOmuZ20jNiKJ+VJCUK8IM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=eswQ0MGFcKeGJ2iKQFk1HRiEpICc40oxWVidnOoJeOm+IdLBRgSrISI6WfmuQhK24sOhQtfarG3s6JABVzlR3iIe20KZihdtpc5DS8EUdGKyEcu/wr6KJqvIMzjwH97n73rY+Keg+wzJD/cZMvz2WfIeLBDkWAanmcb4Tf+9HVA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=gfpt1n6x; arc=fail smtp.client-ip=52.101.56.10 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) header.d=amd.com header.i=@amd.com header.b="gfpt1n6x" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=T9xsx4viqyz8CaxiQ0JPL8HiRnM/UYXyXM/U3Z8BY439Qsz6XCq0PzLmIg2o0K2aMAktSRaKSQMPXwJNwuTPmdG4SFZ9TTNhlrMIFueIffi1qsIHj6CoCp0R/bD4eFEVxfQTEggNHnOQ1pdOv+/0RAufqQz1rDZFZLR6KGs2dgGRbRfSGe0hHY7xTxSeDTjwPUGGdSqGLPQTkWDRGVD3jnfOzSV6/2t7EAE0gdxBjwxyaG/qcA0P4ZDXZ3FjBtczhxzJXyp7n8rQo/ga5WEaq+QpLXq1VzOxkvTwNGilU4XRDkdaAckqfxFwzL+z+UgzEsIu/lf3WL+uurEOrpe2Ew== 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=JSaRTzIkpeS5m0cRDpY0BsLDAMngdicA8HTW+5aDLMk=; b=Ma6NPs8UcfgC1FwuMUjrCSfJstodVBFnF5HiyVEoIawvf/mNo0w1TFwb7U+72nC+hSEX+a62zNLzCmpMqxatOai6WZ5391sbFQc9IZNokaGIy4uNjSV/v7jbx/FU3zTwRqN1UVq2oy6uxW90NZ6iALMM5whZOeA79LlwekHUzKNbjQ5Zd2Jo3/yPfdg++k0yaRgkwsvGmcEl5zzvO0/wD2a8H946yTYkCw2CPpLE71r43nk5vH4L87nrstB64Wmf70fkNurm1lnFZqfO+XYNkLY3CpZ/fYMi2LYqx3vKPIx4UFabfHWpgvgu2jwO4xXHHi9WrNKVn7OWihuAh0zdDw== 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=JSaRTzIkpeS5m0cRDpY0BsLDAMngdicA8HTW+5aDLMk=; b=gfpt1n6xhpWY7GqLiEv5BocZ24P+YI9mNMUWkLytnKuPzAt+2ngbept0agClzertK+dSCC9XSY5vdb8H8+0C7qpmWck5lAlS4FhlV1QFZgasUbmk738QG+Mi/rCxIdsyJfQv3rF5jHjrEcBRzw3xC069x5wKMZkSOGyfFKuFXbE= Received: from SJ0PR05CA0024.namprd05.prod.outlook.com (2603:10b6:a03:33b::29) by SN7PR12MB8004.namprd12.prod.outlook.com (2603:10b6:806:341::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.9; Thu, 10 Sep 2026 16:18:50 +0000 Received: from SJ1PEPF000026C7.namprd04.prod.outlook.com (2603:10b6:a03:33b:cafe::9c) by SJ0PR05CA0024.outlook.office365.com (2603:10b6:a03:33b::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.382.11 via Frontend Transport; Thu, 10 Sep 2026 16:18:49 +0000 X-MS-Exchange-Authentication-Results: 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=satlexmb08.amd.com; pr=C Received: from satlexmb08.amd.com (165.204.84.17) by SJ1PEPF000026C7.mail.protection.outlook.com (10.167.244.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.5 via Frontend Transport; Thu, 10 Sep 2026 16:18:49 +0000 Received: from satlexmb08.amd.com (10.181.42.217) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.46; Thu, 10 Sep 2026 11:18:48 -0500 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.46 via Frontend Transport; Thu, 10 Sep 2026 11:18:44 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , , , Vijendar Mukunda Subject: [PATCH 4/4] ASoC: amd: acp: fix card name length warning in SOF SoundWire machine driver Date: Thu, 10 Sep 2026 21:46:49 +0530 Message-ID: <20260910161728.1452808-5-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20260910161728.1452808-1-Vijendar.Mukunda@amd.com> References: <20260910161728.1452808-1-Vijendar.Mukunda@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF000026C7:EE_|SN7PR12MB8004:EE_ X-MS-Office365-Filtering-Correlation-Id: 466cd05a-b708-4cf2-ac2b-08df0f57329c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|36860700016|23010399003|82310400026|6133799003|10067099003|11063799006|56012099006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: bY90c+D0RhlRUswEs+VyE4GJPfbCW0cBfNcnR8e3fJ/US1OB1E63DDX+wFfbfAAFl8vnzcNaVwKa2HfU7h5oab5xw8pDRbjz89NxRT9XTQDFwfT3uuCsI2nnCvu3lWh+JgUZ/Xr/nbr+hWG90hFpSiMWhjXEPpgxItwIzby6ywoJioKU+ki35KZIB6VF9iNKLo//7ZKjgkeaK17TpYlYQxYRb3au59jJvR0/OVcKMeK+YeIapahag2AcWZkWhutpGcniYyEMgJblFbTR8iwCLIOGkJCUcUKCL/WPs+ZzZrtnumBWbWiFlwVZXUJBjaQVcYxHRTGmWihRGXXZSBxJpLXhaGztqQtYw7n9da4THO7pQpBu6hX3plhnVNE233YIXieBcXcJi9JpgdYvxZRqogvkT7ZC2QOE5Cqn3HYjCNYEZioRHhkyXMaHvbTS7iDmsYd0lH7etGAkI0kqb5HP84pI2A2N3r2oO+2pPmT8SRpu6L3dryywlAz3pXG6gn1N1S9VsoThwGqEKlBJc4gBDzKU//eYZvy8J53Ie0OXuSzmDH4EmO89PwCj5RBnEcdjglqrRbaitjh+yZUNpSBAx+AfGNtP1NZzeZnWfG3+lAlcpjf9ZKfGxKRtOYOWvAssf52cLqzkgL76VLVetFYRfBWlB4ZWw2KsCGEFNVUVBz4ylmDkXtoDFYlBbD/Xsa4ZFvIK92gOqHuTKx43GaLZJg== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb08.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(1800799024)(36860700016)(23010399003)(82310400026)(6133799003)(10067099003)(11063799006)(56012099006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HhUCkIIEk94GFjQu37GUPLY6BxRWGM/2Sl+JImXLdIRPaM8xmHfszX2H+1mKE6n4QAsNDlKKv8MP+JrvXCqldrZnKsf2D2Vwz+zb28dpvUt3aFUzQF1reS9Xd5jGmxDb+ZnWaj1PdAnWvUzZamKi0hxf3k9HUBnMWmecdXm9KUGPibfHDbokKuoTghF/Oae4CHG1KXDJBgsvLNR0rPPClYZhDJPnjROTfv/hqnJM2+SqtZ5ZmaOBZSI4wEl1EXmcmUkcH/MSqZbVqRq/33zioF0OhrSxQ1ijxCWJrYdVhj4Hu7JgKkHrE1TmijQkAbZ1f3tWqvzXSWBuITaz2KCho/1GBUxq9/382O1CXntBta0Ev3oorLIOllLKeUVUvMA1os5+8jXcJu4uynexYxq00kgdEPvKp4waiJeSf6UZH+cGQLc0q6XKXwlna4xpacD7 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2026 16:18:49.4341 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 466cd05a-b708-4cf2-ac2b-08df0f57329c 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=[satlexmb08.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF000026C7.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB8004 Content-Type: text/plain; charset="utf-8" The ALSA snd_card driver[] field is 16 bytes (including the NUL terminator), leaving 15 usable characters. The SOF framework prepends a "sof-" prefix when registering the card, so card->name =3D "amd-soundwire" becomes driver name "sof-amd-soundwire" which is 17 characters and overflows the driver[16] buffer, triggering a kernel warning. Fix by shortening the card name to "amd-sdw"; the resulting driver name "sof-amd-sdw" fits within the 15-character limit. Signed-off-by: Vijendar Mukunda Reviewed-by: Mario Limonciello (AMD) --- sound/soc/amd/acp/acp-sdw-sof-mach.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/amd/acp/acp-sdw-sof-mach.c b/sound/soc/amd/acp/acp-s= dw-sof-mach.c index e6d545fd665e..ec3e1f5f1052 100644 --- a/sound/soc/amd/acp/acp-sdw-sof-mach.c +++ b/sound/soc/amd/acp/acp-sdw-sof-mach.c @@ -390,7 +390,7 @@ static int mc_probe(struct platform_device *pdev) ctx->private =3D amd_ctx; card =3D &ctx->card; card->dev =3D &pdev->dev; - card->name =3D "amd-soundwire"; + card->name =3D "amd-sdw"; card->owner =3D THIS_MODULE; card->late_probe =3D asoc_sdw_card_late_probe; =20 --=20 2.48.1