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.201.14 ARC-Seal: i=2; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=pass; t=1792649327; b=wEAe7Mi+r7Xr+an8wZqk/aWUOo4yIZgX8iYtMkcoO5NCTZsWk4mluW2sD3AzAXm02qBV JORKNv/sY1VmXaYIjFe0ci843qZ0w9bh+OWCQr6qa6+SFshIOqlgjc/0BZ+E+ot6XTVfv 5uV5vZR8qWF1gKzD4hmKqwp+B6VNftsVruhedyfJaSkberHmI3yXaFIre6xEEJd2T6NT4 OWRmit117EKPD17+S52f37IZ084bNTOK3ofe9eSk1PXu8JO11TZ9yIYtCP29nnugABCBh M3tlnDXJZ02UzD7RcXRD9VFzdWUrWl1paveAYHBXjf5f6Eb2yBJ5b3H6RTmLVRDhESg== ARC-Message-Signature: i=2; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792649327; 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=0LRNJpbQ+fV3P8N+iK+VOukEtIWc5Awe0abppaetwas=; b=iUOmYxpNv7ZFK5z0E0gYAAtZgGmnir4TKd9PSB5i2xxkjSm8HFhoqS2jKTrSgisYRYlH 33j//KKFl98h+xKISxW8ZMVwJujSbBQFqa0JUxXDnOUSXe6j4SUwrxupb3E0ZsX4e5XUN oOa71h/kFfxELc1urKK/wO+rs7bn/NhydIW/wn/IdY5bo6KwPCdLjhC31VVKCu2RD2liD 3QrsEnvxgprEbbVKOayu5FTvkW4pYyJVfAPtAgcZ9wdTeQsOLu0kvjaQ0rFM1T3/ivmbO Rw2/hPtWGa7iVaoXdMdzUmo+PeaTerOPdO/1T8BUOiP+wszzkO4lS6xEwtuhlR0BW5A== 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=Z2UKcEIy; arc=pass header.oldest-pass=0 smtp.remote-ip=52.101.201.14 Received: from PH7PR06CU001.outbound.protection.outlook.com (mail-westus3azon11010014.outbound.protection.outlook.com [52.101.201.14]) (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 45F54606A31E; Thu, 22 Oct 2026 06:08:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 45F54606A31E 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=Z2UKcEIy ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YVwIVsHE94F1+l2wLAdTm38GX+ypg2lmyiUK5WV2JTm6nEJDw7c0ebRfEIUymfkbEfvij5FEmyszi9MLHAnLJgz4R3Rmc3O5QmAr8rjLu/kScq34YBxg5bOHG8W99n+zuUfzi35TCl5ykHf8kJS34mlglH7vgyo7qEEUpuvydggiZ6robfz+8VteLN0BYGFNbrzCQvHu7VSiA7sBEx4VX4Vb7TjCsala7V5fQ7urvQpStqfzpbRmikPfYiJxLOq1dOpYxARFIMsvrqrWkHWCdOoSWNc9bGiUcqUezxWv4yg9pCy0QpNJENMoPPDf1KSMG3cF9mz/wTGbfUGypVeo8Q== 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=0LRNJpbQ+fV3P8N+iK+VOukEtIWc5Awe0abppaetwas=; b=OwpXAKHTCloSPgestDjIGKxEIUh2BmitymkXyUzzFAahZGkJo2Pbwf+3TnLycx8g5H4kEqvBJbw3LLW7CxOdbbB2dBX955dvViCUVEV6qKQgBL+5FjovludxC5ZXOvs1qlNng6fCMhNbhW1vzdkB88O3IaXt5/uyT927W7VZJGMxLoO9U9J5ojIIThrZMMuWxQpuPBdine+VZz/oIhSwVpeIiV0+LJ0sGac4xaRVb9ffh+pJGnbSDUVwQ1t9q3k4/7Zfo3j5IyFhqB0HITP0JlFixX+9c+bELLPzPn8W83QmSU8Wfqm8wyO1R5w7Mas6+ohU++XwrIj+7cAqXHxM5g== 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=0LRNJpbQ+fV3P8N+iK+VOukEtIWc5Awe0abppaetwas=; b=Z2UKcEIyzWwxq8G1JfMsL3Nk/rQqni+YAS57yPFTjZViuOii87lZWUB6NIEYBpBrCmf1Nqf7VlU8nhZs4wkCBINooeZxC0hLMzAb5s4Du2rYWvH/eVvfcqZTTABdEsca3THVVoS0GSsAhrL9YMyQ/HY0a/IktF+54JafcH4Wshg= Received: from CH0PR08CA0029.namprd08.prod.outlook.com (2603:10b6:610:33::34) by PH7PR12MB7282.namprd12.prod.outlook.com (2603:10b6:510:209::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.496.23; Thu, 22 Oct 2026 06:08:41 +0000 Received: from CH2PEPF00000143.namprd02.prod.outlook.com (2603:10b6:610:33:cafe::11) by CH0PR08CA0029.outlook.office365.com (2603:10b6:610:33::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.546.16 via Frontend Transport; Thu, 22 Oct 2026 06:08:41 +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=satlexmb08.amd.com; pr=C Received: from satlexmb08.amd.com (165.204.84.17) by CH2PEPF00000143.mail.protection.outlook.com (10.167.244.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.546.15 via Frontend Transport; Thu, 22 Oct 2026 06:08:41 +0000 Received: from satlexmb07.amd.com (10.181.42.216) 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.53; Thu, 22 Oct 2026 01:08:40 -0500 Received: from amd-System-Product-Name.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server id 15.2.2562.53 via Frontend Transport; Thu, 22 Oct 2026 01:08:36 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , , , , , Subject: [PATCH V2 01/13] ASoC: amd: acp: add ACP7.B/7.F SoundWire link count for machine driver Date: Thu, 22 Oct 2026 11:32:11 +0530 Message-ID: <20261022060724.1814741-2-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20261022060724.1814741-1-Vijendar.Mukunda@amd.com> References: <20261022060724.1814741-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: CH2PEPF00000143:EE_|PH7PR12MB7282:EE_ X-MS-Office365-Filtering-Correlation-Id: 415cd978-9039-4304-63d0-08df3002ebf6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|23010399003|82310400026|7416014|1800799024|376014|6133799003|22082099003|10067099003|261021123027099003|18002099003|11063799006|261009223027099003|261021121427099003|56012099006; X-Microsoft-Antispam-Message-Info: gHQPisTbBJlQjXnhOU65SufaXLplyU4zb1ZMZy0gGtozSmCoMCqAgEyPZMwplJDMvJCf5zcWWnBF1AV7zPvHVvKYE2nP5XdFNzgwb1HMtyVFJ30oRFZRG7YsEXQNZjrNoXW7R6yn0MAVqt8kyBU3HDzZyqu30aeYjfaXjVU3ngqiT+h/VZCUNhew1kyE5X4lw2NgrOSyMau+x195gERWBBzUUBzQZmNQ8Q94GNUYAb7/unW+NvmmK5SishD+yL/UdFDk3bfq6yIbOi7kaBC3Qwhd3Qt2tkwGqOnjrkq5chP43TLtdwyqmnwfvYg24kUGa+tZ+q9gecGqqBwj9pGIg+6zJeBtryGwpDv9UmunGn7jJqhTwjn2+rOn4u3zjdKjFpHxCDf5fbuCFsQmzokPwmdRr0L90v2jixa+s0auV//trHt0mK/bvjgjJz01Jy+y8F4vfh4AEoskT47KWsb3QDPpHCc/M6n1FG4yLOmBlXFHo4ehDr05z/Jac4a2uARyt5A6gHY1H5RLZE9FClV6b0Rp/IAchxZJhN4jJieJ5SczGsfOB8UKbR6fIEYQ6yNhKlsIIwh29XuXgDadOk3mygw+NjX1mpEkK7Q0Is6kgCnt1XrYh+yGZLCtwRW6h/QsiUSd1YtaftF1rjvFw22BoHhmPg8mlmS4vsznB+V/SYHvqKWzGaVQMZtWXsM61uNo 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)(36860700016)(23010399003)(82310400026)(7416014)(1800799024)(376014)(6133799003)(22082099003)(10067099003)(261021123027099003)(18002099003)(11063799006)(261009223027099003)(261021121427099003)(56012099006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vYHvpYeujNOExEOsMs1mdcBtsdtI7DaAO/Sydgp0Fg3shzRiDemb0j16COQu9BMnTLNaef63myxUjo58H2N8F6gXG1BvY/aHE03GctyzYQiKLXSIi9npG1jZWJ6+lxswxWcIsj9uzVR/KjW+ke9xLvTaq1sveWl3L6b4uAz4VbDxR4iWprYCj7pMOqU60NzQgcn3up+xIug/dS9RFhYq+pjRMjs4YfiC1/aozG5NS8RoAkGwjyda/X372XxmFL4i2wsAGCBcjowFzCxyDl/5JjW6CgM9EvTQ0Al9itOWO2q1Hh2o2hGmDY9krM0jlORusdZeJMoPG30zN1ippsuNUxb85qS3CdHLf7gpPb0EOI5zznGvAEv1Mvb0mQHIBptNBchPl5UQWjb1ULM7l7yE+iVvWYwOF89mZNTKspYEZZRya5fWj+0la+opp3vzgOq6 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2026 06:08:41.6452 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 415cd978-9039-4304-63d0-08df3002ebf6 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: CH2PEPF00000143.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7282 ACP7.B/7.F platforms expose four SoundWire managers, whereas earlier platforms use two. Add PCI revision constants and ACP7X_SDW_MAX_LINKS to soc_amd_sdw_common.h, and set max_sdw_links in mc_probe() based on PCI revision so the machine driver validates DAI links against the correct manager count. Signed-off-by: Vijendar Mukunda --- sound/soc/amd/acp/acp-sdw-sof-mach.c | 10 +++++++++- sound/soc/amd/acp/soc_amd_sdw_common.h | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/sound/soc/amd/acp/acp-sdw-sof-mach.c b/sound/soc/amd/acp/acp-sdw-sof-mach.c index ec3e1f5f1052c..ad8a024321dfa 100644 --- a/sound/soc/amd/acp/acp-sdw-sof-mach.c +++ b/sound/soc/amd/acp/acp-sdw-sof-mach.c @@ -382,7 +382,15 @@ static int mc_probe(struct platform_device *pdev) return -ENOMEM; amd_ctx->acp_rev = mach->mach_params.subsystem_rev; - amd_ctx->max_sdw_links = ACP63_SDW_MAX_LINKS; + switch (amd_ctx->acp_rev) { + case ACP7B_PCI_REV: + case ACP7F_PCI_REV: + amd_ctx->max_sdw_links = ACP7X_SDW_MAX_LINKS; + break; + default: + amd_ctx->max_sdw_links = ACP63_SDW_MAX_LINKS; + break; + } ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL); if (!ctx) return -ENOMEM; diff --git a/sound/soc/amd/acp/soc_amd_sdw_common.h b/sound/soc/amd/acp/soc_amd_sdw_common.h index 034c9ab6e4ea6..5b9410eff56eb 100644 --- a/sound/soc/amd/acp/soc_amd_sdw_common.h +++ b/sound/soc/amd/acp/soc_amd_sdw_common.h @@ -17,12 +17,15 @@ #define ACP63_SDW_MAX_CPU_DAIS 8 #define ACP63_SDW_MAX_LINKS 2 +#define ACP7X_SDW_MAX_LINKS 4 #define AMD_SDW_MAX_GROUPS 9 #define ACP63_PCI_REV 0x63 #define ACP70_PCI_REV 0x70 #define ACP71_PCI_REV 0x71 #define ACP72_PCI_REV 0x72 +#define ACP7B_PCI_REV 0x7b +#define ACP7F_PCI_REV 0x7f #define SOC_JACK_JDSRC(quirk) ((quirk) & GENMASK(3, 0)) #define ASOC_SDW_FOUR_SPK BIT(4) -- 2.48.1