From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from MW6PR02CU001.outbound.protection.outlook.com (mail-westus2azon11012058.outbound.protection.outlook.com [52.101.48.58]) (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 9469A5947FB; Thu, 10 Sep 2026 19:04:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.48.58 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789067066; cv=fail; b=lPJdd7PeeCEs7gK5EcnI6IR+y0zxIZ2AVi6lea8iGQoDrh9B8pb1mIZXSRVpPOuwxmtYd2jcviX6tnNAAR+avzKFBigtuEfnSz6581CF8dwZSKXJ/EXyfdpxTFT/7mkAlYQInseEyF4WfpvBHeELraUqL+fnq4UmU+V62GbY8Tw= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789067066; c=relaxed/simple; bh=8L7gT1lEdGSoOfEDSJdo/baG9xD5jLVvo74uyvVUDxo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=FvBcgdRXO8EFIFL0hrZOHxr7V5cuv7k8t0LZjrd+KWUO8VCYMel//anoGHHZTflelxKz7La0y2tAb4/g4u7YXjb8jmYQLGYDKPXNjgSVrqUXXMpPQm8rOaQa0N0QKZHXX/n5Yaapg/f1fOyzeFgGLK65jaiMFOFe8QnNIZS7KHY= 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=GOCQ6oJ+; arc=fail smtp.client-ip=52.101.48.58 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="GOCQ6oJ+" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BBugp5vkPljZes/+FHoZ8MorbAOAHBoAIDSIzypcgrFRCpoTX7/iZoVCtjAU3BwjnBpa7XgZruesYjBofOyj0zdO5EwhaI6Gud68QKe3tviQYhKDvT7moc0ndYGgTTZfqZrulm/vZBEEZFtx626eZs1R2TobfOOtvw3q5DtBT3udm5Y5TJlppFBxY4M3Rg2XYedUwJdzUwzVP9ZOldddknrxcDnjEhZgkv2hS5KtzSNHbOYD3DLv/HXwCLDo6b15d25OGPjlN6ErMjExHNLCbeSbmBwuhoDA3hJZVFWag0xlh9KZrZqmfWSL+B/TzOfwOEmiiRRO7gyo+90Dn2/+wQ== 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=dSmyffqLCbyReJQ+rBc5VPUykzYlhk+8fz+hvqCOZ40=; b=sD4XU6Pe7wMKYFP16Xr7EizdkoFwLZ3nEVOQUuQZe0NnqaMIvkBuSn3KDYrv02P4hcvgdkiZBDgej/oDHm0UVV9fv73tw/HzeTK7gD6KiuQXcFgD/uhH2eaQSsXuSbbNO0Ij7u0pVUKcrvnv6AyVrsEjQ56EeRW+X4rxmceZLwDhFxtCSjV4a6Bs4HBgWQ+iSConfoz6dtHJDUfzjMUBUdR1AeGsuJf4i5nMAHHVLSnYo9zTxVa2gJrsU71BJux+HQ10RKD4ynUf7G13Oyi1EaSzptzK8RJj5w3MUDcwacNei6IdTJE9frA/qPyzk4Cw8cEMEgYYsjgROwevNdmutA== 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=dSmyffqLCbyReJQ+rBc5VPUykzYlhk+8fz+hvqCOZ40=; b=GOCQ6oJ++QJANl5HoOH4qjR9edcFKnlZ8wCVzcZZih7dWRwcr4JMIVIbRwa/bh3Dea7Xl0bTexbjw+886B5x1JAHKflf0Kakmgeygnbq5lIAtnWhg0HSL98uqsudkgYYvcLA/nCmTenj5a78PkA0LlXlUGKuyanfSJA/K/cG0pc= Received: from PH8PR22CA0015.namprd22.prod.outlook.com (2603:10b6:510:2d1::23) by PH8PR12MB7280.namprd12.prod.outlook.com (2603:10b6:510:220::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.9; Thu, 10 Sep 2026 19:04:17 +0000 Received: from SJ1PEPF000023CE.namprd02.prod.outlook.com (2603:10b6:510:2d1:cafe::a4) by PH8PR22CA0015.outlook.office365.com (2603:10b6:510:2d1::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.406.9 via Frontend Transport; Thu, 10 Sep 2026 19:04:16 +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 SJ1PEPF000023CE.mail.protection.outlook.com (10.167.244.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.5 via Frontend Transport; Thu, 10 Sep 2026 19:04:16 +0000 Received: from satlexmb07.amd.com (10.181.42.216) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.46; Thu, 10 Sep 2026 14:04:12 -0500 Received: from amd-System-Product-Name.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server id 15.2.2562.46 via Frontend Transport; Thu, 10 Sep 2026 14:04:09 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , "Vijendar Mukunda" Subject: [PATCH 7/8] soundwire: amd: replace >= ACP70 with explicit switch/case in PM paths Date: Fri, 11 Sep 2026 00:30:55 +0530 Message-ID: <20260910190240.1604447-8-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20260910190240.1604447-1-Vijendar.Mukunda@amd.com> References: <20260910190240.1604447-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: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF000023CE:EE_|PH8PR12MB7280:EE_ X-MS-Office365-Filtering-Correlation-Id: a2cc0973-ff21-4621-4798-08df0f6e4faa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|82310400026|23010399003|36860700016|6133799003|10067099003|5023799004|11063799006|56012099006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: pRHyT97sQsxFHPHvJ3tUa6SRvmKabnaYK5oNVNzFmTGLImPwpIgZna+Tafi6sJIx9FSwgf1JkNW2qwdS0PpmG9++2v+UtnIYuVKtCbvUL9SQQV31N6oFwXLeTAi/ZAK56ituN9MaLrZryO2QAUPvP6aIUdQg0uJyA7dp7psPCaWMOhywLb+sqGt5FsRoM5RPuTTrO0o6fcTqK1cVeOUHs+qculT2gFqymeaa0ppDoPlIlDo5hElVxUZFuDWtHfGCzmuD8LxZCnkQf+G7QQKSKFDT54W7+g7hJgrVdbK5NR1doYorB3emiMeZHp4M2D4Q+9kSdwMe5rUO2HkU44ZixNiFdqq4rtShqIqtN7FpwCwP5VrcQeAdH4Hj77ulsAlOs9bqeEC7Ubvnwjp6kSi2Qr+GkWYZD0n79rToj2w/O1KDsdA+YMG3Ne/rFY8UmRUCUB8rGkUcDiBh4ZUeSaMVHv84Rsryvez8VfJJKaGsvnM6vNfOsV9WZHvcnRktuFW0ElI2p73X9CiXFRzVDqTNZ6lbuaD0ZKbRdZujk3LYwc+dt4pj/IT4E2cUXiO3+/0W7RxstcOO1aEB7fOU3zfnzFImeXDF1czOd+5BIeKid3w2RrOUX5cREwnC9Ol1gqfeEayRsJuMS9C7qfmRuNtzb39LorZXskLaBEMCF+Xyz5ETDPYeSgdbOejBiPvgOi83fCEfyXWoZNZ5qLZAgzn9SQ== 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)(23010399003)(36860700016)(6133799003)(10067099003)(5023799004)(11063799006)(56012099006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ToYnN2LeXtCM7CBBk1LHKLIT9L8ObX1H4oSau5vQ9bd18FXGpQzqkv0Eqw5PY2bULvKMJ2kO/bAmcecURIn5xhppuKufo6As9BpjV/ZvUXBR84CukP+Ebylo4cc/+qxaCKu8QAFp+BrYCWPvLBPBeiDGh9we+XwOour44Y5c/m8FYJqb6bJlvHLV4dTILHElzNjge5bsva+USBQFMDNKfAdCRZF5N8P0ie0XnrSiBtmisfam6pwY244JQJNW2nnti5yffugyS3Mt7xmzH9hH53fh0g1UcmRluXont9br8RguttoP1PiUJLXvcOszCp7p7DsHc/wgF5fz4SddmzPycDYEdchfPoMWaUZMTb50pe4nLfdS5pnGNJ+QMxFtgRmihlq2X+wQs4afBY/a0M6LVDOsdE2vOUf+ghFp13jdbyZ0BKmHVY61ok/mIGslzhnl X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2026 19:04:16.6281 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a2cc0973-ff21-4621-4798-08df0f6e4faa 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: SJ1PEPF000023CE.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7280 Replace open-ended acp_rev >= ACP70_PCI_REV_ID comparisons in amd_suspend(), amd_suspend_runtime(), and amd_resume_runtime() with explicit per-revision handling enumerating ACP63, ACP70, ACP71, and ACP72, so that every supported revision is handled explicitly. The host wake enable step is guarded by acp_rev at six PM call sites. Factor that repeated block into amd_sdw_host_wake_enable_by_rev() to avoid duplicating the switch/case at every site. The remaining device state transitions keep an inline switch/case as one of them carries additional PME handling. An unrecognised revision cannot reach these PM callbacks because amd_sdw_manager_probe() already validates acp_rev with the same switch and fails registration for anything unknown. The switch default therefore emits dev_err() and returns -EINVAL to make the unexpected case visible while keeping the error path consistent across all PM operations. Signed-off-by: Vijendar Mukunda --- drivers/soundwire/amd_manager.c | 97 ++++++++++++++++++++++----------- 1 file changed, 64 insertions(+), 33 deletions(-) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c index 6af224ca54a3..0cb5f4694e9a 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -1292,6 +1292,22 @@ static int __maybe_unused amd_pm_prepare(struct device *dev) return 0; } +static int amd_sdw_host_wake_enable_by_rev(struct amd_sdw_manager *amd_manager, bool enable) +{ + switch (amd_manager->acp_rev) { + case ACP63_PCI_REV_ID: + break; + case ACP70_PCI_REV_ID: + case ACP71_PCI_REV_ID: + case ACP72_PCI_REV_ID: + return amd_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; + } + return 0; +} + static int __maybe_unused amd_suspend(struct device *dev) { struct amd_sdw_manager *amd_manager = dev_get_drvdata(dev); @@ -1307,22 +1323,18 @@ static int __maybe_unused amd_suspend(struct device *dev) if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) { cancel_work_sync(&amd_manager->amd_sdw_work); amd_sdw_wake_enable(amd_manager, false); - if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) { - ret = amd_sdw_host_wake_enable(amd_manager, false); - if (ret) - return ret; - } + ret = amd_sdw_host_wake_enable_by_rev(amd_manager, false); + if (ret) + return ret; ret = amd_sdw_clock_stop(amd_manager); if (ret) return ret; } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) { cancel_work_sync(&amd_manager->amd_sdw_work); amd_sdw_wake_enable(amd_manager, false); - if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) { - ret = amd_sdw_host_wake_enable(amd_manager, false); - if (ret) - return ret; - } + ret = amd_sdw_host_wake_enable_by_rev(amd_manager, false); + if (ret) + return ret; /* * As per hardware programming sequence on AMD platforms, * clock stop should be invoked first before powering-off @@ -1335,10 +1347,19 @@ static int __maybe_unused amd_suspend(struct device *dev) if (ret) return ret; } - if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) { + switch (amd_manager->acp_rev) { + case ACP63_PCI_REV_ID: + break; + case ACP70_PCI_REV_ID: + case ACP71_PCI_REV_ID: + case ACP72_PCI_REV_ID: ret = amd_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D3); if (ret) return ret; + break; + default: + dev_err(amd_manager->dev, "unexpected acp_rev 0x%x\n", amd_manager->acp_rev); + return -EINVAL; } return 0; } @@ -1357,21 +1378,17 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev) } if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) { amd_sdw_wake_enable(amd_manager, true); - if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) { - ret = amd_sdw_host_wake_enable(amd_manager, true); - if (ret) - return ret; - } + ret = amd_sdw_host_wake_enable_by_rev(amd_manager, true); + if (ret) + return ret; ret = amd_sdw_clock_stop(amd_manager); if (ret) return ret; } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) { amd_sdw_wake_enable(amd_manager, true); - if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) { - ret = amd_sdw_host_wake_enable(amd_manager, true); - if (ret) - return ret; - } + ret = amd_sdw_host_wake_enable_by_rev(amd_manager, true); + if (ret) + return ret; ret = amd_sdw_clock_stop(amd_manager); if (ret) return ret; @@ -1380,7 +1397,12 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev) if (ret) return ret; } - if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) { + switch (amd_manager->acp_rev) { + case ACP63_PCI_REV_ID: + break; + case ACP70_PCI_REV_ID: + case ACP71_PCI_REV_ID: + case ACP72_PCI_REV_ID: ret = amd_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D3); if (ret) return ret; @@ -1392,6 +1414,10 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev) dev_dbg(amd_manager->dev, "ACP_PME_EN:0x%x\n", val); } } + break; + default: + dev_err(amd_manager->dev, "unexpected acp_rev 0x%x\n", amd_manager->acp_rev); + return -EINVAL; } return 0; } @@ -1413,11 +1439,9 @@ static int __maybe_unused amd_resume_runtime(struct device *dev) ret = amd_sdw_clock_stop_exit(amd_manager); if (ret) return ret; - if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) { - ret = amd_sdw_host_wake_enable(amd_manager, false); - if (ret) - return ret; - } + ret = amd_sdw_host_wake_enable_by_rev(amd_manager, false); + if (ret) + return ret; } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) { writel(0x00, amd_manager->acp_mmio + ACP_SW_WAKE_EN(amd_manager->instance)); /* @@ -1431,11 +1455,9 @@ static int __maybe_unused amd_resume_runtime(struct device *dev) mutex_lock(&amd_manager->bus.msg_lock); amd_manager->ping_slave_stat = U32_MAX; mutex_unlock(&amd_manager->bus.msg_lock); - if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) { - ret = amd_sdw_host_wake_enable(amd_manager, false); - if (ret) - return ret; - } + ret = amd_sdw_host_wake_enable_by_rev(amd_manager, false); + if (ret) + return ret; val = readl(amd_manager->mmio + ACP_SW_CLK_RESUME_CTRL); if (val) { val |= AMD_SDW_CLK_RESUME_REQ; @@ -1461,10 +1483,19 @@ static int __maybe_unused amd_resume_runtime(struct device *dev) return ret; amd_sdw_set_frameshape(amd_manager); } - if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) { + switch (amd_manager->acp_rev) { + case ACP63_PCI_REV_ID: + break; + case ACP70_PCI_REV_ID: + case ACP71_PCI_REV_ID: + case ACP72_PCI_REV_ID: ret = amd_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D0); if (ret) return ret; + break; + default: + dev_err(amd_manager->dev, "unexpected acp_rev 0x%x\n", amd_manager->acp_rev); + return -EINVAL; } return 0; } -- 2.48.1