From nobody Sun Feb 8 05:20:01 2026 Received: from CH5PR02CU005.outbound.protection.outlook.com (mail-northcentralusazon11012004.outbound.protection.outlook.com [40.107.200.4]) (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 9F8E11ADFE4; Thu, 29 Jan 2026 06:15:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.200.4 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769667341; cv=fail; b=InuPwX9tgY2z+/j71DWaYOqTsrmGcaboc7cneJSHIx8akOx9Mctln7SHfM6DmAcEjjAFI8OgMYDVQ9F6kL7+XU/nm768sIUcP56x9bJX/LjA+YkC2//5zG3gacnpmCxp00gPB44asjzZSesITmXblEvgS8eAB9gH+UqxIYsnVhA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769667341; c=relaxed/simple; bh=aLR5bxqVbDcOV6YWuW1zFfP75Ll/HqJXB53ht+pUbI8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=aPbyMi4QhP+xlKp0zK+WR4zZM8Pij3urJ9I3TeXGNibxpLWJt6CqpUtdy703arDBIk0mEEBlg489rJ7W4yJYjnVieyI2dy4Hm/CMrgyysA5OyI16o3yb8t56XSro+EzP64Mpwb04R6h/kgHg1I443+9ScpZ+b/0xPFh1kEUfJzg= 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=jX7YCf+a; arc=fail smtp.client-ip=40.107.200.4 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="jX7YCf+a" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hd7ZFjKNMefHpK0vsXTFnfB5ZINXd/b4DdtoDwYe75tLPsd6OepC5BuRWOMTYQIigHL3PhsBYnbvX5csVuCoq/ROab+4AKpR0DSXc2z56IFNp+Rkj9+oy3nVHh/WVYfEyQnFYs7Cln6jv2VOH6arVJIPIIFy3oAEvVYBlha5gRuqbi1zo+b/VKOfN2/+MpIBrpZ3Lj9KYGQIrg/8NSQZAq7Sv9o0aEo2F0QAc71AInw5d36iFSiXm/KzOSce9qNH5JllSvrDRvqfuUtNl/qEDTXDawzr1LuHoYPpmEt4xBQG1AJu0jZYvlwwrvsfvftQSYQspTVlWNU74UnAsrI7jg== 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=i9iPDOTCuvhm0fhy2mUCWaVYq1efaXSGAJejGzoRnt0=; b=SLmNTeF6/lef5sn6JzVazP4iIRrQPuFO9KpSrM8JU4XWJN57BP4kJ0uoecbjPezy/R6GDOo5gmlHlcXI0aOCiOtbLQxoU4R7vUrqC858x5YMI+6ks7GU/r81M51QwhVEzZYlIGgHdFvF/FGyzyW16/wXLiy+YZAHrDh54w7R0MSUclVbSL71kBAcbHRenEVFbY15XHd6EBUhz+BCgpJ9SYbDbj60/roOwXIjgjZPojerbRxmlfwb81OSj863RhfaeiTavXTXwzvccoN8TRjUaDQOgpvDhZAPSy8o+sbORBOuhPX836eQXEv9Lkc3dpjcHJBBxBUnE4BXzqmX8mCgNg== 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=i9iPDOTCuvhm0fhy2mUCWaVYq1efaXSGAJejGzoRnt0=; b=jX7YCf+ayoYvIUaa+lKq0J8OXR9eS8DWvHTXxPVMvnJeHAme3kSN4rSN8Dl6Cu/nWx4yn5WNxaS/lYBK/YNlPPljQo7HS1NHaorOdD3VGsQPasniS+lblGonge5aFGtoU69ZQMWo/Lxlj4xCA7MQMU51aPlZahhdWEGN+q7zWWM= Received: from BN9PR03CA0910.namprd03.prod.outlook.com (2603:10b6:408:107::15) by DS2PR12MB9749.namprd12.prod.outlook.com (2603:10b6:8:2b9::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9542.15; Thu, 29 Jan 2026 06:15:35 +0000 Received: from BN3PEPF0000B074.namprd04.prod.outlook.com (2603:10b6:408:107:cafe::6c) by BN9PR03CA0910.outlook.office365.com (2603:10b6:408:107::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9564.8 via Frontend Transport; Thu, 29 Jan 2026 06:15: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 BN3PEPF0000B074.mail.protection.outlook.com (10.167.243.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9564.3 via Frontend Transport; Thu, 29 Jan 2026 06:15:35 +0000 Received: from vijendar-linux.amd.com (10.180.168.240) 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.17; Thu, 29 Jan 2026 00:15:32 -0600 From: Vijendar Mukunda To: CC: , , , , , , , Vijendar Mukunda Subject: [PATCH v4 1/2] soundwire: amd: add clock init control function Date: Thu, 29 Jan 2026 11:44:11 +0530 Message-ID: <20260129061517.38985-2-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20260129061517.38985-1-Vijendar.Mukunda@amd.com> References: <20260129061517.38985-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-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN3PEPF0000B074:EE_|DS2PR12MB9749:EE_ X-MS-Office365-Filtering-Correlation-Id: 0c3845de-9864-4d34-ffac-08de5efdd0b6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ZfqSLE6yMTqUWRt63VBNQsDFVByRNsMMnni+jGBMDZbfkqfX5WgJCzSP/e5E?= =?us-ascii?Q?l5w67r7JHcFxgNi/esPX62tgEVIy4L8aYuLWcdPPBH3wLScH9yY5m8dP9Ck7?= =?us-ascii?Q?+vdSD4R5XfxbSjI9JJo+H9vpI+1+/b3CIbsEcASSjxpYZPmuzkKwrOipS2hl?= =?us-ascii?Q?8cNPquspgWJrF8nCdAdumD9Cu5/86c7liD55pz2fhi07SIkdMITyAjZ0czje?= =?us-ascii?Q?SVPAcvEfWgfeguA6/mtYpSUSkUMi36jiTFX6iOVN62zn024M6gRfQlZVwsfg?= =?us-ascii?Q?sQ+ms1/iNmEPKfNLOd3/syTyQ6L3lwvrJTEurGGxlGKaci6AM4kzMX+FmFt3?= =?us-ascii?Q?CNap+X3GgDmK2SM00RD55sbgFPaaGYLk3GLurRtXY2Vvyrc/hfNl8Ndqkeag?= =?us-ascii?Q?CZ8KCgp7AB2JUPTrxJ0bxouTYLifW/BgNPnOC0rkFUA911an12NNIidxyJ1R?= =?us-ascii?Q?2LMIO71C5PfDgfzWAWU63bpkOJfn2iefdrPx7haQMP5qcJe4F0sLl5TMpNzq?= =?us-ascii?Q?JICgh7J2M327iP8VI5/YiUsMrHcBaZItkakpRtU1lhmf3kz1RVWR33i/nPuy?= =?us-ascii?Q?2LT3VrRY8Rwb8oCrZlTtcmf3yqoArcgjWR5xUiG2Um6uiRlvScSDxAjVG2+I?= =?us-ascii?Q?kIT7Qd16fzHSaZyz3nbi+D7mX1jwdUSH0Pjaku+j9MR3o85sBYG+UVgviLrP?= =?us-ascii?Q?B1hGmteaAaTH7ZOmj/zpwWB3moGoyPUyEpmXd0Zu/+Nw94mYrEt2oU3tgcH2?= =?us-ascii?Q?efxmxn2UwfGH8WgBvWlULYQXaRje3LU0FhP7IVr7TFl4RqqaLwdpwWS6FQlT?= =?us-ascii?Q?VOcICkwAp9/uJ7gxr0yd/BZe47Lz31ckizlTq55QPvviogy72r6xs8qATllr?= =?us-ascii?Q?70/5WQrbyYzXaD3i6Z//v9A+9CRg/eyXzwWGtz//pNi9BToFcAaNgbVPMgDE?= =?us-ascii?Q?Us4aZxAXxK9xjbg3oWRJDP26YuMQxi1zSOy5SEJIHB6SHGm8cAyhO96Qsu9P?= =?us-ascii?Q?u/sSyZdfWA/tSFoKOikSMEz/PxWqQIGdKeHc+O5/TjRmaYAKk7wLKid0PR/C?= =?us-ascii?Q?X7ar9oN734X+z1/VUsw2eHTFfhcXQviCDEaicpWjC3N5DHc9q4UHWp1rmDAu?= =?us-ascii?Q?xBujxlGNQ5M+eDcrWG5fAjn5Phpc+HjgBEZ7yNkUVk2sDWBuS0zemUr9Sc1P?= =?us-ascii?Q?xzPHRXsRqsySLxCuFPz96kan9je5G9PumrYYNCJ/LxyiUeXr3ny2sF0P4JAU?= =?us-ascii?Q?E4Wq78k742MhCmjhuSYi/kbNGU6y8u9qknhKAf7tOqohry5ivA+1+d3aPEry?= =?us-ascii?Q?0B+BIEmSwDH1npI+8o+HsncnctAiRu506dIxT5LIYATfe9FvET5P6f2O12b4?= =?us-ascii?Q?MZuvGb31ZP/v1eKAs5Eh5uYjfsV/ZqDuqL3VdEXZ7GBAMKQDh/ACnp9OjATx?= =?us-ascii?Q?CNedmNQvP5O0oY8pMurpu5k3zEYdAP0PbbEzJHpfSJP7Mlw0nrlTOr5mh3ak?= =?us-ascii?Q?+dFdqdP+nayzX7jZdbkRSsKy4//kdB2QpWbXujbVLALUfd6YSaPQ5RzzhlCu?= =?us-ascii?Q?JGt6f5w8Kd13NyI/mfYQKJIsLtRJX3mv3hREtbE3tVrepJDNw+1KJlHsex23?= =?us-ascii?Q?2JAKYr6Jba1y+dZdHJMgDMhFsj0L3C9q1KwtKm6eqFN+tweHsyUUlWGvUEBt?= =?us-ascii?Q?rfmdmg=3D=3D?= 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)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2026 06:15:35.3344 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0c3845de-9864-4d34-ffac-08de5efdd0b6 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: BN3PEPF0000B074.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS2PR12MB9749 Content-Type: text/plain; charset="utf-8" Add generic SoundWire clock initialization sequence to support different SoundWire bus clock frequencies for ACP6.3/7.0/7.1/7.2 platforms and remove hard coding initializations for 12Mhz bus clock frequency. Signed-off-by: Vijendar Mukunda Reviewed-by: Mario Limonciello (AMD) --- drivers/soundwire/amd_manager.c | 52 ++++++++++++++++++++++++++++----- drivers/soundwire/amd_manager.h | 4 --- 2 files changed, 45 insertions(+), 11 deletions(-) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manage= r.c index 5fd311ee4107..b53f781e4e74 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -27,6 +27,45 @@ =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) +{ + struct sdw_bus *bus =3D &amd_manager->bus; + struct sdw_master_prop *prop =3D &bus->prop; + u32 val; + int divider; + + dev_dbg(amd_manager->dev, "mclk %d max %d row %d col %d frame_rate:%d\n", + prop->mclk_freq, prop->max_clk_freq, prop->default_row, + prop->default_col, prop->default_frame_rate); + + if (!prop->default_frame_rate || !prop->default_row) { + dev_err(amd_manager->dev, "Default frame_rate %d or row %d is invalid\n", + prop->default_frame_rate, prop->default_row); + return -EINVAL; + } + + /* Set clock divider */ + dev_dbg(amd_manager->dev, "bus params curr_dr_freq: %d\n", + bus->params.curr_dr_freq); + divider =3D (prop->mclk_freq / bus->params.curr_dr_freq); + + writel(divider, amd_manager->mmio + ACP_SW_CLK_FREQUENCY_CTRL); + val =3D readl(amd_manager->mmio + ACP_SW_CLK_FREQUENCY_CTRL); + dev_dbg(amd_manager->dev, "ACP_SW_CLK_FREQUENCY_CTRL:0x%x\n", val); + + /* Set frame shape base on the actual bus frequency. */ + prop->default_col =3D bus->params.curr_dr_freq / + prop->default_frame_rate / prop->default_row; + + dev_dbg(amd_manager->dev, "default_frame_rate:%d default_row: %d default_= col: %d\n", + prop->default_frame_rate, prop->default_row, prop->default_col); + amd_manager->cols_index =3D sdw_find_col_index(prop->default_col); + amd_manager->rows_index =3D sdw_find_row_index(prop->default_row); + bus->params.col =3D prop->default_col; + bus->params.row =3D prop->default_row; + return 0; +} + static int amd_init_sdw_manager(struct amd_sdw_manager *amd_manager) { u32 val; @@ -961,6 +1000,9 @@ int amd_sdw_manager_start(struct amd_sdw_manager *amd_= manager) =20 prop =3D &amd_manager->bus.prop; if (!prop->hw_disabled) { + ret =3D amd_sdw_clk_init_ctrl(amd_manager); + if (ret) + return ret; ret =3D amd_init_sdw_manager(amd_manager); if (ret) return ret; @@ -985,7 +1027,6 @@ static int amd_sdw_manager_probe(struct platform_devic= e *pdev) struct resource *res; struct device *dev =3D &pdev->dev; struct sdw_master_prop *prop; - struct sdw_bus_params *params; struct amd_sdw_manager *amd_manager; int ret; =20 @@ -1049,14 +1090,8 @@ static int amd_sdw_manager_probe(struct platform_dev= ice *pdev) return -EINVAL; } =20 - params =3D &amd_manager->bus.params; - - params->col =3D AMD_SDW_DEFAULT_COLUMNS; - params->row =3D AMD_SDW_DEFAULT_ROWS; prop =3D &amd_manager->bus.prop; - prop->clk_freq =3D &amd_sdw_freq_tbl[0]; prop->mclk_freq =3D AMD_SDW_BUS_BASE_FREQ; - prop->max_clk_freq =3D AMD_SDW_DEFAULT_CLK_FREQ; =20 ret =3D sdw_bus_master_add(&amd_manager->bus, dev, dev->fwnode); if (ret) { @@ -1348,6 +1383,9 @@ static int __maybe_unused amd_resume_runtime(struct d= evice *dev) } } sdw_clear_slave_status(bus, SDW_UNATTACH_REQUEST_MASTER_RESET); + ret =3D amd_sdw_clk_init_ctrl(amd_manager); + if (ret) + return ret; amd_init_sdw_manager(amd_manager); amd_enable_sdw_interrupts(amd_manager); ret =3D amd_enable_sdw_manager(amd_manager); diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manage= r.h index 6cc916b0c820..88cf8a426a0c 100644 --- a/drivers/soundwire/amd_manager.h +++ b/drivers/soundwire/amd_manager.h @@ -203,10 +203,6 @@ #define AMD_SDW_DEVICE_STATE_D3 3 #define ACP_PME_EN 0x0001400 =20 -static u32 amd_sdw_freq_tbl[AMD_SDW_MAX_FREQ_NUM] =3D { - AMD_SDW_DEFAULT_CLK_FREQ, -}; - struct sdw_manager_dp_reg { u32 frame_fmt_reg; u32 sample_int_reg; --=20 2.45.2 From nobody Sun Feb 8 05:20:01 2026 Received: from DM1PR04CU001.outbound.protection.outlook.com (mail-centralusazon11010003.outbound.protection.outlook.com [52.101.61.3]) (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 BCF093783BE; Thu, 29 Jan 2026 06:15:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.61.3 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769667344; cv=fail; b=ZVqT8S/do8SMJHBb1bPq+ANfo8tzIjPdq52+rIrQ4GCA9NUdM+q60frt4UKQJRbxrFo3F07dBhp0cnSsN6iYdU3j5dwwFFpa656AkMjhXOkRvDt0D/ITqlYCpPamy7KOS7uY2DnAmbyvq70zVidIXSq4mXnttV4ENzi0M1lUhw0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769667344; c=relaxed/simple; bh=ddgLbVSZv3vu4OIu2GSoQ6ANt+YypugL8V/iBWhbVDI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PZMmXktzH2dT2XO5Oori8ynQhcDC1oimBvNNcvZshM3jtoFW6qxKU6dWILFaYBZMndUfOgFcXGhwDRvzduwtrOjEjbKA0R4pQCVGP/D8ExrLrzOdrtM2EAIoyz5QzuGqiy6cK1mVSG33+M3fvpKIFXMjeqBKzAYi9vG7uVOvf3s= 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=qoSQHtdm; arc=fail smtp.client-ip=52.101.61.3 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="qoSQHtdm" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=y2nP8u9Tx/QEtl1POft4iIYYAIts98bz7vEl682FroGVNG6igrD0+1Si0Dfx6Fw4sQOGEsyD+AQ1cZ6ksdSvZWOaTqq6hhmV2Bic2sqLWtIQYRtcA2d+++MXuPQ1nbqnWZ7Zh0PQhzIT1xPdkmGFNRJCX09agxR61zSjdN4XGrzWHO78hjmrScen2VkdBjOhw02vRulp5wGcwjgmeTZqYXOPC3UHqMmQjhipnqoWUAOUCVFXxlnA9P9vHsqSTrJzQEBWqZNW+nI1nDa2elf1mizh+ukY4z14sEFc11ELiErCV1SM+EXCcetrPMmAD5CkOkU6ycIsjPugArMnehEkyg== 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=1l/FKxjSRqkWYqBi3J/UFhnbfL7M+wJFMnxzn88r/0U=; b=r2TrPnhyOhdvTOpxwN5CZ6OsMs/ej45c8XdXixv8D8kmrOZgLZZ3VaYCwUmk++MTe/McWYrIolFOe1D2m1b+22rKkQThJBNAhl/De0vVz1HZyZNXNyWdJ9iwzvyFip9CV3806yHCyXs+BGGqKCtdTUxQbh+4Y9ZeKx9Mm6DmjiDVnxiguuKKvCXxYhqRZwJPExY5rFvwOwAnkyBI1tX/uixwKFttphcWfiGO6HMoytiYrRKsv1P9RxpIjX4sZ0pBTi/FNOy3eoHqv3WK0RvUl75mAOJtslRpabJO5tFiuR+XkY9Wmlq5BKkrg3W6yLEaIXdK3v0sNmkcBUyBjzfkjA== 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=1l/FKxjSRqkWYqBi3J/UFhnbfL7M+wJFMnxzn88r/0U=; b=qoSQHtdm1bWmQmx7QCqca0ji2722esISzAMY+6H90taoeCLqaabjdHI8fhYeXNB8uw6+1Wdh77KluGjc769N0WzcCtPfIsw2Msc1XPvuWnW8F3xw6eQa6IwcoKDNwNC4hfx+e+ThS6YqTDstesU0s/MSI7GRqruvPaSDZsv/OIY= Received: from BN9PR03CA0257.namprd03.prod.outlook.com (2603:10b6:408:ff::22) by LV2PR12MB5845.namprd12.prod.outlook.com (2603:10b6:408:176::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9564.10; Thu, 29 Jan 2026 06:15:38 +0000 Received: from BN3PEPF0000B071.namprd04.prod.outlook.com (2603:10b6:408:ff:cafe::67) by BN9PR03CA0257.outlook.office365.com (2603:10b6:408:ff::22) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9564.10 via Frontend Transport; Thu, 29 Jan 2026 06:15:21 +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 BN3PEPF0000B071.mail.protection.outlook.com (10.167.243.116) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9564.3 via Frontend Transport; Thu, 29 Jan 2026 06:15:37 +0000 Received: from vijendar-linux.amd.com (10.180.168.240) 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.17; Thu, 29 Jan 2026 00:15:34 -0600 From: Vijendar Mukunda To: CC: , , , , , , , Vijendar Mukunda Subject: [PATCH v4 2/2] soundwire: amd: refactor bandwidth calculation logic Date: Thu, 29 Jan 2026 11:44:12 +0530 Message-ID: <20260129061517.38985-3-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20260129061517.38985-1-Vijendar.Mukunda@amd.com> References: <20260129061517.38985-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-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN3PEPF0000B071:EE_|LV2PR12MB5845:EE_ X-MS-Office365-Filtering-Correlation-Id: 4e2d5323-9fed-4683-665f-08de5efdd231 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?4R62b9braBjarRFCw0dKOgsqhSiR8TOnRZePqoOdMCUz6IrTilBLNvcDeg/V?= =?us-ascii?Q?cQeeaRMpnS8TjjDZwkb239+uW7NzEsk1VfETl3WeeDPdOL1fgxgdcv35rZwc?= =?us-ascii?Q?F7XkmZknXfTkgqnglCvQqdKA9XwigESoBx4pgGBQVaJoEwhKJjHM179rt59g?= =?us-ascii?Q?qy3fnkZrdCYIF55RJN1GHLR9v73Ro3STcwVok3wjIaCIxBm17W4oBXDcVXlG?= =?us-ascii?Q?22uiRkmFrNk8xLbD+eXI/Gf64jOWokI2zIxzyqSgm8R4dao2/mNSJeHA6syO?= =?us-ascii?Q?WMEpFvgcEU64UvQBZvHyl4UZlsWz1i/CG5epXf+3E6ObDBCo4Y9+/Y/tYdnY?= =?us-ascii?Q?NB2LXlnqsL24Zfr4A9zprbsn1J9amQe7+E0vIoU3UPXDuAmn4u9KJULKWjuc?= =?us-ascii?Q?nmd2uIaUz4R3uvGmKUOcsS9BY6mGHduOTnOpAfHStD3Kf8YTsQ9zZVSCKIuH?= =?us-ascii?Q?zydOQbGjFyFQE9YUjljbb9PZ7pa0yDv8GQk8z7xgo9KWNUzQL9uJrVYfJSui?= =?us-ascii?Q?XMh7ooXQNQ6SmY4AYkAs2t6eKHc3wmB2IGCZVtnjffk3UdgPsG/SZ2UbzZbv?= =?us-ascii?Q?Vw/g+cL6RHsEHEpeaHW8VIT7/nHqpQqZtkb5L9J6sZduXT61S4gu4N7nU3Wr?= =?us-ascii?Q?ifdXAtoQLzqQcmaF1c0UaBYwNI5HMQyvTFkB5TB2YvWr4dzGbmtZruaN3ndb?= =?us-ascii?Q?1o+oPc5+LTtQUxloEDT8W6vnYk+ANPm8D/c5WY3p/WR4hVSvBlII6j7agWZd?= =?us-ascii?Q?764gNZjIdQNYBuHhgbpdZvo5aiIrf3gDxUH57HHB6y4CSMufIp7Ey10Bsb/y?= =?us-ascii?Q?A8OWeUumIjj8TFqhpIha0YyxZ+Z2iByXaNYZm5crR480x9Xv5Dm2jcHZkmvj?= =?us-ascii?Q?LuTbAEdoGLC0TkK/f/3WlisC3TP5xKqbL5JOCqfrBLsrI9Z2oWSQyFERS9ej?= =?us-ascii?Q?rhiJnsysSOf3RuiXwF87u1wOy24FCeXcti0Xb6cOqX4HNkMnD2q/H2xPycH2?= =?us-ascii?Q?PhPAkUv685tCtJpHYAi7quX+0tIT0mu2tn22XbCp4iRdrxsH/hZLwCFctRhP?= =?us-ascii?Q?RAoyzEibjGDRVZ63y1mdtJIKseIzy5dT9agyWNl1Mg1xBO+E79az+1XUoSkm?= =?us-ascii?Q?hIulauaydBCGi0lhUq3kOvr1qWCiIbf8fulzD4pZnCXsHadlhhoT52UFy71d?= =?us-ascii?Q?w9OCwsxAMAmMkU9sr1ae0aU67nFc61Ee/ycm5muJAf7mg4jNwJV9My1DNSup?= =?us-ascii?Q?3+BOqqyMmEkXlHem5X+JWtoQaOPlsVXK5GEroYFDMhC+rLvEz5UikjK8v5hW?= =?us-ascii?Q?tivbaKV00A8dKzG1rf7FUyaBAzM3jrNMADi2e2/NPnLs6pO7yB3F+vQuHRt4?= =?us-ascii?Q?jQGQPZfQazuSUKxslY7tI5jy/lnTFzdrCN/dgyZ7Mu7VQvx8qoHnPf7j9hsw?= =?us-ascii?Q?S14y5Exyipc5URM1Nl1zVT0dzQgViJoAhjuDcRiidqQFO11JgsDSrmdTWWq/?= =?us-ascii?Q?Zk67iFAsI0Gl5tkcffTgXQQReErezO/qIAAOIej0QDlUvzHhUUVgiKuEuAsm?= =?us-ascii?Q?uWWVAR27HfDWUei7RCSEWIXU7DmLR7q5HhTRAkBm+/v1v9aI+on7cfxJQs+Q?= =?us-ascii?Q?HnVWOaFWLYMtPEHGwfzkzD4CihyEZUKFRg8GAc5eAnfE92/B5R8TCYIZqLNH?= =?us-ascii?Q?DiaDkg=3D=3D?= 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)(82310400026)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2026 06:15:37.8176 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4e2d5323-9fed-4683-665f-08de5efdd231 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: BN3PEPF0000B071.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB5845 Content-Type: text/plain; charset="utf-8" For current platforms(ACP6.3/ACP7.0/ACP7.1/ACP7.2), AMD SoundWire manager doesn't have banked registers for data port programming on Manager's side. Need to use fixed block offsets, hstart & hstop for manager ports. Earlier amd manager driver has support for 12MHz as a bus clock frequency with frame size as 50 x 10 with fixed block offset mapping based on port number. Got a requirement to support 6MHz bus clock frequency with different frame shapes 50 x 10 and 125 x 2. For current platforms, amd manager driver supports only two bus clock frequencies(12MHz & 6MHz). Refactor bandwidth logic to support different bus clock frequencies. Signed-off-by: Vijendar Mukunda Reviewed-by: Mario Limonciello (AMD) --- drivers/soundwire/amd_manager.c | 57 ++++++++++++++++++++++++++++--- include/linux/soundwire/sdw_amd.h | 4 +++ 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manage= r.c index b53f781e4e74..7cd95a907f67 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -476,12 +476,16 @@ static u32 amd_sdw_read_ping_status(struct sdw_bus *b= us) =20 static int amd_sdw_compute_params(struct sdw_bus *bus, struct sdw_stream_r= untime *stream) { + struct amd_sdw_manager *amd_manager =3D to_amd_sdw(bus); struct sdw_transport_data t_data =3D {0}; struct sdw_master_runtime *m_rt; struct sdw_port_runtime *p_rt; struct sdw_bus_params *b_params =3D &bus->params; int port_bo, hstart, hstop, sample_int; - unsigned int rate, bps; + unsigned int rate, bps, channels; + int stream_slot_size, max_slots; + static int next_offset[AMD_SDW_MAX_MANAGER_COUNT] =3D {1}; + unsigned int inst_id =3D amd_manager->instance; =20 port_bo =3D 0; hstart =3D 1; @@ -492,11 +496,51 @@ static int amd_sdw_compute_params(struct sdw_bus *bus= , struct sdw_stream_runtime list_for_each_entry(m_rt, &bus->m_rt_list, bus_node) { rate =3D m_rt->stream->params.rate; bps =3D m_rt->stream->params.bps; + channels =3D m_rt->stream->params.ch_count; sample_int =3D (bus->params.curr_dr_freq / rate); + + /* Compute slots required for this stream dynamically */ + stream_slot_size =3D bps * channels; + list_for_each_entry(p_rt, &m_rt->port_list, port_node) { - port_bo =3D (p_rt->num * 64) + 1; - dev_dbg(bus->dev, "p_rt->num=3D%d hstart=3D%d hstop=3D%d port_bo=3D%d\n= ", - p_rt->num, hstart, hstop, port_bo); + if (p_rt->num >=3D amd_manager->max_ports) { + dev_err(bus->dev, "Port %d exceeds max ports %d\n", + p_rt->num, amd_manager->max_ports); + return -EINVAL; + } + + if (!amd_manager->port_offset_map[p_rt->num]) { + /* + * port block offset calculation for 6MHz bus clock frequency with + * different frame sizes 50 x 10 and 125 x 2 + */ + if (bus->params.curr_dr_freq =3D=3D 12000000) { + max_slots =3D bus->params.row * (bus->params.col - 1); + if (next_offset[inst_id] + stream_slot_size <=3D + (max_slots - 1)) { + amd_manager->port_offset_map[p_rt->num] =3D + next_offset[inst_id]; + next_offset[inst_id] +=3D stream_slot_size; + } else { + dev_err(bus->dev, + "No space for port %d\n", p_rt->num); + return -ENOMEM; + } + } else { + /* + * port block offset calculation for 12MHz bus clock + * frequency + */ + amd_manager->port_offset_map[p_rt->num] =3D + (p_rt->num * 64) + 1; + } + } + port_bo =3D amd_manager->port_offset_map[p_rt->num]; + dev_dbg(bus->dev, + "Port=3D%d hstart=3D%d hstop=3D%d port_bo=3D%d slots=3D%d max_ports=3D= %d\n", + p_rt->num, hstart, hstop, port_bo, stream_slot_size, + amd_manager->max_ports); + sdw_fill_xport_params(&p_rt->transport_params, p_rt->num, false, SDW_BLK_GRP_CNT_1, sample_int, port_bo, port_bo >> 8, hstart, hstop, @@ -1089,6 +1133,11 @@ static int amd_sdw_manager_probe(struct platform_dev= ice *pdev) 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; =20 prop =3D &amd_manager->bus.prop; prop->mclk_freq =3D AMD_SDW_BUS_BASE_FREQ; diff --git a/include/linux/soundwire/sdw_amd.h b/include/linux/soundwire/sd= w_amd.h index fe31773d5210..470360a2723c 100644 --- a/include/linux/soundwire/sdw_amd.h +++ b/include/linux/soundwire/sdw_amd.h @@ -66,8 +66,10 @@ struct sdw_amd_dai_runtime { * @status: peripheral devices status array * @num_din_ports: number of input ports * @num_dout_ports: number of output ports + * @max_ports: total number of input ports and output ports * @cols_index: Column index in frame shape * @rows_index: Rows index in frame shape + * @port_offset_map: dynamic array to map port block offset * @instance: SoundWire manager instance * @quirks: SoundWire manager quirks * @wake_en_mask: wake enable mask per SoundWire manager @@ -92,10 +94,12 @@ struct amd_sdw_manager { =20 int num_din_ports; int num_dout_ports; + int max_ports; =20 int cols_index; int rows_index; =20 + int *port_offset_map; u32 instance; u32 quirks; u32 wake_en_mask; --=20 2.45.2