From nobody Fri Sep 25 03:17:13 2026 Received: from SA9PR02CU001.outbound.protection.outlook.com (mail-southcentralusazon11013014.outbound.protection.outlook.com [40.93.196.14]) (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 238AE40EB9C; Thu, 17 Sep 2026 09:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.196.14 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789635928; cv=fail; b=KjbVYZrnGoPmPu+FI5tlIvOHwmBvSaM3AnplQn+zeu/2iYItLvN6E7cKpmTI3NnUnEBYRWeOk7omGmB6YEaIxsgEqmoayerl4aioHA1DpD1o1BhJdBH7QALVltb+3rSXmFiERkT2bIP+Tn5ms+PWmoCGQ0XGybYBCLJw7uTbZvo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789635928; c=relaxed/simple; bh=yO6y328vNISbtDzDtnHJj32oXmV1a/DRh1d44nc7UlI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=SR1TO9enRuJhqj2r865QGJhucUDEesnp0nZPdaxS0k0qy+ZLxQ/V2Pt3pUkx+KTE4cVX04MbX+wIlCi74SwdYg9QZdCDZT7LUrX/z9PJxEGAqIrLSJKTQOlLYR30ZtSx3GEyUteUsHySK73dwl2IbjsY5PyAn3QnMzgFo+dAd+8= 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=Uvhq3kIf; arc=fail smtp.client-ip=40.93.196.14 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="Uvhq3kIf" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZfGe63WTQBb8y9tDmcbyp5ZEJbuiW+/fkCOmfc5vvbGGyTEelnnbcZaexUUixLdbvkPQIyKhNFd4iaMXy5znUtm6IZnN92SSb9Tu5hWYFT5NIU1HKgOH/DBLCHyDi3sSc1voNPvhmpfdMe/c8S4DMhDvAghsnFEFutVy87AbJXfkWpJiP1JPDC8FShcV6Qw8ixZfdaA8QNNUMGokMTKEaNikI1gYZI76E20pZMlUCNl348UElZzp9uEJiyLEHPy5QWsTAbCAFbMP19W8dSAg9BwwYNSXtL6qOrOfzTsW2e7S8Ljc0CdcyfBoyTIerPFEvD1OK0JJXtyI1XPJuUA9tg== 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=a4KVcA+y82Qchbu12Uwtd3EUK1/q3BrOCPRpv+APbwE=; b=nQZskMxLtzqnNTfhaHatR2sfjZVxm+QrwmP2shY9jaKbZjUYGpgbP1F33tQXAZC1F0qZjDCdOolAGHz9v7EpPutzidlWdD71AllvFHTWJGXwDaSIbgYiknFDXrJ18+KPjGbaPTI80hVd20ntL9BgNfQJbJmfEytnYdmtjdrso7bQNH5zO9ipbnlIXj0FUR+odpYRze1M2OzrOcMHahT6FRy+AdRjSEXnGRJqY6Wq0qDgEXu3BNbstqvetU/vLBWke5FLvRj9fSE/gn5knl1iXevYAeTjTCoK+xnuvXptZuxmxtq+Ey95T2fFVr4puWkuyX0Ho6qPu/f8hc8S6qWGKQ== 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=a4KVcA+y82Qchbu12Uwtd3EUK1/q3BrOCPRpv+APbwE=; b=Uvhq3kIfCNd9Ye8afbmbGTPYf2E/DqdJz4Qx+6C8kX5BIO/f/d4LI/9JyxmDccPl7KrYOs/FIKwlnjUsgWvtyWcFJ/sXWiKx2O2q/zQYfKHJkLcI5FxMe5CFtJHeGxi3LbFHAB2dpLILwgWs+30WHEKA9JlFemvmdNb4LNGhuEw= Received: from PH8PR21CA0013.namprd21.prod.outlook.com (2603:10b6:510:2ce::22) by DM3PR12MB9328.namprd12.prod.outlook.com (2603:10b6:0:44::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.12; Thu, 17 Sep 2026 09:05:24 +0000 Received: from SJ1PEPF00002315.namprd03.prod.outlook.com (2603:10b6:510:2ce:cafe::16) by PH8PR21CA0013.outlook.office365.com (2603:10b6:510:2ce::22) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.451.7 via Frontend Transport; Thu, 17 Sep 2026 09:05:23 +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 SJ1PEPF00002315.mail.protection.outlook.com (10.167.242.169) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Thu, 17 Sep 2026 09:05:23 +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.49; Thu, 17 Sep 2026 04:05:22 -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.49 via Frontend Transport; Thu, 17 Sep 2026 04:05:19 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , "Vijendar Mukunda" Subject: [PATCH 1/9] soundwire: amd: rename AMD_SDW_MAX_MANAGER_COUNT macro Date: Thu, 17 Sep 2026 14:32:49 +0530 Message-ID: <20260917090407.3828816-2-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20260917090407.3828816-1-Vijendar.Mukunda@amd.com> References: <20260917090407.3828816-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: SJ1PEPF00002315:EE_|DM3PR12MB9328:EE_ X-MS-Office365-Filtering-Correlation-Id: cfec3cae-d36e-43a3-9e90-08df149aceab X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|376014|23010399003|82310400026|1800799024|56012099006|11063799006|10067099003|18002099003|6133799003|22082099003; X-Microsoft-Antispam-Message-Info: Ks5/+e4FlMtV3KTW3CSQANxW6nanp2sE/oF/O2lz3QIxanW60pbhBhk+zjPtbj3brmVZ/1AaV++7bMJW8sqHl9rwIoHQsgPDDoSvn3wO0m75LA4tCBxuiwQn4YwRR1aXhxAV7gg1eB+V5Ez8siFpfGolmP+6j5yEtUDwT/xrWmakc8GdYYui/lqkP8oeVYddxVk3nf6/J3KHfkNaazc/8gi24QhHuzJ57qjUu2Yy3/o+j6GqwT2QK8XHV6wU/L4gkY5gme32QekIBWjfALmSycEjJ54uQwMYP1DxbQIqNOpq+8pvPEik582wK30UmCG+evkTl6Dg0xIUV7uY/+lzDMmt/EK4D2v66RnrxcIoa/R7nLAHluzPIuEopPR+gp7a0El0lgpSR8hJfdZT7OhGIvNjcNnYqkyctFGjEgNHhmdJJQFBhI/YZxT7N6oWdxgK2tHXmr3G22cEuPNWUk1WBrIPJt79PHDW0W+5pNcUBQUW0w167epxYfWb+/YBfgdi3+kuNco/4fSF9HZXKiUtyAbAtViCwqqnJ9fUDHiQ4NhtHMbiD+CaGb3qyQTwAJ1LRWtbzScgl6wJ4xnBDCxssase+SYasGSK1n5CNpARDwTUq8EWn+tlRx0c3W7Z8cWry/9b8V71/VeDKhY5c1cc7zgnOcKaqbtLWVB3MPzThCER6e8ugsdrUUGAz/8CHAGOy4mARUVm8xNbBVx+g5Jmzw== 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)(36860700016)(376014)(23010399003)(82310400026)(1800799024)(56012099006)(11063799006)(10067099003)(18002099003)(6133799003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: h43MCfJhykG2NVV1bdn6f6YMDe45EdUhTlWZpimnvh9w6VfrneadQwBImUet+/OAPLDvQoS9NucjJK7L4MJ/qxSoDW/yk0wrk0QF7xyLw73vew4ohSEJ6RuOLz+LhJCMu7lDN3MzoES17+8eaFFZDJ5aCmCwdr0yQk/I5lwOLzus85lbdvCJOlJzyFn+rSEf0MB+IaDU03O4d9pjUJXfSGVADkQmecjd6wPrWuU4WpgBjr1l7PfvdBDghx9DIgxduhQn6LOXLTUAynoJN7Dud6D+MmcbZEAIUJsMcsVeu6mwmCy9tl9heZ/M6f2ed/lV6OWRZpOA/Tk0V0VRiCgCu6mFmx3bNQLMlzdH9ymaATE0fc66QFxK6TR6QTLBVsbD+Jse6JwxLy67R1MBc0GcY+oudB3AIfvevj3R2vWuNMbIM1Ulgg3LmQjDXOIhsFRA X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2026 09:05:23.4009 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cfec3cae-d36e-43a3-9e90-08df149aceab 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: SJ1PEPF00002315.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR12MB9328 Content-Type: text/plain; charset="utf-8" Rename AMD_SDW_MAX_MANAGER_COUNT to AMD_ACP63_SDW_MAX_MANAGER_COUNT and add a comment clarifying that ACP6.3/7.0/7.1/7.2 all expose two SoundWire manager instances. The rename makes the platform scope explicit and matches the acp63 prefix convention used for the shared ACP6.3-base hardware throughout the driver. Signed-off-by: Vijendar Mukunda --- drivers/soundwire/amd_manager.c | 2 +- drivers/soundwire/amd_manager.h | 2 +- include/linux/soundwire/sdw_amd.h | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manage= r.c index 1a252a81269a..400fa05456a1 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -486,7 +486,7 @@ static int amd_sdw_compute_params(struct sdw_bus *bus, = struct sdw_stream_runtime int port_bo, hstart, hstop, sample_int; unsigned int rate, bps, channels; unsigned int stream_slot_size, max_slots; - static unsigned int next_offset[AMD_SDW_MAX_MANAGER_COUNT] =3D {1}; + static unsigned int next_offset[AMD_ACP63_SDW_MAX_MANAGER_COUNT] =3D {1}; unsigned int inst_id =3D amd_manager->instance; =20 port_bo =3D 0; diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manage= r.h index 88cf8a426a0c..76ecaceb3ee5 100644 --- a/drivers/soundwire/amd_manager.h +++ b/drivers/soundwire/amd_manager.h @@ -266,7 +266,7 @@ static struct sdw_manager_dp_reg acp70_sdw_dp_reg[AMD_A= CP70_SDW_MAX_DAI] =3D { ACP_SW_AUDIO2_RX_OFFSET, ACP_SW_AUDIO2_RX_CHANNEL_ENABLE_DP0}, }; =20 -static u32 sdw_manager_reg_mask_array[AMD_SDW_MAX_MANAGER_COUNT] =3D { +static u32 sdw_manager_reg_mask_array[AMD_ACP63_SDW_MAX_MANAGER_COUNT] =3D= { AMD_SDW0_EXT_INTR_MASK, AMD_SDW1_EXT_INTR_MASK }; diff --git a/include/linux/soundwire/sdw_amd.h b/include/linux/soundwire/sd= w_amd.h index d0e97007e3ff..40ba84c3b2cc 100644 --- a/include/linux/soundwire/sdw_amd.h +++ b/include/linux/soundwire/sdw_amd.h @@ -26,7 +26,8 @@ #define AMD_SDW_POWER_OFF_MODE 2 #define ACP_SDW0 0 #define ACP_SDW1 1 -#define AMD_SDW_MAX_MANAGER_COUNT 2 +/* ACP6.3/7.0/7.1/7.2 all expose two SoundWire manager instances */ +#define AMD_ACP63_SDW_MAX_MANAGER_COUNT 2 #define ACP63_PCI_REV_ID 0x63 #define ACP70_PCI_REV_ID 0x70 #define ACP71_PCI_REV_ID 0x71 @@ -138,7 +139,7 @@ struct sdw_amd_acpi_info { struct sdw_amd_ctx { int count; u32 link_mask; - struct platform_device *pdev[AMD_SDW_MAX_MANAGER_COUNT]; + struct platform_device *pdev[AMD_ACP63_SDW_MAX_MANAGER_COUNT]; struct sdw_peripherals *peripherals; }; =20 --=20 2.48.1 From nobody Fri Sep 25 03:17:13 2026 Received: from CH4PR04CU002.outbound.protection.outlook.com (mail-northcentralusazon11013064.outbound.protection.outlook.com [40.107.201.64]) (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 CB7E53033D8; Thu, 17 Sep 2026 09:05:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.201.64 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789635936; cv=fail; b=MhuWEWFzJ5bflSKEwkQLoDqyie0dy1QpNx5cso7sCa4Gx8fbfSkYVWX/fl0pOnX8Uu9RARkROb2pZL19IWz0xiH2nIyO1LlL+yXaUTg2dE/nUAmn7JaaxW/ZysBpJIwUtQi8lNaNVvsV3rj1Qg/QqPKuYcJAA1kXNvCQM7m8n1Y= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789635936; c=relaxed/simple; bh=jVGEJq3DlDXb89LcuCRpcVk7H7IdPFZkUOMjumnx5ug=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pviJEp+5a+P7gDHhnymePxo5Wo4rgdwCIoy/X/oJy8XWWA078Bq/ESAuV1/exoH1st946lBu7MjmbVrKtk8f/hNFUvg+TjpAEGYot9e/p6AuMzTlZa4nuclHu3dwNG1pit+e73xcaUMjPVmoAvWsiRiEhtN/jKIuWPp7S+qUAjs= 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=uz1xgc8y; arc=fail smtp.client-ip=40.107.201.64 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="uz1xgc8y" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XcDX0QZZLbJnzqgt6X0l8kZ/25Njx4SGuIuR4k4tGhJcWPC/V4fD+cOk2iUxmbfaKKVx/xFW8ot5la2DXctHm9rUmZ9LP+aoOLUApe9glTGJvz721rEa782RYaFQCZKw+4CFUkCRCguak2IOurftK3DrWy13MNQ5Wdainqa3A2DykBovfwKiINirx/iaY3BZ+XYKFdsTiIA1T1rBOKRu05klM+hRBZ2iznsV0x0e9GcQhfxuwk1MLqYX4KeZsfDTQiPHbl/sRWkaywYRl/yII8h7LZrs0H2FD2Fkfknzmgq4ff94x+uhQ6wM8rmwK9dtjk1fzDp/yOazgeisz3jPSQ== 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=gwCXNYXZEY2qKnkrMO+fVMTp1IyCtYaTLliuV5Ft//c=; b=pRtU7NlxL6HyU6U3NguQQdPhNq51lk/w3IP0HhflkBhnY2Pu3CVI+S5dtv8GyMM1AgWi9dgge8MYqonTtcCxoX9NoVPhDZNWxzue2niAvCgJg2drO2DDjoJlv0f8FjFIrHwKssTIeAb1X5yFxxKXG3W1Sq6a0d0QAj6Z8MJlRqKKurfswwJmk4pghOU9tfufleGJ6P5LLO3QVe6mAaebG/GY+Bb3ali7tU63E0LhLLPDfYp1rA1K8jKaQAvg0GlRHaBC3T8nWNd9sf0b0K52AJ0UCaHkPTQz64WnsKsTADJTja92rxSWoPwz4H23IRp8+oXGUm1teriuiaMmnpSM0Q== 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=gwCXNYXZEY2qKnkrMO+fVMTp1IyCtYaTLliuV5Ft//c=; b=uz1xgc8yXKmA5JJrbj66nyGXPoRawVrI2/0Kp1a/4J5gZhK1jXSXJV5FWp4HZ7q9sctwi+bhQzP6zsadRdmRl9koseUN+5NhEJFE5O2ZK3Mhmeu9ZiWmZpBK9atHbSzAiGhLIqIinEumND9llQToysghw428XmCfCf26YWrvIsM= Received: from BY1P220CA0045.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:59e::14) by LV3PR12MB9187.namprd12.prod.outlook.com (2603:10b6:408:194::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.12; Thu, 17 Sep 2026 09:05:30 +0000 Received: from SJ1PEPF00002313.namprd03.prod.outlook.com (2603:10b6:a03:59e:cafe::6c) by BY1P220CA0045.outlook.office365.com (2603:10b6:a03:59e::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.406.11 via Frontend Transport; Thu, 17 Sep 2026 09:05:30 +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 SJ1PEPF00002313.mail.protection.outlook.com (10.167.242.167) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Thu, 17 Sep 2026 09:05:30 +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.49; Thu, 17 Sep 2026 04:05:26 -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.49 via Frontend Transport; Thu, 17 Sep 2026 04:05:23 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , "Vijendar Mukunda" Subject: [PATCH 2/9] soundwire: amd: allocate pdevinfo and sdw_pdata by ACP revision in probe Date: Thu, 17 Sep 2026 14:32:50 +0530 Message-ID: <20260917090407.3828816-3-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20260917090407.3828816-1-Vijendar.Mukunda@amd.com> References: <20260917090407.3828816-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: SJ1PEPF00002313:EE_|LV3PR12MB9187:EE_ X-MS-Office365-Filtering-Correlation-Id: 76e39db9-ea11-4955-10df-08df149ad2fd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|23010399003|36860700016|376014|1800799024|10067099003|11063799006|18002099003|22082099003|56012099006; X-Microsoft-Antispam-Message-Info: zncivqMhJ4PQwcMUv9AxqPl23oMrTniaOhOtsy5pg7Ysd9zZ4FA1h0T4V5J5wt0d35uj4PaSBNs+wG66PJuFJYoUzAa8KvfHQGjWMjyXOlnPo3W4L4n8M4/XJEvJzd+90rhdHsabe3yCA/7A0t3hgYowM30lNzQEoy/p7guEC+iZWEHmeUsS7gDD2ZiTJkFu8hqwNaIq76BjxgkwXKUOdQbm+CuV9rXsS2uZUff0jKL0jObWorBSTHTekLpfI2o5LRCc9woIK3hhnIITgUcQ3wfO061+2+NtNCZQGau/ZeESQ3ye/S6VGd4TGFmnP5h8ahB5f6GQgfilXwFTUsrN014LdA9XscJuNUWDxkh0Z1/ZbABB6lMjUQ0KuzJFCDMkbdlo1PNKhNi4zkRrhs3vtuStH3+EOpA6dz3uH5Bavf/kEGROcy66QeQR0U5G1Bon6cRx6ykxxZ/TG41D7JNgJB9929h6lk2I5Ey5udK6iPw1zvBoTVdKhOhhNkraOJMj1cALwwvhRUQuSLMA3afJnMj7TYEPHJJG1tR+ReMrhIFbHuJtg5xtF7ViBNexouJ94phb8DHDMsthboRVNAYbFWEa8IimpreYQ1SzSFIGtFbyS4bool7byCwASojhUtVXdhvl/Iypb2t1QlzdxsfJhw9FyKzAqDCwRcIWETiYjMb2NU/GrHCuooKC0h97MWuUxHBmpIJHv9fJ5iBOpSDf2w== 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)(82310400026)(23010399003)(36860700016)(376014)(1800799024)(10067099003)(11063799006)(18002099003)(22082099003)(56012099006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ULlZgPizrS6/vghbrc7ApbEcupqcyaIEy2pe7NyftQrLbP4jk0XsYHmoIdoRW+52dRoLoS9pPendKNYkzcBejVuI3T18pvPFUXv/esS8uyi+SYaStQNZ64UVmTT1nqZOf9Kh1PlMt0m+BiRtcMcYMiY/UwN+p5WUWQx0Ds2nL/4KT2/4XyfHUPwpExlL1IE89ESRiOMQtBdoUNZOJ7d7Ba2/Q1/E8v9H7d8t5EGD+bHfw5kzmrQnD+0YFGjTlsGk9FIxMfurr1KyArRQ71PpKeuGQF1TVydmObwUy2htH0uEXBIRoubFYwbyfbBGHjGw4McV5emuAfJYXrZZJvnwcMYZt8Q4evPJxsHsV1Zy/5a1xSzvtTZexRge/CmWi65WoLqbcq9NAvJi+oareSILMnDfuAy8g5UQfGJYsC6zW11ycoWpg+q4BBJGRTXRDvkl X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2026 09:05:30.6205 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 76e39db9-ea11-4955-10df-08df149ad2fd 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: SJ1PEPF00002313.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9187 Content-Type: text/plain; charset="utf-8" Determine the SoundWire manager count from the ACP revision and allocate the pdevinfo and sdw_pdata arrays dynamically instead of using fixed-size stack arrays. Signed-off-by: Vijendar Mukunda --- drivers/soundwire/amd_init.c | 37 ++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/drivers/soundwire/amd_init.c b/drivers/soundwire/amd_init.c index 88004d59322e..15d117172bdb 100644 --- a/drivers/soundwire/amd_init.c +++ b/drivers/soundwire/amd_init.c @@ -68,12 +68,12 @@ static int sdw_amd_cleanup(struct sdw_amd_ctx *ctx) =20 static struct sdw_amd_ctx *sdw_amd_probe_controller(struct sdw_amd_res *re= s) { + struct platform_device_info *pdevinfo; + struct acp_sdw_pdata *sdw_pdata; struct sdw_amd_ctx *ctx; struct acpi_device *adev; - struct acp_sdw_pdata sdw_pdata[2]; - struct platform_device_info pdevinfo[2]; u32 link_mask; - int count, index; + int count, index, max_manager_count; int ret; =20 if (!res) @@ -88,6 +88,18 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(stru= ct sdw_amd_res *res) =20 count =3D res->count; dev_dbg(&adev->dev, "Creating %d SDW Link devices\n", count); + switch (res->acp_rev) { + case ACP63_PCI_REV_ID: + case ACP70_PCI_REV_ID: + case ACP71_PCI_REV_ID: + case ACP72_PCI_REV_ID: + max_manager_count =3D AMD_ACP63_SDW_MAX_MANAGER_COUNT; + break; + default: + dev_err(&adev->dev, "unsupported ACP revision: 0x%x\n", res->acp_rev); + return NULL; + } + ret =3D amd_enable_sdw_pads(res->mmio_base, res->link_mask, res->parent); if (ret) return NULL; @@ -112,7 +124,20 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(st= ruct sdw_amd_res *res) sdw_res->flags =3D IORESOURCE_MEM; sdw_res->start =3D res->addr; sdw_res->end =3D res->addr + res->reg_range; - memset(&pdevinfo, 0, sizeof(pdevinfo)); + + sdw_pdata =3D kcalloc(max_manager_count, sizeof(*sdw_pdata), GFP_KERNEL); + if (!sdw_pdata) { + kfree(ctx); + return NULL; + } + + pdevinfo =3D kcalloc(max_manager_count, sizeof(*pdevinfo), GFP_KERNEL); + if (!pdevinfo) { + kfree(sdw_pdata); + kfree(ctx); + return NULL; + } + link_mask =3D ctx->link_mask; for (index =3D 0; index < count; index++) { if (!(link_mask & BIT(index))) @@ -133,6 +158,8 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(str= uct sdw_amd_res *res) if (IS_ERR(ctx->pdev[index])) goto err; } + kfree(pdevinfo); + kfree(sdw_pdata); return ctx; err: while (index--) { @@ -142,6 +169,8 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(str= uct sdw_amd_res *res) platform_device_unregister(ctx->pdev[index]); } =20 + kfree(pdevinfo); + kfree(sdw_pdata); kfree(ctx); return NULL; } --=20 2.48.1 From nobody Fri Sep 25 03:17:13 2026 Received: from MW6PR02CU001.outbound.protection.outlook.com (mail-westus2azon11012000.outbound.protection.outlook.com [52.101.48.0]) (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 9DFB04A2A54; Thu, 17 Sep 2026 09:05:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.48.0 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789635943; cv=fail; b=ubSF/Uprz5/514MWSNkzRhbjLZSBkA+K6JfZQ1p18xIxGqZ5i7bMrB2Dm8B1HRF1u1yCe7R3M7AaeaqP+dH/iIX0XMsCtPN3us/XpEdes9mSO8FYNe/NvpJgE+yl3R0fqzzjxVo4rixmdJzP+dVDP9Q6yBav3q7nf2fDKUYoRcY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789635943; c=relaxed/simple; bh=YSSQrdV7BmQKdSoU1T4QBn+YPn1TlUiP+1ferx3ULUI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PDAuqolDImZng3dspN3tzWCQV8xCCivuJUFdG8uN20PbNDxU5vN89R+1kppaQhQ7rRPOjDnezDuN7Z0NkKJPt8rdTY5ccILncQ+yJ/2TQt5NIb7VZpobanKgabV8afsRy4oFkHMzGOPBCrHFDXwDhIBW7p5gDPibM7zN+SLqTk0= 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=HhoZuD0B; arc=fail smtp.client-ip=52.101.48.0 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="HhoZuD0B" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jbtDg/HFSPshBeR2LsNA9nZS1mA2l2oBFkq82oGD31vcMYCQxjNcqt698/7KOEAaadlc5ysPhNO5sNW0rlqoeQnjX38OwJBPsQLQkbTJdJPbeDAVl+2PrrYzxRFytUh0RfoJ/JqSwLUvsHpol/7Ve2ahvqinyGRyu+koT5+kXYIp6GO1sa9h92PAwHxz4RTWQXR8t+eV6ZYWJRb9mL8Gk0AM5RiYiXUH0l53Dfxw4BiFu6CqQbuuyy7mcAL4EoPrXpW67rIOdCJjb9vK7jaCXlTcIy68Ex9o+39hgE/IiGjQ2d7YBR51xVp4/5RLsJW6YEcRwepLLy20mrQyh1pZMg== 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=dMFjFzdLLdPA59SJMKW7OUIjFs65o69E4r9JeLM+4tI=; b=pPxSYSzOQ3QhhCOWe03tzOdnOmCG9jQLPcqPitd52ouoRPkgnOkDFEhlZiZTQLE3oiC1Ps/Vpfi/foIDlmk3zJjQ3urzzQilcsx6oy6gYOYsLi3HqcooPuF6eNQc+0SWrcLanj9aPvHslG3WlOKZcmsqoUGNyMmQ28XPwW7uJbmNP3n4dv1KaqTnb7gTDZssDm0qjsITGFwphoYh6IEovBsbBFkvN9GZUcoUkSdSD8GrZzpF1NnsPkzYPLRj3WnMaSXTtsP7L/qx6bNapMHxfjUDM6rGIXAz4JaiSBZ4KOzEgch5W88IZlMz6Kq0Pc1QcwgYniofQ9DRtZSNe8a/ng== 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=dMFjFzdLLdPA59SJMKW7OUIjFs65o69E4r9JeLM+4tI=; b=HhoZuD0BeMYPwVtc1mEZ3C/AnV8MxykMpCm4VYOq1MKdZu3GmxKQpnSk9dAUAzVzELWiE6OAnAJIYjjux4uZ3I4fCklgu8Q5oNnq4rvsvTFkRDH0TJiPdcKkvTPkq2oc6hXL24aXqmKGNAf0xjGh7HNrW11CN/JRdUBiyg0q9fc= Received: from SJ2PR07CA0010.namprd07.prod.outlook.com (2603:10b6:a03:505::27) by DM3PR12MB9434.namprd12.prod.outlook.com (2603:10b6:0:4b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.12; Thu, 17 Sep 2026 09:05:38 +0000 Received: from SJ1PEPF00002312.namprd03.prod.outlook.com (2603:10b6:a03:505:cafe::93) by SJ2PR07CA0010.outlook.office365.com (2603:10b6:a03:505::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.428.11 via Frontend Transport; Thu, 17 Sep 2026 09:05:38 +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 SJ1PEPF00002312.mail.protection.outlook.com (10.167.242.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Thu, 17 Sep 2026 09:05:38 +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.49; Thu, 17 Sep 2026 04:05:30 -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.49 via Frontend Transport; Thu, 17 Sep 2026 04:05:27 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , "Vijendar Mukunda" Subject: [PATCH 3/9] soundwire: amd: allocate sdw_amd_ctx pdev array dynamically Date: Thu, 17 Sep 2026 14:32:51 +0530 Message-ID: <20260917090407.3828816-4-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20260917090407.3828816-1-Vijendar.Mukunda@amd.com> References: <20260917090407.3828816-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: SJ1PEPF00002312:EE_|DM3PR12MB9434:EE_ X-MS-Office365-Filtering-Correlation-Id: c6227c23-2065-44ec-7f1e-08df149ad7af X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|376014|82310400026|23010399003|1800799024|22082099003|10067099003|56012099006|11063799006|18002099003; X-Microsoft-Antispam-Message-Info: O0gPQQZGury5r58DvgEBsAQxZcpQMGX4AF6LDBbjF+sElnaSuIXztZhh092blD425+OsGycnG1I3nNWUgg9mQGiwRkyn9EGnpSCiILIg4B1pDfALml6lgtx3sdmd6GJBEePk0MBu5xz0Go7/FKr2YSxxKfNiO/Ihxs75Urmcnat455naypJFj0smqUkX3DtIEQbFrUAxAgcAVkyBfikxppotUAZ34Itye4bZ/NZxZV8cFWQExOS4h4IKu06014BIamOyr4aGH0DVIsB2uh+ZK4rD9ESMMRXpnaP17K6MH5iuTSppejqcGTtEeIK2O8wneu7x8Pd9JbK5uX314L8W2dA73CimYoWDY+mWNhSchN91NKpWO9m0eEoXU64YR0Vgjg+VMN9/Ih442TpR08h6BQ2Je8ZYm+qfoHiwQP7BGfDfzfX+YV4x4kMP43EY2uUXrz3TVW0mgl0WSjrBbkEvbLASBgu9gphpXzu9OKe5zaYr//6XDg7EWe45uahQdCV4k1Op8fzeyj4idVqYsAlZH1hQMa4MhsYv+KlwhZBsf3osQ73q9mDUSCwd+upBrS+SP/MEDe0b8QmN02zWBo3oFyLzgR1arUMCKU+yeyo7iVCXhnBGqxjGCmFNz6GvPKBCiv/Rfu4fD4v0FZIzF65YQ+wW4RLBPpNGY5mZOXgvnr2iSTAP3lGB+t3+NivYP+q6xTWaKs6dUFAjaI+44u08yg== 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)(36860700016)(376014)(82310400026)(23010399003)(1800799024)(22082099003)(10067099003)(56012099006)(11063799006)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: koeA7a0sNtCoNBix20hhzNkHS0kDnxW78BmR2syVZdCBp5p50txvm7UToxjX6wEH/WY4kHcq6al1I6jluP1HV9xdjTL5+noQO3QGeVRtboxCdOl5+57MoKQGaeMgevavWUDbIznbbg7PfySefMot2KzLoZEV6KXn0zeu1vjmJbh8Jqw4J0Ul45c1pv2RqnyAXwHeltVIyovzV5J7I+VCLHFrL50fu7y+R5ZNdnWMBBtb70rr8guGabSWhvKGeZgQeNy6FI1BINlhSRZerZvsteXxk/WwTUkF2speE3NxAdiBOHaJNUnBcAfVHPtaDMXj3fVAyN+ilALPokR9a5QECbPp0R+h8WlH4E6rZr+m4tx2ocCSMmPIg3QgZTFzcEl9OMj0a4bci0kfQczHKcov+2TxnDxwDZgSRdzP0/fxF8xz73GMgnpLZcu4XFZ0PcSi X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2026 09:05:38.5374 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c6227c23-2065-44ec-7f1e-08df149ad7af 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: SJ1PEPF00002312.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR12MB9434 Content-Type: text/plain; charset="utf-8" Replace the fixed-size pdev[AMD_ACP63_SDW_MAX_MANAGER_COUNT] member of struct sdw_amd_ctx with a dynamically allocated pointer array. The array is sized by max_manager_count via kcalloc() in sdw_amd_probe_controller() and freed on all error paths and in sdw_amd_cleanup(). Signed-off-by: Vijendar Mukunda --- drivers/soundwire/amd_init.c | 12 ++++++++++++ include/linux/soundwire/sdw_amd.h | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/soundwire/amd_init.c b/drivers/soundwire/amd_init.c index 15d117172bdb..94d766b3f8af 100644 --- a/drivers/soundwire/amd_init.c +++ b/drivers/soundwire/amd_init.c @@ -62,6 +62,7 @@ static int sdw_amd_cleanup(struct sdw_amd_ctx *ctx) continue; platform_device_unregister(ctx->pdev[i]); } + kfree(ctx->pdev); =20 return 0; } @@ -116,8 +117,16 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(st= ruct sdw_amd_res *res) =20 ctx->count =3D count; ctx->link_mask =3D res->link_mask; + + ctx->pdev =3D kcalloc(max_manager_count, sizeof(*ctx->pdev), GFP_KERNEL); + if (!ctx->pdev) { + kfree(ctx); + return NULL; + } + struct resource *sdw_res __free(kfree) =3D kzalloc_obj(*sdw_res); if (!sdw_res) { + kfree(ctx->pdev); kfree(ctx); return NULL; } @@ -127,6 +136,7 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(str= uct sdw_amd_res *res) =20 sdw_pdata =3D kcalloc(max_manager_count, sizeof(*sdw_pdata), GFP_KERNEL); if (!sdw_pdata) { + kfree(ctx->pdev); kfree(ctx); return NULL; } @@ -134,6 +144,7 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(str= uct sdw_amd_res *res) pdevinfo =3D kcalloc(max_manager_count, sizeof(*pdevinfo), GFP_KERNEL); if (!pdevinfo) { kfree(sdw_pdata); + kfree(ctx->pdev); kfree(ctx); return NULL; } @@ -171,6 +182,7 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(str= uct sdw_amd_res *res) =20 kfree(pdevinfo); kfree(sdw_pdata); + kfree(ctx->pdev); kfree(ctx); return NULL; } diff --git a/include/linux/soundwire/sdw_amd.h b/include/linux/soundwire/sd= w_amd.h index 40ba84c3b2cc..476de2c30389 100644 --- a/include/linux/soundwire/sdw_amd.h +++ b/include/linux/soundwire/sdw_amd.h @@ -139,7 +139,7 @@ struct sdw_amd_acpi_info { struct sdw_amd_ctx { int count; u32 link_mask; - struct platform_device *pdev[AMD_ACP63_SDW_MAX_MANAGER_COUNT]; + struct platform_device **pdev; struct sdw_peripherals *peripherals; }; =20 --=20 2.48.1 From nobody Fri Sep 25 03:17:13 2026 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012036.outbound.protection.outlook.com [52.101.53.36]) (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 6DE25436BF4; Thu, 17 Sep 2026 09:05:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.53.36 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789635953; cv=fail; b=A/mOB99poqyKdllyM0L5YANQTIrGe+0/imboVF80gtY002L4xdutNJOCNM1ipYHaSNUjZW+CeJkekRZlbgJ14MRc39U3y/OEVsRRwvR6PhQtTgPB82pwiKu3FWV72/5fVjiLBzPsOYRcfigHi2FBehnSY8deOCxj8dNrVeyaGrU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789635953; c=relaxed/simple; bh=Az1O6u+Pq/5R1/2j5wX5FIVY8Ixh5i/6S4cYzv4aZ18=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qQbQ+0J0I3JGldNVuAR2+XL3ChUA2lVY3SnpzhDZUiCq8nIXXgc3ggPdX/Ljx33axzNmxICIVatdCGxdi9LDfDIh6LKKTbw3uG4dtqFWVQf1QwAEh0eHN2FtKwI2Rrq+v1a53hhvmLoeFR4SQligf3m3WNZXj2ed1/3T5SVEyzE= 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=HZbhQXib; arc=fail smtp.client-ip=52.101.53.36 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="HZbhQXib" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HnGHKcIceTujQXVGpqxRHC3L6Djpg5KcoCIMzXPVVcrmbOdnb0vy/Mr3cgcHCoa8+rZAWQKwh2eFDPPF7W0gbIOSnD2A7JOYoFWW7bSoJ20DU5HI9f1RE6HjSHBu0Nrm9QWpkAkQ55/U5eWldupjUMrXViPePkuaBlfp8OWYgNpDKi6KS/Hz/jT5a1kKQR98WMW8ZDvrPfbpmYGZhZp1RDw8mL5Anpf8CGceTiCerE7iKZ0Qnij19uGslH6lVN5XDKQQN1FXu2CbXvsmy8z8CypPEaLqUsw4p43wt3q7o5FL6k2/aR19xOz820/qz1b2pa4CNvh2hhvIbn9Mmdt33w== 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=I5zZ3XcPDzunod4i3Q8KPeCdgcq7x28gnaHbhY8OQuM=; b=Uf/FFBCngbC7czzZz769deR/g3PS2OitBhzJaPgtsMTGFUSLJhg9biMslK55PQOssRx2e1u97TklnM/Wo8cUnKLtWsNvg8XbO4/kCofjJIo2MaDJU2iqsjnjGWRAR/z30O/fsq5GHhr+uT5lahdLpfPbQeO8Li+p6F6hb3gcGdSZuoIsZeb9GbysYdS+6W1qp5csFwefntexy1B732fSpVdW/DNs+LWoQvIFWjydcuFxB2Mt0hG1QJDeYlyz0sujv2F/oWhkIKD7bmzwa0f6j2qsq6CT5u29NUTQPmkrD5mSu3/c0yDard1PIY8OklomNsUctMB/I6DIt6rarpzLjw== 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=I5zZ3XcPDzunod4i3Q8KPeCdgcq7x28gnaHbhY8OQuM=; b=HZbhQXibdOxyLHxBLmbfT1wn4qyAnxvpexwl2p5r68cV1RSLq71uCed5deSQOOr6MoZMliL+sCN7g9dthb9ZjjvDH+JwNUarXuOisNM+wWjtzxnsJ7iNY4mFu+JGjFcrjWtvtvoPoqZ24ZFKBC7AvcQaM/Cy2xd5GxRr7vJHuwU= Received: from SJ2PR07CA0001.namprd07.prod.outlook.com (2603:10b6:a03:505::11) by SJ2PR12MB7918.namprd12.prod.outlook.com (2603:10b6:a03:4cc::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.11; Thu, 17 Sep 2026 09:05:41 +0000 Received: from SJ1PEPF00002312.namprd03.prod.outlook.com (2603:10b6:a03:505:cafe::5e) by SJ2PR07CA0001.outlook.office365.com (2603:10b6:a03:505::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.428.11 via Frontend Transport; Thu, 17 Sep 2026 09:05:41 +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 SJ1PEPF00002312.mail.protection.outlook.com (10.167.242.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Thu, 17 Sep 2026 09:05:41 +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.49; Thu, 17 Sep 2026 04:05:35 -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.49 via Frontend Transport; Thu, 17 Sep 2026 04:05:31 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , "Vijendar Mukunda" Subject: [PATCH 4/9] soundwire: amd: rename hardware backend functions to amd_acp63_*() prefix Date: Thu, 17 Sep 2026 14:32:52 +0530 Message-ID: <20260917090407.3828816-5-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20260917090407.3828816-1-Vijendar.Mukunda@amd.com> References: <20260917090407.3828816-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: SJ1PEPF00002312:EE_|SJ2PR12MB7918:EE_ X-MS-Office365-Filtering-Correlation-Id: c8d4036d-9a8e-48f5-8f53-08df149ad986 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700016|1800799024|82310400026|23010399003|10067099003|56012099006|11063799006|6133799003|18002099003|3023799007|22082099003; X-Microsoft-Antispam-Message-Info: VnXOw9x2pI+XPSE0Qv9161TJ5LKTmpfH1FuC5yQziRfZaw7N4rSk13bQbH4EcAlrIkY1mrg0HRkx7t2pfJWnvAFp6pVglwuwSNuUek80GEHrRGxJ6qiSGgh8+sUnbz6RNdtB4ReEb0n3eSv02h4Z83LRfzYAsW3yv8e3WIDh7rVKIrT8TyUcvKt49t3H0tw1FuePvJv8ingrAJCPFYmzmYxngBMM5lgjFIWU1yvYSKO3as2loPnvAFB25NH3lxZCL4JgGQgDeH6+/AAiocRwAYuWRSSdThk88sOlgDdrv4YV/bLAHfW8OKEBTVPnKeJO6buZjw9LX7fk8ecKykb8XTSQVS0CgHHOZBsLgqup5RQF+LKbx1heoh8X5WfUTDooUwCj17vJNXmpoM8gLsUVTwn99Wcg2V0pybcoYJ2uKGobgoMTwHa21d9PX3sve6n0H3Yn6ll5SwLdq6LfEbZMxFRv0v/LY899kc4hJRcPRRLdVClfQkdJ7VxEO2at4UJjLvENbiVrP4smCtyHbn0W8F/SgUKIfeG//cOUzR/c21Cuc9J3Z8WU2ewif2FKy75MHJu0bo/KOhG85GwRvr2r7L18MnJ6DWwUf7S7IdNCQA9DOKWmkqJ/568lckUqevp035FWG8uNxpsPilIcEHoNxzXedwPAY/qzH4qDn4hFr7OpIGo8YCKBat7JVTLNvfnNu3i5TQ7a9Mj/8AwA+gnOQw== 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)(1800799024)(82310400026)(23010399003)(10067099003)(56012099006)(11063799006)(6133799003)(18002099003)(3023799007)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lkQ/t9qPMSFVaZBar2abY9uiiM4oZpHp2jFtGUowwyK3fwzAo/we1ZuPpYN77v+4O9JvWe/Mll4cA0kpUMCO7NvU5lA0wivaBD9ILNrzhQDqLF6gOToRhdQH/wLp8Y8+5lpoeiA8DbtkOJQA+cIedH44qospeVI/5IqYA4jCkybyu44RctAjY+EYstBYgDHmUOUsLZqGkTH11xrfGdoiamWVuTDLcFGVMHRE20R9PtqayaBaDYYyaimXI6AlGXKYmeVQiaw6/rSwmDBVuJ8NyGY0/C0z555PcrsJjWJ+ZeEX8atqAM+h8DViNeW1W6HnIcHuFH48+80NJCKCvHY3WunyDoiUB8i0rPjmTGMo1Bbuf9+oSpmrTJs5ZvQEQ++ZSt66JMCUyT2sFvk/8HOaMTz1DGfTDp8/CTqN6ej0VjGy0xn5QimGHdteA8evlON6 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2026 09:05:41.6236 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c8d4036d-9a8e-48f5-8f53-08df149ad986 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: SJ1PEPF00002312.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB7918 Content-Type: text/plain; charset="utf-8" In preparation for the hw_ops dispatch framework introduced later in this series, rename the revision-specific hardware-access functions in amd_manager.c to the amd_acp63_*() prefix. These functions form the ACP6.3-base-family hardware backend shared by the ACP6.3, ACP7.0, ACP7.1 and ACP7.2 revisions and are dispatched per revision through the amd_sdw_hw_ops table (and the sdw_master_ops structure). The amd_acp63_ prefix denotes ACP6.3 as the base revision of this shared IP block, not ACP6.3-only support. Generic SoundWire protocol and bus helpers that are revision-independent -- for example amd_sdw_xfer_msg(), amd_prop_read() and amd_sdw_clock_stop() -- intentionally keep the amd_sdw_*() prefix, as they are not part of the per-revision dispatch path. Signed-off-by: Vijendar Mukunda --- drivers/soundwire/amd_manager.c | 166 +++++++++++++++++--------------- drivers/soundwire/amd_manager.h | 7 +- 2 files changed, 96 insertions(+), 77 deletions(-) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manage= r.c index 400fa05456a1..669044430a0b 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -27,7 +27,7 @@ =20 #define to_amd_sdw(b) container_of(b, struct amd_sdw_manager, bus) =20 -static int amd_sdw_clk_init_ctrl(struct amd_sdw_manager *amd_manager) +static int amd_acp63_sdw_clk_init_ctrl(struct amd_sdw_manager *amd_manager) { struct sdw_bus *bus =3D &amd_manager->bus; struct sdw_master_prop *prop =3D &bus->prop; @@ -57,7 +57,7 @@ static int amd_sdw_clk_init_ctrl(struct amd_sdw_manager *= amd_manager) return 0; } =20 -static int amd_init_sdw_manager(struct amd_sdw_manager *amd_manager) +static int amd_acp63_init_sdw_manager(struct amd_sdw_manager *amd_manager) { u32 val; int ret; @@ -89,7 +89,7 @@ static int amd_init_sdw_manager(struct amd_sdw_manager *a= md_manager) AMD_SDW_TIMEOUT); } =20 -static int amd_enable_sdw_manager(struct amd_sdw_manager *amd_manager) +static int amd_acp63_enable_sdw_manager(struct amd_sdw_manager *amd_manage= r) { u32 val; =20 @@ -98,7 +98,7 @@ static int amd_enable_sdw_manager(struct amd_sdw_manager = *amd_manager) AMD_SDW_TIMEOUT); } =20 -static int amd_disable_sdw_manager(struct amd_sdw_manager *amd_manager) +static int amd_acp63_disable_sdw_manager(struct amd_sdw_manager *amd_manag= er) { u32 val; =20 @@ -115,7 +115,7 @@ static int amd_disable_sdw_manager(struct amd_sdw_manag= er *amd_manager) AMD_SDW_TIMEOUT); } =20 -static void amd_enable_sdw_interrupts(struct amd_sdw_manager *amd_manager) +static void amd_acp63_enable_sdw_interrupts(struct amd_sdw_manager *amd_ma= nager) { u32 val; =20 @@ -131,7 +131,7 @@ static void amd_enable_sdw_interrupts(struct amd_sdw_ma= nager *amd_manager) writel(AMD_SDW_IRQ_ERROR_MASK, amd_manager->mmio + ACP_SW_ERROR_INTR_MASK= ); } =20 -static void amd_disable_sdw_interrupts(struct amd_sdw_manager *amd_manager) +static void amd_acp63_disable_sdw_interrupts(struct amd_sdw_manager *amd_m= anager) { u32 irq_mask; =20 @@ -146,7 +146,7 @@ static void amd_disable_sdw_interrupts(struct amd_sdw_m= anager *amd_manager) writel(0x00, amd_manager->mmio + ACP_SW_ERROR_INTR_MASK); } =20 -static void amd_sdw_set_frameshape(struct amd_sdw_manager *amd_manager) +static void amd_acp63_sdw_set_frameshape(struct amd_sdw_manager *amd_manag= er) { u32 frame_size; =20 @@ -154,7 +154,7 @@ static void amd_sdw_set_frameshape(struct amd_sdw_manag= er *amd_manager) writel(frame_size, amd_manager->mmio + ACP_SW_FRAMESIZE); } =20 -static void amd_sdw_wake_enable(struct amd_sdw_manager *amd_manager, bool = enable) +static void amd_acp63_sdw_wake_enable(struct amd_sdw_manager *amd_manager,= bool enable) { u32 wake_ctrl; =20 @@ -167,7 +167,8 @@ static void amd_sdw_wake_enable(struct amd_sdw_manager = *amd_manager, bool enable writel(wake_ctrl, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_MASK_8TO= 11); } =20 -static int amd_sdw_set_device_state(struct amd_sdw_manager *amd_manager, u= 32 target_device_state) +static int amd_acp63_sdw_set_device_state(struct amd_sdw_manager *amd_mana= ger, + u32 target_device_state) { u32 sdw_dev_state; =20 @@ -190,7 +191,7 @@ static int amd_sdw_set_device_state(struct amd_sdw_mana= ger *amd_manager, u32 tar return 0; } =20 -static int amd_sdw_host_wake_enable(struct amd_sdw_manager *amd_manager, b= ool enable) +static int amd_acp63_sdw_host_wake_enable(struct amd_sdw_manager *amd_mana= ger, bool enable) { u32 intr_cntl1; u32 sdw_host_wake_irq_mask; @@ -244,8 +245,8 @@ static void amd_sdw_ctl_word_prep(u32 *lower_word, u32 = *upper_word, struct sdw_m *lower_word =3D lower_data; } =20 -static int amd_sdw_send_cmd_get_resp(struct amd_sdw_manager *amd_manager, = u32 lower_data, - u32 upper_data, u64 *response) +static int amd_acp63_sdw_send_cmd_get_resp(struct amd_sdw_manager *amd_man= ager, u32 lower_data, + u32 upper_data, u64 *response) { u32 lower_resp, upper_resp; u32 sts; @@ -301,7 +302,8 @@ amd_program_scp_addr(struct amd_sdw_manager *amd_manage= r, struct sdw_msg *msg) scp_msg.buf =3D &msg->addr_page1; scp_msg.flags =3D SDW_MSG_FLAG_WRITE; amd_sdw_ctl_word_prep(&lower_data, &upper_data, &scp_msg, 0); - if (amd_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &respo= nse_buf[0])) { + if (amd_acp63_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; @@ -309,7 +311,8 @@ amd_program_scp_addr(struct amd_sdw_manager *amd_manage= r, struct sdw_msg *msg) scp_msg.addr =3D SDW_SCP_ADDRPAGE2; scp_msg.buf =3D &msg->addr_page2; amd_sdw_ctl_word_prep(&lower_data, &upper_data, &scp_msg, 0); - if (amd_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &respo= nse_buf[1])) { + if (amd_acp63_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; @@ -374,6 +377,7 @@ static enum sdw_command_response amd_sdw_fill_msg_resp(= struct amd_sdw_manager *a return SDW_CMD_OK; } =20 +/* AMD SoundWire bus helper shared across all ACP revisions. */ static unsigned int _amd_sdw_xfer_msg(struct amd_sdw_manager *amd_manager,= struct sdw_msg *msg, int cmd_offset) { @@ -381,7 +385,7 @@ static unsigned int _amd_sdw_xfer_msg(struct amd_sdw_ma= nager *amd_manager, struc u32 upper_data =3D 0, lower_data =3D 0; =20 amd_sdw_ctl_word_prep(&lower_data, &upper_data, msg, cmd_offset); - if (amd_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &respo= nse)) { + if (amd_acp63_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; @@ -389,6 +393,7 @@ static unsigned int _amd_sdw_xfer_msg(struct amd_sdw_ma= nager *amd_manager, struc return amd_sdw_fill_msg_resp(amd_manager, msg, response, cmd_offset); } =20 +/* AMD SoundWire bus helper shared across all ACP revisions. */ static enum sdw_command_response amd_sdw_xfer_msg(struct sdw_bus *bus, str= uct sdw_msg *msg) { struct amd_sdw_manager *amd_manager =3D to_amd_sdw(bus); @@ -405,6 +410,7 @@ static enum sdw_command_response amd_sdw_xfer_msg(struc= t sdw_bus *bus, struct sd return SDW_CMD_OK; } =20 +/* AMD SoundWire bus helper shared across all ACP revisions. */ static void amd_sdw_fill_slave_status(struct amd_sdw_manager *amd_manager,= u16 index, u32 status) { switch (status) { @@ -419,6 +425,7 @@ static void amd_sdw_fill_slave_status(struct amd_sdw_ma= nager *amd_manager, u16 i } } =20 +/* AMD SoundWire bus helper shared across all ACP revisions. */ static void amd_sdw_process_ping_status(u64 response, struct amd_sdw_manag= er *amd_manager) { u64 slave_stat; @@ -436,12 +443,12 @@ static void amd_sdw_process_ping_status(u64 response,= struct amd_sdw_manager *am } } =20 -static void amd_sdw_read_and_process_ping_status(struct amd_sdw_manager *a= md_manager) +static void amd_acp63_sdw_read_and_process_ping_status(struct amd_sdw_mana= ger *amd_manager) { u64 response; =20 mutex_lock(&amd_manager->bus.msg_lock); - if (amd_sdw_send_cmd_get_resp(amd_manager, 0, 0, &response)) { + if (amd_acp63_sdw_send_cmd_get_resp(amd_manager, 0, 0, &response)) { mutex_unlock(&amd_manager->bus.msg_lock); dev_err_ratelimited(amd_manager->dev, "SDW%x ping status timeout\n", amd_manager->instance); @@ -454,7 +461,7 @@ static void amd_sdw_read_and_process_ping_status(struct= amd_sdw_manager *amd_man mutex_unlock(&amd_manager->bus.msg_lock); } =20 -static u32 amd_sdw_read_ping_status(struct sdw_bus *bus) +static u32 amd_acp63_sdw_read_ping_status(struct sdw_bus *bus) { struct amd_sdw_manager *amd_manager =3D to_amd_sdw(bus); u64 response; @@ -463,7 +470,7 @@ static u32 amd_sdw_read_ping_status(struct sdw_bus *bus) /* Called by sdw_show_ping_status() which holds msg_lock. */ lockdep_assert_held(&bus->msg_lock); =20 - if (amd_sdw_send_cmd_get_resp(amd_manager, 0, 0, &response)) { + if (amd_acp63_sdw_send_cmd_get_resp(amd_manager, 0, 0, &response)) { dev_err_ratelimited(amd_manager->dev, "SDW%x ping status timeout\n", amd_manager->instance); return amd_manager->ping_slave_stat =3D=3D U32_MAX ? 0 : amd_manager->pi= ng_slave_stat; @@ -476,7 +483,7 @@ static u32 amd_sdw_read_ping_status(struct sdw_bus *bus) return slave_stat; } =20 -static int amd_sdw_compute_params(struct sdw_bus *bus, struct sdw_stream_r= untime *stream) +static int amd_acp63_sdw_compute_params(struct sdw_bus *bus, struct sdw_st= ream_runtime *stream) { struct amd_sdw_manager *amd_manager =3D to_amd_sdw(bus); struct sdw_transport_data t_data =3D {0}; @@ -562,8 +569,8 @@ static int amd_sdw_compute_params(struct sdw_bus *bus, = struct sdw_stream_runtime return 0; } =20 -static int amd_sdw_port_params(struct sdw_bus *bus, struct sdw_port_params= *p_params, - unsigned int bank) +static int amd_acp63_sdw_port_params(struct sdw_bus *bus, struct sdw_port_= params *p_params, + unsigned int bank) { struct amd_sdw_manager *amd_manager =3D to_amd_sdw(bus); u32 frame_fmt_reg, dpn_frame_fmt; @@ -599,9 +606,9 @@ static int amd_sdw_port_params(struct sdw_bus *bus, str= uct sdw_port_params *p_pa return 0; } =20 -static int amd_sdw_transport_params(struct sdw_bus *bus, - struct sdw_transport_params *params, - enum sdw_reg_bank bank) +static int amd_acp63_sdw_transport_params(struct sdw_bus *bus, + struct sdw_transport_params *params, + enum sdw_reg_bank bank) { struct amd_sdw_manager *amd_manager =3D to_amd_sdw(bus); u32 dpn_frame_fmt; @@ -676,9 +683,9 @@ static int amd_sdw_transport_params(struct sdw_bus *bus, return 0; } =20 -static int amd_sdw_port_enable(struct sdw_bus *bus, - struct sdw_enable_ch *enable_ch, - unsigned int bank) +static int amd_acp63_sdw_port_enable(struct sdw_bus *bus, + struct sdw_enable_ch *enable_ch, + unsigned int bank) { struct amd_sdw_manager *amd_manager =3D to_amd_sdw(bus); u32 dpn_ch_enable; @@ -755,6 +762,7 @@ static int sdw_master_read_amd_prop(struct sdw_bus *bus) return 0; } =20 +/* AMD SoundWire bus helper shared across all ACP revisions. */ static int amd_prop_read(struct sdw_bus *bus) { sdw_master_read_prop(bus); @@ -762,16 +770,16 @@ static int amd_prop_read(struct sdw_bus *bus) return 0; } =20 -static const struct sdw_master_port_ops amd_sdw_port_ops =3D { - .dpn_set_port_params =3D amd_sdw_port_params, - .dpn_set_port_transport_params =3D amd_sdw_transport_params, - .dpn_port_enable_ch =3D amd_sdw_port_enable, +static const struct sdw_master_port_ops amd_acp63_sdw_port_ops =3D { + .dpn_set_port_params =3D amd_acp63_sdw_port_params, + .dpn_set_port_transport_params =3D amd_acp63_sdw_transport_params, + .dpn_port_enable_ch =3D amd_acp63_sdw_port_enable, }; =20 -static const struct sdw_master_ops amd_sdw_ops =3D { +static const struct sdw_master_ops amd_acp63_sdw_ops =3D { .read_prop =3D amd_prop_read, .xfer_msg =3D amd_sdw_xfer_msg, - .read_ping_status =3D amd_sdw_read_ping_status, + .read_ping_status =3D amd_acp63_sdw_read_ping_status, }; =20 static int amd_sdw_hw_params(struct snd_pcm_substream *substream, @@ -941,7 +949,7 @@ static int amd_sdw_register_dais(struct amd_sdw_manager= *amd_manager) dais, num_dais); } =20 -static void amd_sdw_update_slave_status_work(struct work_struct *work) +static void amd_acp63_sdw_update_slave_status_work(struct work_struct *wor= k) { struct amd_sdw_manager *amd_manager =3D container_of(work, struct amd_sdw_manager, amd_sdw_work); @@ -967,7 +975,7 @@ static void amd_sdw_update_slave_status_work(struct wor= k_struct *work) ACP_SW_STATE_CHANGE_STATUS_MASK_0TO7); writel(AMD_SDW_IRQ_MASK_8TO11, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_MASK_8TO11); - amd_sdw_read_and_process_ping_status(amd_manager); + amd_acp63_sdw_read_and_process_ping_status(amd_manager); goto update_status; } else { dev_err_ratelimited(amd_manager->dev, @@ -1001,7 +1009,7 @@ static void amd_sdw_update_slave_status(u32 status_ch= ange_0to7, u32 status_chang } } =20 -static void amd_sdw_process_wake_event(struct amd_sdw_manager *amd_manager) +static void amd_acp63_sdw_process_wake_event(struct amd_sdw_manager *amd_m= anager) { dev_dbg(amd_manager->dev, "SoundWire Wake event reported\n"); pm_request_resume(amd_manager->dev); @@ -1009,7 +1017,7 @@ static void amd_sdw_process_wake_event(struct amd_sdw= _manager *amd_manager) writel(0x00, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_8TO11); } =20 -static void amd_sdw_irq_thread(struct work_struct *work) +static void amd_acp63_sdw_irq_thread(struct work_struct *work) { struct amd_sdw_manager *amd_manager =3D container_of(work, struct amd_sdw_manager, amd_sdw_irq_thread); @@ -1024,10 +1032,10 @@ static void amd_sdw_irq_thread(struct work_struct *= work) dev_dbg(amd_manager->dev, "[SDW%d] SDW INT: 0to7=3D0x%x, 8to11=3D0x%x\n", amd_manager->instance, status_change_0to7, status_change_8to11); if (status_change_8to11 & AMD_SDW_WAKE_STAT_MASK) - return amd_sdw_process_wake_event(amd_manager); + return amd_acp63_sdw_process_wake_event(amd_manager); =20 if (status_change_8to11 & AMD_SDW_PREQ_INTR_STAT) { - amd_sdw_read_and_process_ping_status(amd_manager); + amd_acp63_sdw_read_and_process_ping_status(amd_manager); } else { /* Check for the updated status on peripheral device */ amd_sdw_update_slave_status(status_change_0to7, status_change_8to11, amd= _manager); @@ -1045,17 +1053,17 @@ int amd_sdw_manager_start(struct amd_sdw_manager *a= md_manager) =20 prop =3D &amd_manager->bus.prop; if (!prop->hw_disabled) { - ret =3D amd_sdw_clk_init_ctrl(amd_manager); + ret =3D amd_acp63_sdw_clk_init_ctrl(amd_manager); if (ret) return ret; - ret =3D amd_init_sdw_manager(amd_manager); + ret =3D amd_acp63_init_sdw_manager(amd_manager); if (ret) return ret; - amd_enable_sdw_interrupts(amd_manager); - ret =3D amd_enable_sdw_manager(amd_manager); + amd_acp63_enable_sdw_interrupts(amd_manager); + ret =3D amd_acp63_enable_sdw_manager(amd_manager); if (ret) return ret; - amd_sdw_set_frameshape(amd_manager); + amd_acp63_sdw_set_frameshape(amd_manager); } /* Enable runtime PM */ pm_runtime_set_autosuspend_delay(amd_manager->dev, AMD_SDW_MASTER_SUSPEND= _DELAY_MS); @@ -1091,15 +1099,15 @@ static int amd_sdw_manager_probe(struct platform_de= vice *pdev) amd_manager->ping_slave_stat =3D U32_MAX; amd_manager->instance =3D pdata->instance; amd_manager->mmio =3D amd_manager->acp_mmio + - (amd_manager->instance * SDW_MANAGER_REG_OFFSET); + (amd_manager->instance * ACP63_SDW_MANAGER_REG_OFFSET); amd_manager->acp_sdw_lock =3D pdata->acp_sdw_lock; amd_manager->acp_rev =3D pdata->acp_rev; amd_manager->cols_index =3D sdw_find_col_index(AMD_SDW_DEFAULT_COLUMNS); amd_manager->rows_index =3D sdw_find_row_index(AMD_SDW_DEFAULT_ROWS); amd_manager->dev =3D dev; - amd_manager->bus.ops =3D &amd_sdw_ops; - amd_manager->bus.port_ops =3D &amd_sdw_port_ops; - amd_manager->bus.compute_params =3D &amd_sdw_compute_params; + amd_manager->bus.ops =3D &amd_acp63_sdw_ops; + amd_manager->bus.port_ops =3D &amd_acp63_sdw_port_ops; + amd_manager->bus.compute_params =3D &amd_acp63_sdw_compute_params; amd_manager->bus.clk_stop_timeout =3D 200; amd_manager->bus.link_id =3D amd_manager->instance; =20 @@ -1156,8 +1164,8 @@ static int amd_sdw_manager_probe(struct platform_devi= ce *pdev) return ret; } dev_set_drvdata(dev, amd_manager); - INIT_WORK(&amd_manager->amd_sdw_irq_thread, amd_sdw_irq_thread); - INIT_WORK(&amd_manager->amd_sdw_work, amd_sdw_update_slave_status_work); + INIT_WORK(&amd_manager->amd_sdw_irq_thread, amd_acp63_sdw_irq_thread); + INIT_WORK(&amd_manager->amd_sdw_work, amd_acp63_sdw_update_slave_status_w= ork); return 0; } =20 @@ -1168,15 +1176,21 @@ static void amd_sdw_manager_remove(struct platform_= device *pdev) =20 if (pm_runtime_enabled(&pdev->dev)) pm_runtime_disable(&pdev->dev); - amd_disable_sdw_interrupts(amd_manager); + amd_acp63_disable_sdw_interrupts(amd_manager); cancel_work_sync(&amd_manager->amd_sdw_irq_thread); cancel_work_sync(&amd_manager->amd_sdw_work); sdw_bus_master_delete(&amd_manager->bus); - ret =3D amd_disable_sdw_manager(amd_manager); + ret =3D amd_acp63_disable_sdw_manager(amd_manager); if (ret) dev_err(&pdev->dev, "Failed to disable device (%pe)\n", ERR_PTR(ret)); } =20 +/* + * AMD SoundWire clock-stop sequence shared across all ACP revisions. + * Differences between revisions in this path are minimal; a switch/case + * on acp_rev is sufficient to accommodate any variant-specific additions + * needed for future platforms. + */ static int amd_sdw_clock_stop(struct amd_sdw_manager *amd_manager) { u32 val; @@ -1208,7 +1222,7 @@ static int amd_sdw_clock_stop(struct amd_sdw_manager = *amd_manager) return 0; } =20 -static int amd_sdw_clock_stop_exit(struct amd_sdw_manager *amd_manager) +static int amd_acp63_sdw_clock_stop_exit(struct amd_sdw_manager *amd_manag= er) { int ret; u32 val; @@ -1300,7 +1314,7 @@ static int amd_sdw_host_wake_enable_by_rev(struct amd= _sdw_manager *amd_manager, case ACP70_PCI_REV_ID: case ACP71_PCI_REV_ID: case ACP72_PCI_REV_ID: - return amd_sdw_host_wake_enable(amd_manager, enable); + return amd_acp63_sdw_host_wake_enable(amd_manager, enable); default: dev_err(amd_manager->dev, "unexpected acp_rev 0x%x\n", amd_manager->acp_= rev); return -EINVAL; @@ -1321,22 +1335,22 @@ static int __maybe_unused amd_suspend(struct device= *dev) } =20 if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) { - amd_disable_sdw_interrupts(amd_manager); + amd_acp63_disable_sdw_interrupts(amd_manager); cancel_work_sync(&amd_manager->amd_sdw_irq_thread); cancel_work_sync(&amd_manager->amd_sdw_work); - amd_sdw_wake_enable(amd_manager, false); + amd_acp63_sdw_wake_enable(amd_manager, false); ret =3D amd_sdw_host_wake_enable_by_rev(amd_manager, false); if (ret) return ret; ret =3D amd_sdw_clock_stop(amd_manager); if (ret) return ret; - amd_enable_sdw_interrupts(amd_manager); + amd_acp63_enable_sdw_interrupts(amd_manager); } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) { - amd_disable_sdw_interrupts(amd_manager); + amd_acp63_disable_sdw_interrupts(amd_manager); cancel_work_sync(&amd_manager->amd_sdw_irq_thread); cancel_work_sync(&amd_manager->amd_sdw_work); - amd_sdw_wake_enable(amd_manager, false); + amd_acp63_sdw_wake_enable(amd_manager, false); ret =3D amd_sdw_host_wake_enable_by_rev(amd_manager, false); if (ret) return ret; @@ -1347,7 +1361,7 @@ static int __maybe_unused amd_suspend(struct device *= dev) ret =3D amd_sdw_clock_stop(amd_manager); if (ret) return ret; - ret =3D amd_disable_sdw_manager(amd_manager); + ret =3D amd_acp63_disable_sdw_manager(amd_manager); if (ret) return ret; } @@ -1357,7 +1371,7 @@ static int __maybe_unused amd_suspend(struct device *= dev) case ACP70_PCI_REV_ID: case ACP71_PCI_REV_ID: case ACP72_PCI_REV_ID: - ret =3D amd_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D3); + ret =3D amd_acp63_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE= _D3); if (ret) return ret; break; @@ -1381,29 +1395,29 @@ static int __maybe_unused amd_suspend_runtime(struc= t device *dev) return 0; } if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) { - amd_disable_sdw_interrupts(amd_manager); + amd_acp63_disable_sdw_interrupts(amd_manager); cancel_work_sync(&amd_manager->amd_sdw_irq_thread); cancel_work_sync(&amd_manager->amd_sdw_work); - amd_sdw_wake_enable(amd_manager, true); + amd_acp63_sdw_wake_enable(amd_manager, true); ret =3D amd_sdw_host_wake_enable_by_rev(amd_manager, true); if (ret) return ret; ret =3D amd_sdw_clock_stop(amd_manager); if (ret) return ret; - amd_enable_sdw_interrupts(amd_manager); + amd_acp63_enable_sdw_interrupts(amd_manager); } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) { - amd_disable_sdw_interrupts(amd_manager); + amd_acp63_disable_sdw_interrupts(amd_manager); cancel_work_sync(&amd_manager->amd_sdw_irq_thread); cancel_work_sync(&amd_manager->amd_sdw_work); - amd_sdw_wake_enable(amd_manager, true); + amd_acp63_sdw_wake_enable(amd_manager, true); ret =3D amd_sdw_host_wake_enable_by_rev(amd_manager, true); if (ret) return ret; ret =3D amd_sdw_clock_stop(amd_manager); if (ret) return ret; - ret =3D amd_disable_sdw_manager(amd_manager); + ret =3D amd_acp63_disable_sdw_manager(amd_manager); if (ret) return ret; } @@ -1413,7 +1427,7 @@ static int __maybe_unused amd_suspend_runtime(struct = device *dev) case ACP70_PCI_REV_ID: case ACP71_PCI_REV_ID: case ACP72_PCI_REV_ID: - ret =3D amd_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D3); + ret =3D amd_acp63_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE= _D3); if (ret) return ret; if (amd_manager->wake_en_mask) { @@ -1446,7 +1460,7 @@ static int __maybe_unused amd_resume_runtime(struct d= evice *dev) } =20 if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) { - ret =3D amd_sdw_clock_stop_exit(amd_manager); + ret =3D amd_acp63_sdw_clock_stop_exit(amd_manager); if (ret) return ret; ret =3D amd_sdw_host_wake_enable_by_rev(amd_manager, false); @@ -1481,17 +1495,17 @@ static int __maybe_unused amd_resume_runtime(struct= device *dev) } } sdw_clear_slave_status(bus, SDW_UNATTACH_REQUEST_MASTER_RESET); - ret =3D amd_sdw_clk_init_ctrl(amd_manager); + ret =3D amd_acp63_sdw_clk_init_ctrl(amd_manager); if (ret) return ret; - ret =3D amd_init_sdw_manager(amd_manager); + ret =3D amd_acp63_init_sdw_manager(amd_manager); if (ret) return ret; - amd_enable_sdw_interrupts(amd_manager); - ret =3D amd_enable_sdw_manager(amd_manager); + amd_acp63_enable_sdw_interrupts(amd_manager); + ret =3D amd_acp63_enable_sdw_manager(amd_manager); if (ret) return ret; - amd_sdw_set_frameshape(amd_manager); + amd_acp63_sdw_set_frameshape(amd_manager); } switch (amd_manager->acp_rev) { case ACP63_PCI_REV_ID: @@ -1499,7 +1513,7 @@ static int __maybe_unused amd_resume_runtime(struct d= evice *dev) case ACP70_PCI_REV_ID: case ACP71_PCI_REV_ID: case ACP72_PCI_REV_ID: - ret =3D amd_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D0); + ret =3D amd_acp63_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE= _D0); if (ret) return ret; break; diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manage= r.h index 76ecaceb3ee5..adde192f61fe 100644 --- a/drivers/soundwire/amd_manager.h +++ b/drivers/soundwire/amd_manager.h @@ -8,7 +8,12 @@ =20 #include =20 -#define SDW_MANAGER_REG_OFFSET 0xc00 +/* + * Register offset between successive SoundWire manager instances. + * This value applies to ACP6.3, ACP7.0, ACP7.1, and ACP7.2. A new + * revision with a different offset must define its own constant. + */ +#define ACP63_SDW_MANAGER_REG_OFFSET 0xc00 #define AMD_SDW_DEFAULT_ROWS 50 #define AMD_SDW_DEFAULT_COLUMNS 10 #define ACP_PAD_PULLDOWN_CTRL 0x0001448 --=20 2.48.1 From nobody Fri Sep 25 03:17:13 2026 Received: from DM5PR21CU001.outbound.protection.outlook.com (mail-centralusazon11011019.outbound.protection.outlook.com [52.101.62.19]) (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 C38E04A384B; Thu, 17 Sep 2026 09:06:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.62.19 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789635967; cv=fail; b=k2bMDOmrtyfXJI36SAFeyNiGzZBCF83jyXUS3lofC845eg/wmIz/8+1CK7MRPO9+ObSJiKg9K1unsECuXsR/Dly2+E51fSRJpj3r/2OLHEWRxz33mmXbVbSabQMVvOhk6ZGwKmTbbEmPXWTsVpDNeDOuoHspBpfSHkZdBj4oLYI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789635967; c=relaxed/simple; bh=UrJLV5j22ucMTTkqxzRN3/ifOVkUnncYOyVaEaXU5Oo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=SV+Q8f2rWGUNt3Ex7vK/O+jBv8iM/aIsag+zF1v5pJJlEPf5mbkXybjbmtxWaBth3zp2InhZkx70vSJimjY6CMFqtfMjW9uK8ZeZ+SisgHJcLmJ046VJTQMCyBZVURSzTCw9PeoB+FAXPQaWKwP5nS5RG6Q7KvRCUnLGyAO0hFA= 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=Iq+ElTfj; arc=fail smtp.client-ip=52.101.62.19 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="Iq+ElTfj" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=muAWhO9zkiKX+YzmT5Urm5ZtnP1dWLkBFmFs83mBySvxeGa1GLhq/6p/6RmTZb7K5O6OjjsqeOrBE+AnFcVWApG0EU+T7dTP5513CGufxsAiGWbiLI+oBcFCTIdB2giSfX1w9IZVAAILX0ArGVNIweZ98xzKzGgSMESF7nmv47Y81y+iSaQyAqbnSPI7kW6NyPxqw7nbc13YSX6i81SsChdHYKcBweJAXjT/CE8MBIU+sho/q5Yz3Cfo6gH90RGnexVbB1xKfuNlNdseCe+TRRppWOnHQMAg43h9CPbhzYMlazKGvnYbMgwRp5tWpzSLxUBG9FI6aWKhp8wxYAqDZg== 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=aa1yFdGIVC5IukFuOHlA2VCb3GjKpZFAkPuHbsg5pko=; b=HyfPi0WZKDTzEOG8A5vuFo/BFaUDhYePXOFdJhJ23k3S25WSYwnZEl2sPpf3YVQLXDjAzEQv9coFoNMSAH+GQSSZfke0DNWX5QTa5XC+kMSixztjxWMTCxqltIdOsfx5vJOkHddQ9CsVL1GqBu8IMr5/pRlcSaJ9JLvC8AaAdFkADy8Vup2RMUjbrr2GUVFviZmSy49U8Bvfx7tdLAoAQvwi0a3C2dzeLsog1E7n0St5NasJCAOCO4Q/vE0j1AvyUeeuG/WuTD5dOv29wDrtrZ8xchmWz67IqMqHVUTWc3Gm+kmw6Pzsnjilkgb/8ye2vDXSyaok35ZILKHwPyDhDQ== 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=aa1yFdGIVC5IukFuOHlA2VCb3GjKpZFAkPuHbsg5pko=; b=Iq+ElTfjsKMVO0pUFMmWLtjWJy8WDAPRoUFQsoeYhniHFwJgH5YdPEQJYajeyGUpRPehoXyTSQTWawZ59WHkQ+1gMbgoHBNybG2/UITSf9EPs/nDaoY0OH75PC913a5sH58YbG7b8T1ogn0tTI80+eKnTN0N8chsu1ra35IfRow= Received: from SA1P222CA0133.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c2::18) by IA1PR12MB6043.namprd12.prod.outlook.com (2603:10b6:208:3d5::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.9; Thu, 17 Sep 2026 09:05:45 +0000 Received: from SJ1PEPF00002311.namprd03.prod.outlook.com (2603:10b6:806:3c2:cafe::24) by SA1P222CA0133.outlook.office365.com (2603:10b6:806:3c2::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.428.11 via Frontend Transport; Thu, 17 Sep 2026 09:05: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=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.451.8 via Frontend Transport; Thu, 17 Sep 2026 09:05:45 +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.49; Thu, 17 Sep 2026 04:05: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.49 via Frontend Transport; Thu, 17 Sep 2026 04:05:35 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , "Vijendar Mukunda" Subject: [PATCH 5/9] soundwire: amd: remove unused AMD_SDW_MAX_FREQ_NUM define Date: Thu, 17 Sep 2026 14:32:53 +0530 Message-ID: <20260917090407.3828816-6-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20260917090407.3828816-1-Vijendar.Mukunda@amd.com> References: <20260917090407.3828816-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_|IA1PR12MB6043:EE_ X-MS-Office365-Filtering-Correlation-Id: 5587ee74-97b1-4055-4c2f-08df149adb96 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|36860700016|23010399003|1800799024|10067099003|22082099003|56012099006|11063799006|18002099003; X-Microsoft-Antispam-Message-Info: 4sYwems6GoWq9/ozaBKBBmMOTxCF5v1ufT/rXiPlDGT41dWDmWgVKEUDS9b1SPJoNZT4UOZM5kqRyCoN0u7PdWSqYRelvDfrLsZGFi5/SaQJkr2ItZfdGU6vNI5Q7cX+AprMGTTicg+qRLLpU01+QFeRaZPFaVhF6XvBY1kppOfNLS/TmTk8JLCY9sQSDu0RCg1NQaCFMM2cu3OG7jVwW+PnCBXyBbQIiyaTsO/4zDxlNPHbprZRa7uxA3VkzTZMysqjl2jp6OuflDgXImrwpi5pTU1XbbygH5QKdYzWpxdCtGFblhgKQSYJwRBZ5ZwWCZL/3IWkrx1gI0vkOfShXpjvkSdqp3/IDK/lmzP1b9G7qL+h3wFTmqUol5m+x8YnBJOtHCAraK1RqHU/hWfYGPImiVXjHvDwVAyEVZhAiklbCAZp4rSfJKMO/yAMMd87WMEfOzja5NjVBvjZxo6CQMF2vGGnKeGRwqQ2qfQg4i7pd+ij2DffYJPEiwy2itoYqN189dBYVcZOD/gEcbxlWpp3f5dN8/sz9vFJb5VsUA1tH6zVcPUoU87JyRCAIB1J0S9lqiW4bdAwzQhO/3U4W/ZLZN/R6XXF31YPbXL9/z0wExl7YYMZnpYGsG9MvKbg/rI8wW4H+Dcisb65qdskTJ1Pn+QSeV0KHy4GoP8tZUV/MzhnfQckr2Zo+R/NkbYNl5MQ3m+Eedj14sZCclAwKQ== 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)(82310400026)(376014)(36860700016)(23010399003)(1800799024)(10067099003)(22082099003)(56012099006)(11063799006)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5Vn4DjLgCGEo7865oMScwzb+1klP5V0BVPVIOl+r+VSoVevj9cDVOhsSVeRpN5stj6fTqrSU3Abo+EWawIQE1ccwdu3KQSQBRZI/fTzLV0f/FKOo7EvbuBVzxVZe85v1orhEtdDXUoeJ0up7jDuQnN9Ln3rmcsO16Bj2soMTnrPMoI3Ku0SEQso/tkDMG29N6Lzz1d1vMhTcOLwCxcs4fgFBFmJQCL04XrOZS7jRc4TNcmeOhQ1ctNbAECqXhmWVTml/N/0Lv7YWZPD95iZu0UpjTMstOesKR7H4ksoDSMv7vOY6QhMyRaEGaNrFyYLe8OJ0ftblg/8mqtD0b9LNA4oPEHm8Ccf0aSfv21FJwhOUeG3W5oGHy2YYddlaAVwR0W99rVdVr1aoRcNg68OQ4IBEr4ON1sm4qYI+mY3glNmyUAWE0cDzatYr6FnMzY+B X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2026 09:05:45.0466 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5587ee74-97b1-4055-4c2f-08df149adb96 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: IA1PR12MB6043 Content-Type: text/plain; charset="utf-8" The AMD_SDW_MAX_FREQ_NUM macro has no users anywhere in the driver. Remove it as a straightforward cleanup with no functional change. Signed-off-by: Vijendar Mukunda --- drivers/soundwire/amd_manager.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manage= r.h index adde192f61fe..63fecff62079 100644 --- a/drivers/soundwire/amd_manager.h +++ b/drivers/soundwire/amd_manager.h @@ -159,7 +159,6 @@ #define AMD_SDW_IRQ_MASK_0TO7 0x77777777 #define AMD_SDW_IRQ_MASK_8TO11 0x000c7777 #define AMD_SDW_IRQ_ERROR_MASK 0xff -#define AMD_SDW_MAX_FREQ_NUM 1 #define AMD_ACP63_SDW0_MAX_TX_PORTS 3 #define AMD_ACP63_SDW0_MAX_RX_PORTS 3 #define AMD_ACP63_SDW1_MAX_TX_PORTS 1 --=20 2.48.1 From nobody Fri Sep 25 03:17:14 2026 Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azon11010008.outbound.protection.outlook.com [52.101.56.8]) (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 DEF5540EB9C; Thu, 17 Sep 2026 09:05:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.56.8 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789635961; cv=fail; b=kWr+Lf0Ag9jQFSEbqFzs1xX3yxcA+uD1F4bg3wV2RMxgQ+Iv0ftjQzLrlJlFkzZUWJqkTuiBC+w9d3xVnOSl3ilibSpuDM0hxST4IeoM0KnPNfKzGGIeviTkplN6GNxuAtodPOB6JQTVfXacju/YD05GtMdumUrwfKfsZLrv1Vo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789635961; c=relaxed/simple; bh=RZ74wEs6mPz7eNZRir7t5JGWXKTFTB3kqvlYRAuPuw0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=p7g9SFngupMA3oTiWODNGYSrzc1wepP8zixCYY/o8m/oO0rnjSI7RBsm/pc0IWEUfQ2S2Ta81OqoYBvMz7qJf3lgQ5Qhu6ApsTYq8Nh33oZSACDKae4NGCWvjaAm6UYGl9bVHBx2ZjTXxcW8qwKS2+qc9o8vtpazdljqTEOTuBg= 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=w+Ss7msK; arc=fail smtp.client-ip=52.101.56.8 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="w+Ss7msK" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ocbcmxEwy9T6qOBj4oJbVCEID6KG9xw+do96mxhbfh2XL7R6JVopPyFHM47WLtnKhGgaXJDAQ5dQo8XhC2mNKtmZwejjbOUgs6T931mxwZVQrqG5KUh/pnoN4IdDg9n+ZUMjn+t8H8hCnWTNu/5YTATcEHaA/qSJwxScGe3205oi0t5kSK6rLQxhe20jFKm+RZZzp7dBU+aSzbKLCOe3kiAMyChxcmEPnywD4qs/uJH0gTQmdTG01gyE8djW1prH/ZsXV6JC4pSYQG/KCk5jQj2oUMaKCHyzRX3aLvm3RuHf+6U0KFKZ8bs7KR5NNnvQdgdrq4wTDWf/+o1gN7LQnA== 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=4gxDgMo8qA5zmcUJKB06FY1z+RbqnFOpdOmI3fMdFPA=; b=uwrubB3eHGeY1tk9/SrXWC1WlsTMHfw9IcC9SIN0arr52Tnqb5KTOVvJzI8Va0H0wG541UnMoF7Jw9j74jacAtjoElu/KTi/FGjsuSkWhqwylt15d9jTzvwAIEHI0qNu3Iq1Fw0saUqxCC4PRFTAtXs+fU+9u4xIFpKIRRKDREokN/OyCY0LCBp87j/4I74vE5Bz3PQmWM5PB/S2CuHsLro3pgt9zfyDOiqVm+7UbIo6Iv0DibrJ3JN1JFCln1A2C51+tcrl0paBQWqp9f//d8y8P3q6fotIch22yoNR8BWRGyDNzOVA38PW9FR5XtHdNf7K+6DiXfiaGdoDmAOsbA== 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=4gxDgMo8qA5zmcUJKB06FY1z+RbqnFOpdOmI3fMdFPA=; b=w+Ss7msKsRJU61cKVCJsrBPA/6h7pZUm3sra+MdWZ81fpoBHypVma3l3h8Inc4q/gedEyggFZjzjnCEYeg2lpvi0AjlCmz6404K3gw/4n0uibRANwd+huGYe+vQSl6s6LlcPDVL/Ho150F2qN7yhlIbhTwGLFH0ZivJBZb7qGNA= Received: from PH8PR21CA0014.namprd21.prod.outlook.com (2603:10b6:510:2ce::28) by MW4PR12MB5643.namprd12.prod.outlook.com (2603:10b6:303:188::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.12; Thu, 17 Sep 2026 09:05:48 +0000 Received: from SJ1PEPF00002315.namprd03.prod.outlook.com (2603:10b6:510:2ce:cafe::a3) by PH8PR21CA0014.outlook.office365.com (2603:10b6:510:2ce::28) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.451.7 via Frontend Transport; Thu, 17 Sep 2026 09:05:48 +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 SJ1PEPF00002315.mail.protection.outlook.com (10.167.242.169) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Thu, 17 Sep 2026 09:05:48 +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.49; Thu, 17 Sep 2026 04:05: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.49 via Frontend Transport; Thu, 17 Sep 2026 04:05:39 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , "Vijendar Mukunda" Subject: [PATCH 6/9] soundwire: amd: introduce struct amd_sdw_hw_ops dispatch framework Date: Thu, 17 Sep 2026 14:32:54 +0530 Message-ID: <20260917090407.3828816-7-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20260917090407.3828816-1-Vijendar.Mukunda@amd.com> References: <20260917090407.3828816-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: SJ1PEPF00002315:EE_|MW4PR12MB5643:EE_ X-MS-Office365-Filtering-Correlation-Id: d9f72a1e-b788-4e1d-605a-08df149addb5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|23010399003|82310400026|36860700016|6133799003|18002099003|22082099003|10067099003|5023799004|56012099006|11063799006; X-Microsoft-Antispam-Message-Info: LuwmEa/Ucnzn4U+3Z1ONlgqqMjYlcKoqwI9DqSEGo6rJTIvynyzWqHbTDZlx+m62S+5I8wZcu3wJ8Uj2SLXihGZ1/6Qjja8xUF+trKvQe2LusgrbQPUIPbwImhwDjwxBuX00KXjra0V89ST2lQcqjX8Ea1waga/W1WQnuUa6J9kIYh11Fu7JewW0q5skQd6ts/n0/MmPp3GIWQkTcXZumehWNqkZ4+cWqhe0H+mvoT4Ono4neHAaMRUWDchxMokICST0jQU6BgBwNGXzWyV/OkkCbmpLFzWnIh+jz4Z+P/yhx/2DvRu9TlAjU8gefG0/zM5B1nWylZW1hIZlRs0+nHvxQC1onHQOUL3EBV5c7KH/scTK/JUUokbN4S89m2PtAi4lKC+Ygkb7AIhlySiGBteLJ99NCPQjZqpaVrGSZCe/OYjt83rs3P6R1sg1fP/uKUPN7QNcLPrdPzuRIfO8/5MksR0TXadG6DmjFGIxTV8V1uszQUD/ZHeDdcFA8MHZk/ufX6ffyisO0ZVG4Y3rJppiYUnf0aROeqO5lHDo2M5/Kd1lrMzYo2F1jxHKBrIwJh4vznrRbsS4Bua7j4m64kvhDRDwJpUn3osWwPWxYCV3Aud8B9NRWiXVv/pdnC5y+23MXbQkrviICO9mZCj/QNM1EGf9lpGoyMUcruz666dM6oHm6e4l7UP3slQnXpfmF+eLgjp1gxSpz07ivFuEkA== 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)(1800799024)(23010399003)(82310400026)(36860700016)(6133799003)(18002099003)(22082099003)(10067099003)(5023799004)(56012099006)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VptxpKKS6laJx+hv50dNow0RkQxp1QNSvhGH8PoF4GeHnPmSM1TgXhPp2nfGvQtUKUAPJo61lR9+wz1x9kIRQB+B8emNB8nt4TqPsqfln4+7Vngu9WCoOOnrIfGgSh99sPyyE73dmzj5WDzVuVYVXDt/SpGJ2GlZGPWKzeqOPLeH7qCqhPQRLp9GSb9BR8tuOIIfde5shOyqr/AwrgWQtKC5UDroVtXNX7Cmngng9COwGAgUFcyGHaWYmQafyPDp66MHmtfOlHbK7RAre+BacgXfYr+0H8Vvak3ONpkxFmyIKmGKvgfyA3r67dEFHw42Ybe3pY8vZzQzlrMhFzTbakUX7C8222N03vKDOEimXf4DyJE57tAn0ugtVAksRfEB7KjUYD+yhuukkkmF7owzyQCOZcUzqrLvTly54p7h2bEXXPqL1ALkKiZ7bbuJ96mS X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2026 09:05:48.6404 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d9f72a1e-b788-4e1d-605a-08df149addb5 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: SJ1PEPF00002315.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB5643 Content-Type: text/plain; charset="utf-8" Add struct amd_sdw_hw_ops, a function-pointer dispatch table for hardware-revision-specific SoundWire manager operations. Add inline dispatch helpers for each callback and a const hw_ops pointer in struct amd_sdw_manager. The irq_thread and update_slave_status_work slots take struct amd_sdw_manager * so that different ACP revisions can register different handler logic. hw_ops is populated and call sites are wired through the dispatch helpers in subsequent patches. Signed-off-by: Vijendar Mukunda --- drivers/soundwire/amd_manager.h | 193 ++++++++++++++++++++++++++++++ include/linux/soundwire/sdw_amd.h | 4 + 2 files changed, 197 insertions(+) diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manage= r.h index 63fecff62079..2d08c6edd018 100644 --- a/drivers/soundwire/amd_manager.h +++ b/drivers/soundwire/amd_manager.h @@ -274,4 +274,197 @@ static u32 sdw_manager_reg_mask_array[AMD_ACP63_SDW_M= AX_MANAGER_COUNT] =3D { AMD_SDW0_EXT_INTR_MASK, AMD_SDW1_EXT_INTR_MASK }; + +#define AMD_SDW_HW_OPS(amd_manager, cb) ((amd_manager)->hw_ops->cb) + +/** + * struct amd_sdw_hw_ops - hardware-revision-specific SoundWire manager ops + * + * @init_sdw_manager: enable the SoundWire manager hardware and perform bu= s reset + * @enable_sdw_manager: set the manager enable bit and wait for it to asse= rt + * @disable_sdw_manager: clear the manager enable bit and wait for it to d= eassert + * @enable_sdw_interrupts: unmask ACP-level and per-manager interrupt bits + * @disable_sdw_interrupts: mask ACP-level and per-manager interrupt bits + * @set_frameshape: write the row/column frame-shape register + * @send_cmd_get_resp: issue an immediate command and return the response; + * returns 0 on success with the raw u64 response in @response, + * or negative on hardware timeout + * @wake_enable: enable or disable the in-band SoundWire wake interrupt + * @host_wake_enable: enable or disable the host-side wake interrupt + * @set_device_state: write the D0/D3 device power state for the manager i= nstance + * @read_and_process_ping_status: issue a PING command and process the sla= ve + * attach/detach status; called from the IRQ work path + * @process_wake_event: handle an in-band wake notification from a slave + * @irq_thread: hw_ops callback invoked by the thin work_struct wrapper on + * each interrupt; reads status registers and dispatches slave events + * @update_slave_status_work: hw_ops callback invoked by the status-update + * work item; reads slave status and updates the SoundWire core + * @clk_init_ctrl: set the clock divider and update the frame shape regist= ers + * based on the current bus clock frequency + * @clock_stop_exit: restart the SoundWire bus clock after a CLK_STOP_MODE + * suspend; implementation differs across ACP revisions + * @suspend: system-suspend hook; stops the bus and powers down the manager + * @suspend_runtime: runtime-suspend hook; same sequence as @suspend + * @resume_runtime: runtime-resume hook; reinitialises the manager and res= tarts + * the bus after a POWER_OFF_MODE or CLK_STOP_MODE suspend + */ +struct amd_sdw_hw_ops { + int (*init_sdw_manager)(struct amd_sdw_manager *amd_manager); + int (*enable_sdw_manager)(struct amd_sdw_manager *amd_manager); + int (*disable_sdw_manager)(struct amd_sdw_manager *amd_manager); + void (*enable_sdw_interrupts)(struct amd_sdw_manager *amd_manager); + void (*disable_sdw_interrupts)(struct amd_sdw_manager *amd_manager); + void (*set_frameshape)(struct amd_sdw_manager *amd_manager); + int (*send_cmd_get_resp)(struct amd_sdw_manager *amd_manager, u32 lower_d= ata, + u32 upper_data, u64 *response); + void (*wake_enable)(struct amd_sdw_manager *amd_manager, bool enable); + int (*host_wake_enable)(struct amd_sdw_manager *amd_manager, bool enable); + int (*set_device_state)(struct amd_sdw_manager *amd_manager, u32 target_d= evice_state); + void (*read_and_process_ping_status)(struct amd_sdw_manager *amd_manager); + void (*process_wake_event)(struct amd_sdw_manager *amd_manager); + void (*irq_thread)(struct amd_sdw_manager *amd_manager); + void (*update_slave_status_work)(struct amd_sdw_manager *amd_manager); + int (*clk_init_ctrl)(struct amd_sdw_manager *amd_manager); + int (*clock_stop_exit)(struct amd_sdw_manager *amd_manager); + int (*suspend)(struct amd_sdw_manager *amd_manager); + int (*suspend_runtime)(struct amd_sdw_manager *amd_manager); + int (*resume_runtime)(struct amd_sdw_manager *amd_manager); +}; + +static inline int acp_init_sdw_manager(struct amd_sdw_manager *amd_manager) +{ + if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->init_sdw_m= anager) + return AMD_SDW_HW_OPS(amd_manager, init_sdw_manager)(amd_manager); + return -EOPNOTSUPP; +} + +static inline int acp_enable_sdw_manager(struct amd_sdw_manager *amd_manag= er) +{ + if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->enable_sdw= _manager) + return AMD_SDW_HW_OPS(amd_manager, enable_sdw_manager)(amd_manager); + return -EOPNOTSUPP; +} + +static inline int acp_disable_sdw_manager(struct amd_sdw_manager *amd_mana= ger) +{ + if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->disable_sd= w_manager) + return AMD_SDW_HW_OPS(amd_manager, disable_sdw_manager)(amd_manager); + return -EOPNOTSUPP; +} + +static inline void acp_enable_sdw_interrupts(struct amd_sdw_manager *amd_m= anager) +{ + if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->enable_sdw= _interrupts) + AMD_SDW_HW_OPS(amd_manager, enable_sdw_interrupts)(amd_manager); +} + +static inline void acp_disable_sdw_interrupts(struct amd_sdw_manager *amd_= manager) +{ + if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->disable_sd= w_interrupts) + AMD_SDW_HW_OPS(amd_manager, disable_sdw_interrupts)(amd_manager); +} + +static inline void acp_sdw_set_frameshape(struct amd_sdw_manager *amd_mana= ger) +{ + if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->set_frames= hape) + AMD_SDW_HW_OPS(amd_manager, set_frameshape)(amd_manager); +} + +static inline int acp_sdw_send_cmd_get_resp(struct amd_sdw_manager *amd_ma= nager, + u32 lower_data, u32 upper_data, u64 *response) +{ + if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->send_cmd_g= et_resp) + return AMD_SDW_HW_OPS(amd_manager, send_cmd_get_resp)(amd_manager, + lower_data, upper_data, + response); + return -EOPNOTSUPP; +} + +static inline void acp_sdw_wake_enable(struct amd_sdw_manager *amd_manager= , bool enable) +{ + if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->wake_enabl= e) + AMD_SDW_HW_OPS(amd_manager, wake_enable)(amd_manager, enable); +} + +static inline int acp_sdw_host_wake_enable(struct amd_sdw_manager *amd_man= ager, bool enable) +{ + if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->host_wake_= enable) + return AMD_SDW_HW_OPS(amd_manager, host_wake_enable)(amd_manager, enable= ); + return -EOPNOTSUPP; +} + +static inline int acp_sdw_set_device_state(struct amd_sdw_manager *amd_man= ager, + u32 target_device_state) +{ + if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->set_device= _state) + return AMD_SDW_HW_OPS(amd_manager, set_device_state)(amd_manager, + target_device_state); + return -EOPNOTSUPP; +} + +static inline void acp_sdw_read_and_process_ping_status(struct amd_sdw_man= ager *amd_manager) +{ + if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->read_and_p= rocess_ping_status) + AMD_SDW_HW_OPS(amd_manager, read_and_process_ping_status)(amd_manager); +} + +static inline void acp_sdw_process_wake_event(struct amd_sdw_manager *amd_= manager) +{ + if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->process_wa= ke_event) + AMD_SDW_HW_OPS(amd_manager, process_wake_event)(amd_manager); +} + +static inline void acp_sdw_irq_thread(struct amd_sdw_manager *amd_manager) +{ + if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->irq_thread) + AMD_SDW_HW_OPS(amd_manager, irq_thread)(amd_manager); +} + +static inline void acp_sdw_update_slave_status_work(struct amd_sdw_manager= *amd_manager) +{ + if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->update_sla= ve_status_work) + AMD_SDW_HW_OPS(amd_manager, update_slave_status_work)(amd_manager); +} + +static inline int acp_sdw_clk_init_ctrl(struct amd_sdw_manager *amd_manage= r) +{ + if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->clk_init_c= trl) + return AMD_SDW_HW_OPS(amd_manager, clk_init_ctrl)(amd_manager); + return -EOPNOTSUPP; +} + +static inline int acp_sdw_clock_stop_exit(struct amd_sdw_manager *amd_mana= ger) +{ + if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->clock_stop= _exit) + return AMD_SDW_HW_OPS(amd_manager, clock_stop_exit)(amd_manager); + return -EOPNOTSUPP; +} + +static inline int acp_sdw_suspend(struct device *dev) +{ + struct amd_sdw_manager *amd_manager =3D dev_get_drvdata(dev); + + if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->suspend) + return AMD_SDW_HW_OPS(amd_manager, suspend)(amd_manager); + return -EOPNOTSUPP; +} + +static inline int acp_sdw_suspend_runtime(struct device *dev) +{ + struct amd_sdw_manager *amd_manager =3D dev_get_drvdata(dev); + + if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->suspend_ru= ntime) + return AMD_SDW_HW_OPS(amd_manager, suspend_runtime)(amd_manager); + return -EOPNOTSUPP; +} + +static inline int acp_sdw_resume_runtime(struct device *dev) +{ + struct amd_sdw_manager *amd_manager =3D dev_get_drvdata(dev); + + if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->resume_run= time) + return AMD_SDW_HW_OPS(amd_manager, resume_runtime)(amd_manager); + return -EOPNOTSUPP; +} + #endif diff --git a/include/linux/soundwire/sdw_amd.h b/include/linux/soundwire/sd= w_amd.h index 476de2c30389..cbfa3d6b3460 100644 --- a/include/linux/soundwire/sdw_amd.h +++ b/include/linux/soundwire/sdw_amd.h @@ -55,10 +55,13 @@ struct sdw_amd_dai_runtime { enum sdw_stream_type stream_type; }; =20 +struct amd_sdw_hw_ops; + /** * struct amd_sdw_manager - amd manager driver context * @bus: bus handle * @dev: linux device + * @hw_ops: pointer to hardware-revision-specific dispatch table * @mmio: SoundWire registers mmio base * @acp_mmio: acp registers mmio base * @amd_sdw_irq_thread: SoundWire manager irq workqueue @@ -85,6 +88,7 @@ struct sdw_amd_dai_runtime { struct amd_sdw_manager { struct sdw_bus bus; struct device *dev; + const struct amd_sdw_hw_ops *hw_ops; =20 void __iomem *mmio; void __iomem *acp_mmio; --=20 2.48.1 From nobody Fri Sep 25 03:17:14 2026 Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010012.outbound.protection.outlook.com [52.101.46.12]) (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 32F824A33EA; Thu, 17 Sep 2026 09:06:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.46.12 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789635964; cv=fail; b=FI3X4ParBWOfFYvaBSBK4V9HYjjtQtnc9CDtDH9y2XBWbIZLjKslgwYCnKflnoGZN/EKqBOXG/H3RsLlb1RkdjQfrVNEDc7uixJE1ELlEpO5gpyd/UxOqXpMZp032H9THFQnVW4mmQ0+l2rjJJNwOfb9c5qUqi7admnla7BgFmQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789635964; c=relaxed/simple; bh=UhjWIzn5/ZPIkzuw909f480Q7xih7UyW4h9cIYXgnkU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=H9Wd6QPHor/UujuCFto2Szn+sYLd1pLw2EzxQ99wMEn86LIPukBz/jYv0aDp6+M7FFpX6gD6zr+VXLPDSgv5/+oTh/7c6fFMNLFRuJVx7heZO3/d3ueLO2/j9q8JHCF/UnMBLh5ufJeHhlY3581Yzx9a4SBCp7gSzMQLPCEH6G0= 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=k274PZzf; arc=fail smtp.client-ip=52.101.46.12 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="k274PZzf" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Plbm2+jki2y2zW8PBP9/pFYRYHqSjZZCm98M16KZPLO9K1HCxy7qToqIFX9m6pMDnYj/gKyvYiPHk8yZWwJat4dr6B2PXqELH9Rz0bmN5fRuVEIF9oGCCQKwK4WDkOUrIAMVELwN+fGCtCdKC6K0nhMzkZifxYlgqwEFaM+Tk3+uOz+rpeTR7TR+ZQHgz1hSdxkXe8AcwjybmDUNvc/u8I0+oHqB4t0iPKHSnVKkfqOx7AqAz4RndRU4c49gVPzmFgsf9xp3LwibbntrqxNZ2xpzCjm9jzE0HK+O2M1nOAmrMCy8Fc1vBLSINn5l+sUH6wV7afUG4bbetS3K7p56Zw== 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=AiZdtUHq+sTdMD1m+VkCV+FlkQm555kdMdF/d/ZP1Ik=; b=xfgTrOJAdOEA23DAPRloK8NRhd6YFSlj/6Uh92KKCWWgFARbyWDUc7EOjgc7neLkCYXPNdvJ2/ipoO2Gm9RqxKjjT0yutmi7Ap+7enrYq4S4bKXiXjw+Ynnz2DuzeLBkc53JKlqSBxf6FR9N6isW/hCJ9nmjmkJqnLVsJDYk3r6qCu1xCDN7QK09FaCHooC5KOsvufRSHZBPU6AtVrZGU0DdjLcn8hxUDTbVIq8Moa8Qoktg6/eL3NS88InrE1CaAm2fi4zusttGDSN37srBLXWupvOKGVmQf3Miv7e3kEai6Z0a+nhVHNYOSc8pcb5yi+tqIZG8ClCSzWSVum40RA== 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=AiZdtUHq+sTdMD1m+VkCV+FlkQm555kdMdF/d/ZP1Ik=; b=k274PZzfMHKRdaDGE+nw0m0cT2k9yGYQJrgsyWun2DahyNeh88KnnGENEBPvfUvIf3C7T2QU9aH0W3T2XsCGLWJW9oo3pJp+KF5VWwViN2xWECBLayBdFTyvs3v/ZuBa+vPjPQQF8Xzc7lA8v/7q8Hxdbef2zVXiNoZ4QTXGROA= Received: from PH8PR21CA0009.namprd21.prod.outlook.com (2603:10b6:510:2ce::26) by BN7PPFD91879A44.namprd12.prod.outlook.com (2603:10b6:40f:fc02::6e5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.12; Thu, 17 Sep 2026 09:05:56 +0000 Received: from SJ1PEPF00002315.namprd03.prod.outlook.com (2603:10b6:510:2ce:cafe::6c) by PH8PR21CA0009.outlook.office365.com (2603:10b6:510:2ce::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.451.7 via Frontend Transport; Thu, 17 Sep 2026 09:05:56 +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 SJ1PEPF00002315.mail.protection.outlook.com (10.167.242.169) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Thu, 17 Sep 2026 09:05:56 +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.49; Thu, 17 Sep 2026 04:05:47 -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.49 via Frontend Transport; Thu, 17 Sep 2026 04:05:43 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , "Vijendar Mukunda" Subject: [PATCH 7/9] soundwire: amd: convert irq/work handlers to hw_ops callbacks Date: Thu, 17 Sep 2026 14:32:55 +0530 Message-ID: <20260917090407.3828816-8-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20260917090407.3828816-1-Vijendar.Mukunda@amd.com> References: <20260917090407.3828816-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: SJ1PEPF00002315:EE_|BN7PPFD91879A44:EE_ X-MS-Office365-Filtering-Correlation-Id: ded98634-e645-433a-8c73-08df149ae234 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|1800799024|82310400026|376014|23010399003|10067099003|56012099006|6133799003|11063799006|5023799004|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: L4f5BU0qaF1v86nji+JNChsgGREk4GY7vB8q8SZgCXDrrca+EHBwKXN1e88rX7bzRS3Do4bBnNaiDv/YBblzLq1c4pegiJZpSt6oeOMAs5SRkcEuGqnEr6zRm4Nzndv/QhxGilQW7cQt5azQbmsmUyjwjdqph4MSgVI0Zg29PHbeAcxvXx9ns5eRY4lCSUe6nJsJtVZb6gTp8oY3H4SmzFxNN2h3U+wBEVoxL3PwkuxoduGS8jy7xRYHdJdmhPZDOONhtKUkFaOfqC6ci8JDficCik/W7vmvenk5/uzIEhb0XlXTKBy6ZgFoh4DmKJdOYFBD+tTsqesTYRCoaYmxH4XhIgNAQmNre7rxl8cj7okGvoPsbnu8lXdkdnpainfilUsgCGfK7FxGXm8u8DuGlzJMCg++XzoCELrTQ9iWVYH57flSA18vocq1CFqReQWfdJcg1sfOFgTYi56r8+PD+qjnKxbW3LcmQTDvOE13Fsq3d96QTpYl6S4J836a6J4PJZiPHrM6ZCy89k+qYYPXbKXkb7/1LEoOzZ805uKzdU22SDOR+nRs8b/0FSLwWs3Ewee0AduTa7lZewFh95FuK6qXtOqsV6ItxAB4QAlkwkrncaphWTXPj0oy+1+IjsbMSC4f2p8UCKasfIxmD/aL/Tp1pZkpucRcOA82r22rR4mLqs9zD5HFglXcxQRra5O+WKU0XrqCPMLvdXM8fmWqpg== 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)(36860700016)(1800799024)(82310400026)(376014)(23010399003)(10067099003)(56012099006)(6133799003)(11063799006)(5023799004)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ewUj7IBFrUgEMaexDbfBKpI89L+U4swnM3tRQeQLReJuhAYodJP6JOlX1lTkIjcRgRzSU7HEJVKTvlDHMq26N+JFxP3ouV0X8LrNHUmANdofy9g0Odo1EiUnMgwfAjzW+3+Noc68wFLkHpEPRWjXm0l2hCM3ZcU4SdjZ1rMbp92EZHDYeyT/lfG0VJadSVFwMaavpx+Z2qBwopuU/LZsTo/5JWdAicitZdgX/RgV8vAAgr3Nl730vo5HMraL4J9c7kao7tzAkRWmcftKQafZxrju3QhJ2EVM3fOjyNZY6ZoBcXr8XoUQP9jDNNaecUraWmHkmwBqKcp2lhaNqIMQmiZQ0O46jXgblCX2vGJurLGZmBunenb6tQ7Nd9klGOK3hMyAsY6VjpHZ5jl9xhUHARu3HBkxyYSz7S3RPKvFQJLxMpKLORGfNT/m/o9rWpXM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2026 09:05:56.1253 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ded98634-e645-433a-8c73-08df149ae234 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: SJ1PEPF00002315.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PPFD91879A44 Content-Type: text/plain; charset="utf-8" Convert amd_acp63_sdw_irq_thread() and amd_acp63_sdw_update_slave_status_work() from work_struct handlers (taking struct work_struct *) to hw_ops callbacks (taking struct amd_sdw_manager *). Introduce thin work_struct wrappers that recover the manager pointer via container_of and invoke the refactored functions directly. The wrappers are wired through the acp_sdw_*() dispatch helpers in the subsequent patch once hw_ops is populated. Signed-off-by: Vijendar Mukunda --- drivers/soundwire/amd_manager.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manage= r.c index 669044430a0b..87a2e779dd4e 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include "bus.h" @@ -949,10 +950,8 @@ static int amd_sdw_register_dais(struct amd_sdw_manage= r *amd_manager) dais, num_dais); } =20 -static void amd_acp63_sdw_update_slave_status_work(struct work_struct *wor= k) +static void amd_acp63_sdw_update_slave_status_work(struct amd_sdw_manager = *amd_manager) { - struct amd_sdw_manager *amd_manager =3D - container_of(work, struct amd_sdw_manager, amd_sdw_work); int retry_count =3D 0; =20 if (amd_manager->status[0] =3D=3D SDW_SLAVE_ATTACHED) { @@ -985,6 +984,14 @@ static void amd_acp63_sdw_update_slave_status_work(str= uct work_struct *work) } } =20 +static void amd_sdw_update_slave_status_work(struct work_struct *work) +{ + struct amd_sdw_manager *amd_manager =3D + container_of(work, struct amd_sdw_manager, amd_sdw_work); + + amd_acp63_sdw_update_slave_status_work(amd_manager); +} + static void amd_sdw_update_slave_status(u32 status_change_0to7, u32 status= _change_8to11, struct amd_sdw_manager *amd_manager) { @@ -1017,10 +1024,8 @@ static void amd_acp63_sdw_process_wake_event(struct = amd_sdw_manager *amd_manager writel(0x00, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_8TO11); } =20 -static void amd_acp63_sdw_irq_thread(struct work_struct *work) +static void amd_acp63_sdw_irq_thread(struct amd_sdw_manager *amd_manager) { - struct amd_sdw_manager *amd_manager =3D - container_of(work, struct amd_sdw_manager, amd_sdw_irq_thread); u32 status_change_8to11; u32 status_change_0to7; =20 @@ -1046,6 +1051,14 @@ static void amd_acp63_sdw_irq_thread(struct work_str= uct *work) writel(0x00, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_0TO7); } =20 +static void amd_sdw_interrupt_thread(struct work_struct *work) +{ + struct amd_sdw_manager *amd_manager =3D + container_of(work, struct amd_sdw_manager, amd_sdw_irq_thread); + + amd_acp63_sdw_irq_thread(amd_manager); +} + int amd_sdw_manager_start(struct amd_sdw_manager *amd_manager) { struct sdw_master_prop *prop; @@ -1164,8 +1177,8 @@ static int amd_sdw_manager_probe(struct platform_devi= ce *pdev) return ret; } dev_set_drvdata(dev, amd_manager); - INIT_WORK(&amd_manager->amd_sdw_irq_thread, amd_acp63_sdw_irq_thread); - INIT_WORK(&amd_manager->amd_sdw_work, amd_acp63_sdw_update_slave_status_w= ork); + INIT_WORK(&amd_manager->amd_sdw_irq_thread, amd_sdw_interrupt_thread); + INIT_WORK(&amd_manager->amd_sdw_work, amd_sdw_update_slave_status_work); return 0; } =20 --=20 2.48.1 From nobody Fri Sep 25 03:17:14 2026 Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azon11010037.outbound.protection.outlook.com [52.101.56.37]) (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 840A342467E; Thu, 17 Sep 2026 09:06:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.56.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789635968; cv=fail; b=eClPPz+IBeapy2Gg/RPmGPukwlKkv0ImEmeMUxyWdamBXCXASS40+p2n5zDYA3l8DpKaS/ItCAacfOMysJyD+GfLleJb2BVQ4q3A0Nq7OZwHxv4JURgJ+SdPbkSnVdOjEoSufKs4I/hC1tn6HNPCX/bh52uGhTkCc9ao/3O7/4A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789635968; c=relaxed/simple; bh=pXWIYcdG1qKP9MYbN39O3KdHYuzg/IJje/53l62UrGg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Qtxs7wEfHu/K9AAYkpMhLfdldSCCu4QqEQCehg4ccTi/AxKR8xgptPLDwR0h2nMQH12G06m758eqPa005fvZU2MSI91VE532QRZbD5P8jHgsRVFrU1N14hEyYDj0XZylDcl9yQSGegJ1kkJvwUzPa08PIBSftpwNeobbbLitumI= 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=eF2wkiIY; arc=fail smtp.client-ip=52.101.56.37 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="eF2wkiIY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=T9zjKAz9zacORJM+dkBq26DhG/48wpL5o/TJ8077dJgAR4aTANRCQYqIElUJI0UVJ5WfByvr8Li4ZFeuwtH/co8+cVdNy3e9j4u0fD6SJljKXkr2nMeqw41OfQVf2a6szcCVNdrABOoXTXGYXU4Ix5XCS74ZkXiTkU8wqg2nYs2uMKMd973A+hQjNvKCEL+wT6281F9YRf75ojmlnSdBCB+MdfgD1OxOVrIIYqocV1BTTWAnHPdHBTghR/wup7CRHuF97NLm+OfHZDg4I7ioAeGhGgEyBRcIC/QQ0fZWZqZtlrunIIQz9sSRp8/AVMCgZjJ1HSxvBOzfOm02reZkag== 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=CoXbQcFEfBr4GVbUdGf8HnG7o+uhYerypKlU6TNFfTk=; b=caXRc+FZNLkinef76vBUlgAgd6X6JCZyru6x53hjcbazSZuvId0ZNWzGf08GdrVPcnQMT/Em3dyMR/sx1j2uyVyRfzIBrV3glE5hT01Vucor2DX5iDAxVBu+FX7i2lNZtSyvDfJrXSjL3z7b4k8EGVhM8B/JBWrMuPCtUWe8op6iReZUN7FwAgFOE2br5q7zZ0mISrhiWFnnwOdjwSdqSVsKYn5s5EA19vg00qcXzPFXIIrhI568QsqnhMwbWEnMD9Cs+mWWD7yKewP/oBIfFjxmOAISV947yKWA1Aqgq4irQcrD7TYQRmHpn6f28Zbn813YQH78D3aLJCWjLs1vwg== 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=CoXbQcFEfBr4GVbUdGf8HnG7o+uhYerypKlU6TNFfTk=; b=eF2wkiIYwkg6oc0eaqFIxbW54FZ0rOaDJv9WYQH+mXgULHcPTmAFvTox+Y89h/bAkOp+nXdHVewom6OGg78QQs2VIy3I+AjXaqtErk5tDDAL/w/+LFf/UrqB7fevqdU1CHpFMIdmMEho4KUACbgN8GeRnI0XAtnyzbP0SKEuOfU= Received: from BY5PR03CA0017.namprd03.prod.outlook.com (2603:10b6:a03:1e0::27) by MN0PR12MB6199.namprd12.prod.outlook.com (2603:10b6:208:3c4::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.12; Thu, 17 Sep 2026 09:05:57 +0000 Received: from SJ1PEPF00002316.namprd03.prod.outlook.com (2603:10b6:a03:1e0:cafe::5) by BY5PR03CA0017.outlook.office365.com (2603:10b6:a03:1e0::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.360.13 via Frontend Transport; Thu, 17 Sep 2026 09:05:57 +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 SJ1PEPF00002316.mail.protection.outlook.com (10.167.242.170) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Thu, 17 Sep 2026 09:05:57 +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.49; Thu, 17 Sep 2026 04:05:51 -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.49 via Frontend Transport; Thu, 17 Sep 2026 04:05:47 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , "Vijendar Mukunda" Subject: [PATCH 8/9] soundwire: amd: wire amd_acp63_*() call sites through acp_*() helpers Date: Thu, 17 Sep 2026 14:32:56 +0530 Message-ID: <20260917090407.3828816-9-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20260917090407.3828816-1-Vijendar.Mukunda@amd.com> References: <20260917090407.3828816-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: SJ1PEPF00002316:EE_|MN0PR12MB6199:EE_ X-MS-Office365-Filtering-Correlation-Id: 3d5bc73d-7837-4556-cdbf-08df149ae2de X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|23010399003|376014|82310400026|36860700016|6133799003|18002099003|22082099003|10067099003|56012099006|11063799006; X-Microsoft-Antispam-Message-Info: j4zc44qqkNfTMf/n0qewYd7CLvGJxS8EoIraIyqRN9vsCXCQ1vMVB0t0UssjALyCIWBokUUc+3DLRiyI2hnnD3rrAVvgkybdz1jvbBpfAX0BlzDAyEKDmVCfo1EFcwT5ovIywuKRZv03EdtFwfhq5n6xP2SGH6ykBRsDABnvR2Karj4xJz4aJPP8ma6ptWFEPoUBNjmC6KUgfGwHwRzgTEyFGW25t+IZ0U1rvCGRFEr4otd88cuKOnurngEE/idxF1VfCGi+IGrf/q0v75N6vmGiF20YPfl+jhXNH/nsdAG5GLLhY83EHGz3G8E/PlyqPV6Dvpodoy/9CR3RGK6/iukrXNz72q6AVwkKgkb2bCJ72CXOVdWSvGBNnIwles4+Sp4QTUzVEzIrT3JqSBO7isC/Vmgd6/DTa39pOnoeFGylRKqippyzLMEjiaFzfClfC/ucVjIu08jyoH6++4s5LHagn0EqdqgJFu1FpCGOqJtrDO6mYBHgjxMu91C4iNaA058hxwao4CdguzU9Tkem4lFBE2dvK4DkgiDkoPsS46f2j2L8xtm9aGP6P7G+W6huyIhNny+ZUhWKBV5eiy99fYcaDMtHZR6C5BtI2KjTsi+uHC9VA2chy7kkh7JsVcftszt0hvfjS0K7uAezNlWW/8cP+BhQX2u8TmgeoP4FAwDKbIbzVsMzn2QYOGR3k9iKjyPyd+KWor69M6SNZ+ceMQ== 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)(1800799024)(23010399003)(376014)(82310400026)(36860700016)(6133799003)(18002099003)(22082099003)(10067099003)(56012099006)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0eW4hhXeUVj/RRzZrViZN8KsObn2VX4GIoadCCnBKty4u+216Fvge1uJYt83UaHdKbKMqja+Wwhrj6LcMJZziTx87wDBEkhsSJJBNO66O6vaJdscg1/4FgvO1AAeiN41QMTpS5Pm41Y8GqK9TKOHUl8Ml6Ley0oJ0mhPFa15vA3TxQs1KEexoMSF1NKroK3Y6nn99gZ26EoV24UWFrBZ6xaG2l44Qlo+iv/5ztguJbukGKvYtCjh8S35qPqxMIB1fouRicCqgSIl1pFozCsTvUe42ZdItZhpw8gXyPHkLKiHMa+HEGvzZds8Vgc3xDqqw3w4guN1DY7kA5zgyoKBFsriH6BDG14TDxlCuBoaqq/8q37quo6Qbsg/aRcY5hDrNXEBgJ0a4YIk7sMJ0zGc1M/PtJQ9BtYGNljjWU+o4kSKU4AxTGOB3OAsSN5PpKTr X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2026 09:05:57.2641 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3d5bc73d-7837-4556-cdbf-08df149ae2de 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: SJ1PEPF00002316.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6199 Content-Type: text/plain; charset="utf-8" Extract PM logic into amd_acp63_sdw_suspend(), amd_acp63_sdw_suspend_runtime() and amd_acp63_sdw_resume_runtime() hw_ops callbacks, each taking struct amd_sdw_manager * instead of struct device *. Replace the existing amd_suspend(), amd_suspend_runtime() and amd_resume_runtime() static wrappers with thin one-liners that delegate to the corresponding acp_sdw_*() dispatch helpers. Introduce a static const struct amd_sdw_hw_ops amd_acp63_hw_ops table that populates all 19 hw_ops slots with the amd_acp63_*() callbacks. Introduce amd_sdw_hw_init_ops() to assign a pointer to this table based on acp_rev, and call it from amd_sdw_manager_probe() to wire up the dispatch table at probe time. Convert all remaining direct amd_acp63_*() call sites in the start, PM, interrupt, and remove paths to use the corresponding acp_*() wrappers. Place amd_acp63_hw_ops and amd_sdw_hw_init_ops() after amd_sdw_manager_remove() so all amd_acp63_*() functions they reference are already defined. Add a forward declaration of amd_sdw_hw_init_ops() before amd_sdw_manager_probe() to resolve the call site ordering. Signed-off-by: Vijendar Mukunda --- drivers/soundwire/amd_manager.c | 366 ++++++++++++++++++-------------- 1 file changed, 210 insertions(+), 156 deletions(-) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manage= r.c index 87a2e779dd4e..834e943b040b 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -303,8 +303,7 @@ amd_program_scp_addr(struct amd_sdw_manager *amd_manage= r, struct sdw_msg *msg) scp_msg.buf =3D &msg->addr_page1; scp_msg.flags =3D SDW_MSG_FLAG_WRITE; amd_sdw_ctl_word_prep(&lower_data, &upper_data, &scp_msg, 0); - if (amd_acp63_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, - &response_buf[0])) { + if (acp_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &respo= nse_buf[0])) { dev_err_ratelimited(amd_manager->dev, "SCP_addrpage command timeout for Slave %d\n", msg->dev_num); return SDW_CMD_TIMEOUT; @@ -312,8 +311,7 @@ amd_program_scp_addr(struct amd_sdw_manager *amd_manage= r, struct sdw_msg *msg) scp_msg.addr =3D SDW_SCP_ADDRPAGE2; scp_msg.buf =3D &msg->addr_page2; amd_sdw_ctl_word_prep(&lower_data, &upper_data, &scp_msg, 0); - if (amd_acp63_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, - &response_buf[1])) { + if (acp_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &respo= nse_buf[1])) { dev_err_ratelimited(amd_manager->dev, "SCP_addrpage command timeout for Slave %d\n", msg->dev_num); return SDW_CMD_TIMEOUT; @@ -386,7 +384,7 @@ static unsigned int _amd_sdw_xfer_msg(struct amd_sdw_ma= nager *amd_manager, struc u32 upper_data =3D 0, lower_data =3D 0; =20 amd_sdw_ctl_word_prep(&lower_data, &upper_data, msg, cmd_offset); - if (amd_acp63_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, = &response)) { + if (acp_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &respo= nse)) { dev_err_ratelimited(amd_manager->dev, "command timeout for Slave %d\n", msg->dev_num); return SDW_CMD_TIMEOUT; @@ -449,7 +447,7 @@ static void amd_acp63_sdw_read_and_process_ping_status(= struct amd_sdw_manager *a u64 response; =20 mutex_lock(&amd_manager->bus.msg_lock); - if (amd_acp63_sdw_send_cmd_get_resp(amd_manager, 0, 0, &response)) { + if (acp_sdw_send_cmd_get_resp(amd_manager, 0, 0, &response)) { mutex_unlock(&amd_manager->bus.msg_lock); dev_err_ratelimited(amd_manager->dev, "SDW%x ping status timeout\n", amd_manager->instance); @@ -471,7 +469,7 @@ static u32 amd_acp63_sdw_read_ping_status(struct sdw_bu= s *bus) /* Called by sdw_show_ping_status() which holds msg_lock. */ lockdep_assert_held(&bus->msg_lock); =20 - if (amd_acp63_sdw_send_cmd_get_resp(amd_manager, 0, 0, &response)) { + if (acp_sdw_send_cmd_get_resp(amd_manager, 0, 0, &response)) { dev_err_ratelimited(amd_manager->dev, "SDW%x ping status timeout\n", amd_manager->instance); return amd_manager->ping_slave_stat =3D=3D U32_MAX ? 0 : amd_manager->pi= ng_slave_stat; @@ -974,7 +972,7 @@ static void amd_acp63_sdw_update_slave_status_work(stru= ct amd_sdw_manager *amd_m ACP_SW_STATE_CHANGE_STATUS_MASK_0TO7); writel(AMD_SDW_IRQ_MASK_8TO11, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_MASK_8TO11); - amd_acp63_sdw_read_and_process_ping_status(amd_manager); + acp_sdw_read_and_process_ping_status(amd_manager); goto update_status; } else { dev_err_ratelimited(amd_manager->dev, @@ -989,7 +987,7 @@ static void amd_sdw_update_slave_status_work(struct wor= k_struct *work) struct amd_sdw_manager *amd_manager =3D container_of(work, struct amd_sdw_manager, amd_sdw_work); =20 - amd_acp63_sdw_update_slave_status_work(amd_manager); + acp_sdw_update_slave_status_work(amd_manager); } =20 static void amd_sdw_update_slave_status(u32 status_change_0to7, u32 status= _change_8to11, @@ -1037,10 +1035,10 @@ static void amd_acp63_sdw_irq_thread(struct amd_sdw= _manager *amd_manager) dev_dbg(amd_manager->dev, "[SDW%d] SDW INT: 0to7=3D0x%x, 8to11=3D0x%x\n", amd_manager->instance, status_change_0to7, status_change_8to11); if (status_change_8to11 & AMD_SDW_WAKE_STAT_MASK) - return amd_acp63_sdw_process_wake_event(amd_manager); + return acp_sdw_process_wake_event(amd_manager); =20 if (status_change_8to11 & AMD_SDW_PREQ_INTR_STAT) { - amd_acp63_sdw_read_and_process_ping_status(amd_manager); + acp_sdw_read_and_process_ping_status(amd_manager); } else { /* Check for the updated status on peripheral device */ amd_sdw_update_slave_status(status_change_0to7, status_change_8to11, amd= _manager); @@ -1056,7 +1054,7 @@ static void amd_sdw_interrupt_thread(struct work_stru= ct *work) struct amd_sdw_manager *amd_manager =3D container_of(work, struct amd_sdw_manager, amd_sdw_irq_thread); =20 - amd_acp63_sdw_irq_thread(amd_manager); + acp_sdw_irq_thread(amd_manager); } =20 int amd_sdw_manager_start(struct amd_sdw_manager *amd_manager) @@ -1066,17 +1064,17 @@ int amd_sdw_manager_start(struct amd_sdw_manager *a= md_manager) =20 prop =3D &amd_manager->bus.prop; if (!prop->hw_disabled) { - ret =3D amd_acp63_sdw_clk_init_ctrl(amd_manager); + ret =3D acp_sdw_clk_init_ctrl(amd_manager); if (ret) return ret; - ret =3D amd_acp63_init_sdw_manager(amd_manager); + ret =3D acp_init_sdw_manager(amd_manager); if (ret) return ret; - amd_acp63_enable_sdw_interrupts(amd_manager); - ret =3D amd_acp63_enable_sdw_manager(amd_manager); + acp_enable_sdw_interrupts(amd_manager); + ret =3D acp_enable_sdw_manager(amd_manager); if (ret) return ret; - amd_acp63_sdw_set_frameshape(amd_manager); + acp_sdw_set_frameshape(amd_manager); } /* Enable runtime PM */ pm_runtime_set_autosuspend_delay(amd_manager->dev, AMD_SDW_MASTER_SUSPEND= _DELAY_MS); @@ -1087,117 +1085,6 @@ int amd_sdw_manager_start(struct amd_sdw_manager *a= md_manager) return 0; } =20 -static int amd_sdw_manager_probe(struct platform_device *pdev) -{ - const struct acp_sdw_pdata *pdata =3D pdev->dev.platform_data; - struct resource *res; - struct device *dev =3D &pdev->dev; - struct sdw_master_prop *prop; - struct amd_sdw_manager *amd_manager; - int ret; - - amd_manager =3D devm_kzalloc(dev, sizeof(struct amd_sdw_manager), GFP_KER= NEL); - if (!amd_manager) - return -ENOMEM; - - res =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) - return -ENOMEM; - - amd_manager->acp_mmio =3D devm_ioremap(dev, res->start, resource_size(res= )); - if (!amd_manager->acp_mmio) { - dev_err(dev, "mmio not found\n"); - return -ENOMEM; - } - amd_manager->ping_slave_stat =3D U32_MAX; - amd_manager->instance =3D pdata->instance; - amd_manager->mmio =3D amd_manager->acp_mmio + - (amd_manager->instance * ACP63_SDW_MANAGER_REG_OFFSET); - amd_manager->acp_sdw_lock =3D pdata->acp_sdw_lock; - amd_manager->acp_rev =3D pdata->acp_rev; - amd_manager->cols_index =3D sdw_find_col_index(AMD_SDW_DEFAULT_COLUMNS); - amd_manager->rows_index =3D sdw_find_row_index(AMD_SDW_DEFAULT_ROWS); - amd_manager->dev =3D dev; - amd_manager->bus.ops =3D &amd_acp63_sdw_ops; - amd_manager->bus.port_ops =3D &amd_acp63_sdw_port_ops; - amd_manager->bus.compute_params =3D &amd_acp63_sdw_compute_params; - amd_manager->bus.clk_stop_timeout =3D 200; - amd_manager->bus.link_id =3D amd_manager->instance; - - /* - * Due to BIOS compatibility, the two links are exposed within - * the scope of a single controller. If this changes, the - * controller_id will have to be updated with drv_data - * information. - */ - amd_manager->bus.controller_id =3D 0; - dev_dbg(dev, "acp_rev:0x%x\n", amd_manager->acp_rev); - switch (amd_manager->acp_rev) { - case ACP63_PCI_REV_ID: - switch (amd_manager->instance) { - case ACP_SDW0: - amd_manager->num_dout_ports =3D AMD_ACP63_SDW0_MAX_TX_PORTS; - amd_manager->num_din_ports =3D AMD_ACP63_SDW0_MAX_RX_PORTS; - break; - case ACP_SDW1: - amd_manager->num_dout_ports =3D AMD_ACP63_SDW1_MAX_TX_PORTS; - amd_manager->num_din_ports =3D AMD_ACP63_SDW1_MAX_RX_PORTS; - break; - default: - return -EINVAL; - } - break; - case ACP70_PCI_REV_ID: - case ACP71_PCI_REV_ID: - case ACP72_PCI_REV_ID: - amd_manager->num_dout_ports =3D AMD_ACP70_SDW_MAX_TX_PORTS; - amd_manager->num_din_ports =3D AMD_ACP70_SDW_MAX_RX_PORTS; - break; - default: - return -EINVAL; - } - amd_manager->max_ports =3D amd_manager->num_dout_ports + amd_manager->num= _din_ports; - amd_manager->port_offset_map =3D devm_kcalloc(dev, amd_manager->max_ports, - sizeof(int), GFP_KERNEL); - if (!amd_manager->port_offset_map) - return -ENOMEM; - - prop =3D &amd_manager->bus.prop; - prop->mclk_freq =3D AMD_SDW_BUS_BASE_FREQ; - - ret =3D sdw_bus_master_add(&amd_manager->bus, dev, dev->fwnode); - if (ret) { - dev_err(dev, "Failed to register SoundWire manager(%d)\n", ret); - return ret; - } - ret =3D amd_sdw_register_dais(amd_manager); - if (ret) { - dev_err(dev, "CPU DAI registration failed\n"); - sdw_bus_master_delete(&amd_manager->bus); - return ret; - } - dev_set_drvdata(dev, amd_manager); - INIT_WORK(&amd_manager->amd_sdw_irq_thread, amd_sdw_interrupt_thread); - INIT_WORK(&amd_manager->amd_sdw_work, amd_sdw_update_slave_status_work); - return 0; -} - -static void amd_sdw_manager_remove(struct platform_device *pdev) -{ - struct amd_sdw_manager *amd_manager =3D dev_get_drvdata(&pdev->dev); - int ret; - - if (pm_runtime_enabled(&pdev->dev)) - pm_runtime_disable(&pdev->dev); - amd_acp63_disable_sdw_interrupts(amd_manager); - cancel_work_sync(&amd_manager->amd_sdw_irq_thread); - cancel_work_sync(&amd_manager->amd_sdw_work); - sdw_bus_master_delete(&amd_manager->bus); - ret =3D amd_acp63_disable_sdw_manager(amd_manager); - if (ret) - dev_err(&pdev->dev, "Failed to disable device (%pe)\n", ERR_PTR(ret)); -} - /* * AMD SoundWire clock-stop sequence shared across all ACP revisions. * Differences between revisions in this path are minimal; a switch/case @@ -1327,7 +1214,7 @@ static int amd_sdw_host_wake_enable_by_rev(struct amd= _sdw_manager *amd_manager, case ACP70_PCI_REV_ID: case ACP71_PCI_REV_ID: case ACP72_PCI_REV_ID: - return amd_acp63_sdw_host_wake_enable(amd_manager, enable); + return acp_sdw_host_wake_enable(amd_manager, enable); default: dev_err(amd_manager->dev, "unexpected acp_rev 0x%x\n", amd_manager->acp_= rev); return -EINVAL; @@ -1335,9 +1222,8 @@ static int amd_sdw_host_wake_enable_by_rev(struct amd= _sdw_manager *amd_manager, return 0; } =20 -static int __maybe_unused amd_suspend(struct device *dev) +static int amd_acp63_sdw_suspend(struct amd_sdw_manager *amd_manager) { - struct amd_sdw_manager *amd_manager =3D dev_get_drvdata(dev); struct sdw_bus *bus =3D &amd_manager->bus; int ret; =20 @@ -1348,22 +1234,22 @@ static int __maybe_unused amd_suspend(struct device= *dev) } =20 if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) { - amd_acp63_disable_sdw_interrupts(amd_manager); + acp_disable_sdw_interrupts(amd_manager); cancel_work_sync(&amd_manager->amd_sdw_irq_thread); cancel_work_sync(&amd_manager->amd_sdw_work); - amd_acp63_sdw_wake_enable(amd_manager, false); + acp_sdw_wake_enable(amd_manager, false); ret =3D amd_sdw_host_wake_enable_by_rev(amd_manager, false); if (ret) return ret; ret =3D amd_sdw_clock_stop(amd_manager); if (ret) return ret; - amd_acp63_enable_sdw_interrupts(amd_manager); + acp_enable_sdw_interrupts(amd_manager); } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) { - amd_acp63_disable_sdw_interrupts(amd_manager); + acp_disable_sdw_interrupts(amd_manager); cancel_work_sync(&amd_manager->amd_sdw_irq_thread); cancel_work_sync(&amd_manager->amd_sdw_work); - amd_acp63_sdw_wake_enable(amd_manager, false); + acp_sdw_wake_enable(amd_manager, false); ret =3D amd_sdw_host_wake_enable_by_rev(amd_manager, false); if (ret) return ret; @@ -1374,7 +1260,7 @@ static int __maybe_unused amd_suspend(struct device *= dev) ret =3D amd_sdw_clock_stop(amd_manager); if (ret) return ret; - ret =3D amd_acp63_disable_sdw_manager(amd_manager); + ret =3D acp_disable_sdw_manager(amd_manager); if (ret) return ret; } @@ -1384,7 +1270,7 @@ static int __maybe_unused amd_suspend(struct device *= dev) case ACP70_PCI_REV_ID: case ACP71_PCI_REV_ID: case ACP72_PCI_REV_ID: - ret =3D amd_acp63_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE= _D3); + ret =3D acp_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D3); if (ret) return ret; break; @@ -1395,9 +1281,8 @@ static int __maybe_unused amd_suspend(struct device *= dev) return 0; } =20 -static int __maybe_unused amd_suspend_runtime(struct device *dev) +static int amd_acp63_sdw_suspend_runtime(struct amd_sdw_manager *amd_manag= er) { - struct amd_sdw_manager *amd_manager =3D dev_get_drvdata(dev); struct sdw_bus *bus =3D &amd_manager->bus; int ret; u32 val; @@ -1408,29 +1293,29 @@ static int __maybe_unused amd_suspend_runtime(struc= t device *dev) return 0; } if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) { - amd_acp63_disable_sdw_interrupts(amd_manager); + acp_disable_sdw_interrupts(amd_manager); cancel_work_sync(&amd_manager->amd_sdw_irq_thread); cancel_work_sync(&amd_manager->amd_sdw_work); - amd_acp63_sdw_wake_enable(amd_manager, true); + acp_sdw_wake_enable(amd_manager, true); ret =3D amd_sdw_host_wake_enable_by_rev(amd_manager, true); if (ret) return ret; ret =3D amd_sdw_clock_stop(amd_manager); if (ret) return ret; - amd_acp63_enable_sdw_interrupts(amd_manager); + acp_enable_sdw_interrupts(amd_manager); } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) { - amd_acp63_disable_sdw_interrupts(amd_manager); + acp_disable_sdw_interrupts(amd_manager); cancel_work_sync(&amd_manager->amd_sdw_irq_thread); cancel_work_sync(&amd_manager->amd_sdw_work); - amd_acp63_sdw_wake_enable(amd_manager, true); + acp_sdw_wake_enable(amd_manager, true); ret =3D amd_sdw_host_wake_enable_by_rev(amd_manager, true); if (ret) return ret; ret =3D amd_sdw_clock_stop(amd_manager); if (ret) return ret; - ret =3D amd_acp63_disable_sdw_manager(amd_manager); + ret =3D acp_disable_sdw_manager(amd_manager); if (ret) return ret; } @@ -1440,7 +1325,7 @@ static int __maybe_unused amd_suspend_runtime(struct = device *dev) case ACP70_PCI_REV_ID: case ACP71_PCI_REV_ID: case ACP72_PCI_REV_ID: - ret =3D amd_acp63_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE= _D3); + ret =3D acp_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D3); if (ret) return ret; if (amd_manager->wake_en_mask) { @@ -1459,9 +1344,8 @@ static int __maybe_unused amd_suspend_runtime(struct = device *dev) return 0; } =20 -static int __maybe_unused amd_resume_runtime(struct device *dev) +static int amd_acp63_sdw_resume_runtime(struct amd_sdw_manager *amd_manage= r) { - struct amd_sdw_manager *amd_manager =3D dev_get_drvdata(dev); struct sdw_bus *bus =3D &amd_manager->bus; int ret; u32 val; @@ -1473,7 +1357,7 @@ static int __maybe_unused amd_resume_runtime(struct d= evice *dev) } =20 if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) { - ret =3D amd_acp63_sdw_clock_stop_exit(amd_manager); + ret =3D acp_sdw_clock_stop_exit(amd_manager); if (ret) return ret; ret =3D amd_sdw_host_wake_enable_by_rev(amd_manager, false); @@ -1508,17 +1392,17 @@ static int __maybe_unused amd_resume_runtime(struct= device *dev) } } sdw_clear_slave_status(bus, SDW_UNATTACH_REQUEST_MASTER_RESET); - ret =3D amd_acp63_sdw_clk_init_ctrl(amd_manager); + ret =3D acp_sdw_clk_init_ctrl(amd_manager); if (ret) return ret; - ret =3D amd_acp63_init_sdw_manager(amd_manager); + ret =3D acp_init_sdw_manager(amd_manager); if (ret) return ret; - amd_acp63_enable_sdw_interrupts(amd_manager); - ret =3D amd_acp63_enable_sdw_manager(amd_manager); + acp_enable_sdw_interrupts(amd_manager); + ret =3D acp_enable_sdw_manager(amd_manager); if (ret) return ret; - amd_acp63_sdw_set_frameshape(amd_manager); + acp_sdw_set_frameshape(amd_manager); } switch (amd_manager->acp_rev) { case ACP63_PCI_REV_ID: @@ -1526,7 +1410,7 @@ static int __maybe_unused amd_resume_runtime(struct d= evice *dev) case ACP70_PCI_REV_ID: case ACP71_PCI_REV_ID: case ACP72_PCI_REV_ID: - ret =3D amd_acp63_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE= _D0); + ret =3D acp_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D0); if (ret) return ret; break; @@ -1537,6 +1421,176 @@ static int __maybe_unused amd_resume_runtime(struct= device *dev) return 0; } =20 +static int __maybe_unused amd_suspend(struct device *dev) +{ + return acp_sdw_suspend(dev); +} + +static int __maybe_unused amd_suspend_runtime(struct device *dev) +{ + return acp_sdw_suspend_runtime(dev); +} + +static int __maybe_unused amd_resume_runtime(struct device *dev) +{ + return acp_sdw_resume_runtime(dev); +} + +static int amd_sdw_hw_init_ops(struct amd_sdw_manager *amd_manager); + +static int amd_sdw_manager_probe(struct platform_device *pdev) +{ + const struct acp_sdw_pdata *pdata =3D pdev->dev.platform_data; + struct resource *res; + struct device *dev =3D &pdev->dev; + struct sdw_master_prop *prop; + struct amd_sdw_manager *amd_manager; + int ret; + + amd_manager =3D devm_kzalloc(dev, sizeof(struct amd_sdw_manager), GFP_KER= NEL); + if (!amd_manager) + return -ENOMEM; + + res =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) + return -ENOMEM; + + amd_manager->acp_mmio =3D devm_ioremap(dev, res->start, resource_size(res= )); + if (!amd_manager->acp_mmio) { + dev_err(dev, "mmio not found\n"); + return -ENOMEM; + } + amd_manager->ping_slave_stat =3D U32_MAX; + amd_manager->instance =3D pdata->instance; + amd_manager->mmio =3D amd_manager->acp_mmio + + (amd_manager->instance * ACP63_SDW_MANAGER_REG_OFFSET); + amd_manager->acp_sdw_lock =3D pdata->acp_sdw_lock; + amd_manager->acp_rev =3D pdata->acp_rev; + amd_manager->cols_index =3D sdw_find_col_index(AMD_SDW_DEFAULT_COLUMNS); + amd_manager->rows_index =3D sdw_find_row_index(AMD_SDW_DEFAULT_ROWS); + amd_manager->dev =3D dev; + amd_manager->bus.ops =3D &amd_acp63_sdw_ops; + amd_manager->bus.port_ops =3D &amd_acp63_sdw_port_ops; + amd_manager->bus.compute_params =3D &amd_acp63_sdw_compute_params; + amd_manager->bus.clk_stop_timeout =3D 200; + amd_manager->bus.link_id =3D amd_manager->instance; + ret =3D amd_sdw_hw_init_ops(amd_manager); + if (ret) { + dev_err(dev, "Failed to initialize hw ops (%d)\n", ret); + return ret; + } + + /* + * Due to BIOS compatibility, the two links are exposed within + * the scope of a single controller. If this changes, the + * controller_id will have to be updated with drv_data + * information. + */ + amd_manager->bus.controller_id =3D 0; + dev_dbg(dev, "acp_rev:0x%x\n", amd_manager->acp_rev); + switch (amd_manager->acp_rev) { + case ACP63_PCI_REV_ID: + switch (amd_manager->instance) { + case ACP_SDW0: + amd_manager->num_dout_ports =3D AMD_ACP63_SDW0_MAX_TX_PORTS; + amd_manager->num_din_ports =3D AMD_ACP63_SDW0_MAX_RX_PORTS; + break; + case ACP_SDW1: + amd_manager->num_dout_ports =3D AMD_ACP63_SDW1_MAX_TX_PORTS; + amd_manager->num_din_ports =3D AMD_ACP63_SDW1_MAX_RX_PORTS; + break; + default: + return -EINVAL; + } + break; + case ACP70_PCI_REV_ID: + case ACP71_PCI_REV_ID: + case ACP72_PCI_REV_ID: + amd_manager->num_dout_ports =3D AMD_ACP70_SDW_MAX_TX_PORTS; + amd_manager->num_din_ports =3D AMD_ACP70_SDW_MAX_RX_PORTS; + break; + default: + return -EINVAL; + } + amd_manager->max_ports =3D amd_manager->num_dout_ports + amd_manager->num= _din_ports; + amd_manager->port_offset_map =3D devm_kcalloc(dev, amd_manager->max_ports, + sizeof(int), GFP_KERNEL); + if (!amd_manager->port_offset_map) + return -ENOMEM; + + prop =3D &amd_manager->bus.prop; + prop->mclk_freq =3D AMD_SDW_BUS_BASE_FREQ; + + ret =3D sdw_bus_master_add(&amd_manager->bus, dev, dev->fwnode); + if (ret) { + dev_err(dev, "Failed to register SoundWire manager(%d)\n", ret); + return ret; + } + ret =3D amd_sdw_register_dais(amd_manager); + if (ret) { + dev_err(dev, "CPU DAI registration failed\n"); + sdw_bus_master_delete(&amd_manager->bus); + return ret; + } + dev_set_drvdata(dev, amd_manager); + INIT_WORK(&amd_manager->amd_sdw_irq_thread, amd_sdw_interrupt_thread); + INIT_WORK(&amd_manager->amd_sdw_work, amd_sdw_update_slave_status_work); + return 0; +} + +static void amd_sdw_manager_remove(struct platform_device *pdev) +{ + struct amd_sdw_manager *amd_manager =3D dev_get_drvdata(&pdev->dev); + int ret; + + if (pm_runtime_enabled(&pdev->dev)) + pm_runtime_disable(&pdev->dev); + acp_disable_sdw_interrupts(amd_manager); + cancel_work_sync(&amd_manager->amd_sdw_irq_thread); + cancel_work_sync(&amd_manager->amd_sdw_work); + sdw_bus_master_delete(&amd_manager->bus); + ret =3D acp_disable_sdw_manager(amd_manager); + if (ret) + dev_err(&pdev->dev, "Failed to disable device (%pe)\n", ERR_PTR(ret)); +} + +static const struct amd_sdw_hw_ops amd_acp63_hw_ops =3D { + .init_sdw_manager =3D amd_acp63_init_sdw_manager, + .enable_sdw_manager =3D amd_acp63_enable_sdw_manager, + .disable_sdw_manager =3D amd_acp63_disable_sdw_manager, + .enable_sdw_interrupts =3D amd_acp63_enable_sdw_interrupts, + .disable_sdw_interrupts =3D amd_acp63_disable_sdw_interrupts, + .set_frameshape =3D amd_acp63_sdw_set_frameshape, + .send_cmd_get_resp =3D amd_acp63_sdw_send_cmd_get_resp, + .wake_enable =3D amd_acp63_sdw_wake_enable, + .host_wake_enable =3D amd_acp63_sdw_host_wake_enable, + .set_device_state =3D amd_acp63_sdw_set_device_state, + .read_and_process_ping_status =3D amd_acp63_sdw_read_and_process_ping_sta= tus, + .process_wake_event =3D amd_acp63_sdw_process_wake_event, + .irq_thread =3D amd_acp63_sdw_irq_thread, + .update_slave_status_work =3D amd_acp63_sdw_update_slave_status_work, + .clk_init_ctrl =3D amd_acp63_sdw_clk_init_ctrl, + .clock_stop_exit =3D amd_acp63_sdw_clock_stop_exit, + .suspend =3D amd_acp63_sdw_suspend, + .suspend_runtime =3D amd_acp63_sdw_suspend_runtime, + .resume_runtime =3D amd_acp63_sdw_resume_runtime, +}; + +static int amd_sdw_hw_init_ops(struct amd_sdw_manager *amd_manager) +{ + switch (amd_manager->acp_rev) { + case ACP63_PCI_REV_ID: + case ACP70_PCI_REV_ID: + case ACP71_PCI_REV_ID: + case ACP72_PCI_REV_ID: + amd_manager->hw_ops =3D &amd_acp63_hw_ops; + break; + default: + return -EINVAL; + } + return 0; +} + static const struct dev_pm_ops amd_pm =3D { .prepare =3D amd_pm_prepare, SET_SYSTEM_SLEEP_PM_OPS(amd_suspend, amd_resume_runtime) --=20 2.48.1 From nobody Fri Sep 25 03:17:14 2026 Received: from DM5PR21CU001.outbound.protection.outlook.com (mail-centralusazon11011049.outbound.protection.outlook.com [52.101.62.49]) (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 19BD436F41C; Thu, 17 Sep 2026 09:06:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.62.49 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789635970; cv=fail; b=FjTSg0Ou3TmbFzJqUcUUZ3gKmw3X+29Lr38y0ZvwT76cGXFl29V8aBAG8FwX8zn8Bn8tsyeQDBsF1Mmyd+hbZsOwMgomk5OpuXOiHKhaKVujJiKDze1r0AAWfrWGMvRjWfBhWAxqejbVgSBhe5FkJC8FfRE20PGH+l+pK2vxstE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789635970; c=relaxed/simple; bh=inmCZD/bAPxwY79dm0Na1075YpZjKLjr0vwhZ0emzxQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fJyy54ajKDeKCFFDZ6Q1NqoJcgKivW+/tpVkkRb+ru5rrGLXQGgP1YWSJCHIkLMCw8fS4kQW4tC+bLwewGsHYx5SyGmNIGVvVbob7vi4GBs+cOj2yDRkpISdJxr5Qom6j25AMZ41vsDZXFbi32+WTqcoIO1q6CQ+uEZ6br+Bn3Y= 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=ftnlHa3d; arc=fail smtp.client-ip=52.101.62.49 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="ftnlHa3d" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Y7bMSyh28TwIllD44mPNAFrsqeTCo3gi2arMZd2BPCzWvK4Kp2q84GOU1LWzNTSAv65WUUpKldw68yzcGpD3TWgNL/yHa1A8J73n8IgiB2D2KsPYHhimnaWjDlQoaI8zJkh7JRXOYtAN51uwzkYP+kPjQS1C98NRNiRX8YWQ1wTeiCC/yDOy0OJUUeGYNbE+vLDXCu+XGEqHjk9pgT5UzwAI8wUWeGcXqDUaDbj3xO2jiSJ7VOxK0wJSK41zrB+1vH1iOuhGnRBH2WHYEBnxLHEtjD4L16Yx3nULS7O3Y/OdBkEH2ANleU81wuNwnIFBZr1bKZmjwkhqfrc+yTwtSQ== 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=ythecsojjHVRfZtH8zEVJ9w+aIjT8oQkUtP4G2ZGwrc=; b=Od8YgRLf0CGfoATqXX2YMEANhSTyQqq75oVZ3z82UEVF5FbCoYsMiCWb9iyS/G9Jq+kdsVE8q71h0ORap3/zfO2234U2/Aevu3+9bef0RUJ/eKELdXXjnF2IB7nwjuQ4WvZzU5WXfRlV4cuqqqWzRG6QWQOQwFOkzKL88JRb16W6s5SV/W41t4mXv3/x21JzuPlKlIkpp3JmHns7/HCXsJiBTH7d/vcZyqLOE32+cm2DbXMNPUPKTq5Fa0LxFz5xu0x9e9kmsbRO0s1I+xdPeNy/fJhipMBxXT5eqR47Q67uSOpJ1nGiCZEac8j4rZ7858VdJVyee0o5pvPPOkg5uA== 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=ythecsojjHVRfZtH8zEVJ9w+aIjT8oQkUtP4G2ZGwrc=; b=ftnlHa3dbG2JxsgUOxKBAyEKJ5RLFaAuFYChaLJAcPBtUVl73i9EPdqxwE9wrGTEjBLFmKxXYcMOUxZJhVNAeW5ZLMfWtd8MHaYYoWTB1WAe6CNMedPQe28dY6W3vob5uulh+3moGLDwgNVgJQHyDy+PptcUNHHoepp+P5way4I= Received: from BY5PR03CA0011.namprd03.prod.outlook.com (2603:10b6:a03:1e0::21) by PH8PR12MB6796.namprd12.prod.outlook.com (2603:10b6:510:1c7::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.9; Thu, 17 Sep 2026 09:06:00 +0000 Received: from SJ1PEPF00002316.namprd03.prod.outlook.com (2603:10b6:a03:1e0:cafe::9a) by BY5PR03CA0011.outlook.office365.com (2603:10b6:a03:1e0::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.360.13 via Frontend Transport; Thu, 17 Sep 2026 09:06:00 +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 SJ1PEPF00002316.mail.protection.outlook.com (10.167.242.170) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Thu, 17 Sep 2026 09:06:00 +0000 Received: from satlexmb10.amd.com (10.181.42.219) 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.49; Thu, 17 Sep 2026 04:05:56 -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.49; Thu, 17 Sep 2026 04:05:55 -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.49 via Frontend Transport; Thu, 17 Sep 2026 04:05:52 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , "Vijendar Mukunda" Subject: [PATCH 9/9] soundwire: amd: consolidate revision-specific probe setup Date: Thu, 17 Sep 2026 14:32:57 +0530 Message-ID: <20260917090407.3828816-10-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20260917090407.3828816-1-Vijendar.Mukunda@amd.com> References: <20260917090407.3828816-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: SJ1PEPF00002316:EE_|PH8PR12MB6796:EE_ X-MS-Office365-Filtering-Correlation-Id: 55f18229-3814-4ee6-fde6-08df149ae49a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700016|82310400026|376014|23010399003|18002099003|22082099003|10067099003|11063799006|56012099006; X-Microsoft-Antispam-Message-Info: AqxVN8oW7dYkGdB8Qv9zzpKblo17UKqZjE2wWulkVTsZ0kFbDKS1V+fB2vbgiNOyiY88O9i+Kf1NIz8DMhYyJvkqeC7XIKiIN+0+toLzM5j2iEdniRl7PuGN8dd8uK69iQV+FmmyJW9z1bt6reiaZ/6OIx7nD9/THpISXISncp4rpIE9a8p9s1e6Md5P2GZ9oSxaggZnZmVo75uYtPorVlsBnBSq2BmTsIaHbjWVHpkkY8LBkTs2HakcseeYIoL4GHcNrPkZMWbWLeJbAUPomFBBJwFFVjivfEKMSDRno/l37kh7ACxxf5l4ddgjhGLDXgmr6s8XyNY3NxvmbI4EjCyWi+IZ57uBSWyh/DbrvKDMvW4XTKGuYtXARvTZV6uhTGuNFeQFAhWmPOPoZQdHAaeMMwW3Ab43GjdvALxElyY7V9wcK/iOfs2lVfcCSI1K/nNsOT35w2M8d+esrK6uwURLKSbUeOmJDJ358e+jrxrgCVUfF8ozBwuHppwL/UYcqGJPspJdXaZk5+Cb5zLB+6UTyFge/EgmcSuM4l9gCElgdF+nBtJV8/NrsRzkkmd5a4jfLHXznWhTWUtG/r8s2kQK+3Ad+dpp44fmJ2fjhFpVV0E0QidkYwhzW0EYlW2NBhn0lpcnKFUfv4ao3K3Z/M8DdW4UYOQzFlhsx0MpVaeh2t7CaRKPc/DTJvpqHs4Rns6hQo84kVCodcSoI3wiJw== 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)(1800799024)(36860700016)(82310400026)(376014)(23010399003)(18002099003)(22082099003)(10067099003)(11063799006)(56012099006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XhPbbjCeq2LQWZIXAhItxi8w1Mt6EecBYAH0KyK/u5BVQ73WLlOZS7bD0vfHnkW7gWgP2Znub4CbrYIoWqlhGSUUfSwBszsp4esNjTpiPoYT6FsAzQ0xohngSrdkwJzcLSjOZPpmcuZ7difhTkx5b0Z+hJltC+RYi+OMo1ICAZiEH3gVPgLcpt4kDwbRFiHnAnAZfn6xBf+0uygGWS8j9ZoyIfJ7M6rZqSte7+09bDUcXnmq6hd5KSYGxXDa1LYIgbRW4BZLlFxi2dkYQXhQV3tC7ag7966u+VpZP/4QZVUUinSRKR8dLpWPUD0m9TaYHDRaDXKUqEldYRNT+BQBke2GeFF/d+hGCPjD6cqdqwxjUTob9wS4MWnBVTveCA82PAZQPggSJVNahcda4V2KOYYYnHyuuPaztMQy+LVL+3O2a/XB3T3KedE4UKH8uegx X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2026 09:06:00.1817 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 55f18229-3814-4ee6-fde6-08df149ae49a 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: SJ1PEPF00002316.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6796 Content-Type: text/plain; charset="utf-8" Determine port counts first via a switch on acp_rev, compute max_ports, then consolidate all remaining revision-specific assignments (mmio offset, bus ops, port ops, compute_params, and port_offset_map allocation) into a single second switch. Both switches reject unknown revisions with dev_err() and -EINVAL, keeping each switch self-contained so an incomplete addition of a new revision is caught at whichever switch it is missing from. cols_index and rows_index are no longer initialised at probe time; acp_sdw_clk_init_ctrl() sets them from the actual bus clock and frame shape before amd_acp63_sdw_set_frameshape() is ever called, so no early initialisation is needed. Signed-off-by: Vijendar Mukunda --- drivers/soundwire/amd_manager.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manage= r.c index 834e943b040b..c660f4c8d0e6 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -1462,16 +1462,9 @@ static int amd_sdw_manager_probe(struct platform_dev= ice *pdev) } amd_manager->ping_slave_stat =3D U32_MAX; amd_manager->instance =3D pdata->instance; - amd_manager->mmio =3D amd_manager->acp_mmio + - (amd_manager->instance * ACP63_SDW_MANAGER_REG_OFFSET); amd_manager->acp_sdw_lock =3D pdata->acp_sdw_lock; amd_manager->acp_rev =3D pdata->acp_rev; - amd_manager->cols_index =3D sdw_find_col_index(AMD_SDW_DEFAULT_COLUMNS); - amd_manager->rows_index =3D sdw_find_row_index(AMD_SDW_DEFAULT_ROWS); amd_manager->dev =3D dev; - amd_manager->bus.ops =3D &amd_acp63_sdw_ops; - amd_manager->bus.port_ops =3D &amd_acp63_sdw_port_ops; - amd_manager->bus.compute_params =3D &amd_acp63_sdw_compute_params; amd_manager->bus.clk_stop_timeout =3D 200; amd_manager->bus.link_id =3D amd_manager->instance; ret =3D amd_sdw_hw_init_ops(amd_manager); @@ -1510,13 +1503,30 @@ static int amd_sdw_manager_probe(struct platform_de= vice *pdev) amd_manager->num_din_ports =3D AMD_ACP70_SDW_MAX_RX_PORTS; break; default: + dev_err(dev, "unsupported ACP revision: 0x%x\n", amd_manager->acp_rev); return -EINVAL; } amd_manager->max_ports =3D amd_manager->num_dout_ports + amd_manager->num= _din_ports; - amd_manager->port_offset_map =3D devm_kcalloc(dev, amd_manager->max_ports, - sizeof(int), GFP_KERNEL); - if (!amd_manager->port_offset_map) - return -ENOMEM; + + switch (amd_manager->acp_rev) { + case ACP63_PCI_REV_ID: + case ACP70_PCI_REV_ID: + case ACP71_PCI_REV_ID: + case ACP72_PCI_REV_ID: + amd_manager->mmio =3D amd_manager->acp_mmio + + (amd_manager->instance * ACP63_SDW_MANAGER_REG_OFFSET); + amd_manager->bus.ops =3D &amd_acp63_sdw_ops; + amd_manager->bus.port_ops =3D &amd_acp63_sdw_port_ops; + amd_manager->bus.compute_params =3D &amd_acp63_sdw_compute_params; + amd_manager->port_offset_map =3D devm_kcalloc(dev, amd_manager->max_port= s, + sizeof(int), GFP_KERNEL); + if (!amd_manager->port_offset_map) + return -ENOMEM; + break; + default: + dev_err(dev, "unsupported ACP revision: 0x%x\n", amd_manager->acp_rev); + return -EINVAL; + } =20 prop =3D &amd_manager->bus.prop; prop->mclk_freq =3D AMD_SDW_BUS_BASE_FREQ; --=20 2.48.1