From mboxrd@z Thu Jan 1 00:00:00 1970 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-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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 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 code") Signed-off-by: Vijendar Mukunda --- 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/acp-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, switch (amd_ctx->acp_rev) { case ACP63_PCI_REV: - ret = get_acp63_cpu_pin_id(ffs(soc_end->link_mask - 1), + ret = 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 = get_acp70_cpu_pin_id(ffs(soc_end->link_mask - 1), + ret = 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-sdw-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 = get_acp63_cpu_pin_id(ffs(sof_end->link_mask - 1), + ret = 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 = get_acp70_cpu_pin_id(ffs(sof_end->link_mask - 1), + ret = get_acp70_cpu_pin_id(ffs(sof_end->link_mask) - 1, *be_id, &cpu_pin_id, dev); if (ret) return ret; -- 2.48.1