From patchwork Wed Mar 5 14:26:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shyam Sundar S K X-Patchwork-Id: 14002818 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2076.outbound.protection.outlook.com [40.107.92.76]) (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 5CED22459C0 for ; Wed, 5 Mar 2025 14:28:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.76 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741184910; cv=fail; b=UXoHiuzqXolmunXOUyB6/nfqEO+ssiF7EyoqPfSNW38xjs0oYOwsZ3JKparMBdaS5AlvLylOhovdY8WqrvXgrdAce/FofcOaPt5d4qXJVOIi7gkhVfD82CFDCCGgt9YB0Lha9O2eCKbvNynNbXYWIbVkpM/1F0Fo3BJJ3adfFO8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741184910; c=relaxed/simple; bh=LbyhHgaCruZNl5rgkPhEI55jrtEPcgBREvYe7oZ7G5Q=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=moMAfyrFpDupEHoV/RXmUXaCvKqHt/pwnnRnZH4GtBn3APZhV/+2UCG1m2gTpVDN8Mh/YoAYxPlpBUQogn9/m4st93Wnh4y5MXZ04+1OciSoMSJUTgUCB7hiycf0HcJ4vuiTP6y8jZ8sop4b9dndxYKAIIE8+xW8Sngfp5IukQQ= 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=nAArzsbR; arc=fail smtp.client-ip=40.107.92.76 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="nAArzsbR" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fjFetK0AgtrrTBkodW2dyoOYkeQ9N0Qf+jitW+9Ckz22CXdG4/s+RXLvNurRMHX3GJn5f5D6qkdHt3HJ5YD/2aDpheTvcVV6Q7STVGZHwh2P9SKehCRfI3Tqz+hzVTJPkBp/OveUM2dQ1pyQQZTZlhtIUWMSYdQ6SCcKMP5LjsyDjwfosSVpF/QehEbJt7a2XqdsL12Na/awOGC+ihUed7YYJr2LETncgzjLruhjeM5bGqpJ/e9bTcGaJBKBDu81rkRFEJAsWF/O7xxco4lg1kHG0AvRj5Nd0jwHvw/gL54u7Br4jtg65i9rAGjcib7ZuuoURwHGF9k4Pecvza1rXA== 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=rsbaJvg+WEQzEZkaQ/FurTQe+vG+LcQDoKAip7Uuea0=; b=G0eCV0gD6S5sfVDz4ZmTMFaiE/WX/3/9qszypfbw4qsfpy2TKwDi4ZVHH8Gqr59ErPpbC+/mFOu6r5PchoVsOsUNKgFmNaNS8p70xEI21N/edMebyMp7ICc/b8fFRwqcdsIq0l2PiKY0FiTs1BBIu0vCYkMVOfOtOuionYgh9GO2oyIQWD/eFABaPUiuZXgvdKvBXQFG7OGV/98800TfbixW8E+aVjTkjFPiNbt1k8bMu16bG3JMJwzD0o1vTuLP548MxfVKo2+s94/x2tx3nS1jyzyrSkRZ1i3Ox2j0SEhk7Th8N7wJHuntZmYSFASmHJVlCEYoSv9YL1Telg2k1A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com 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=rsbaJvg+WEQzEZkaQ/FurTQe+vG+LcQDoKAip7Uuea0=; b=nAArzsbRq/kCGCVjVjSbWKQSOl1+AfZcvNvqcsKftnfkdv0T+SftDXrGiB6Do3YgO28w5VGuvDcPZ2OSCmv1M02KrW3JtymADQj3MusbL+okEL8RSJxIvIfWGmEQIX4SZrm15+5CSI8GaNFu+o9QO5qpm769IsL9nSuu8wx7BAE= Received: from SJ0P220CA0030.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:41b::6) by MN0PR12MB5762.namprd12.prod.outlook.com (2603:10b6:208:375::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.29; Wed, 5 Mar 2025 14:28:23 +0000 Received: from SJ1PEPF000023D1.namprd02.prod.outlook.com (2603:10b6:a03:41b:cafe::95) by SJ0P220CA0030.outlook.office365.com (2603:10b6:a03:41b::6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.16 via Frontend Transport; Wed, 5 Mar 2025 14:28:22 +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=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SJ1PEPF000023D1.mail.protection.outlook.com (10.167.244.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8511.15 via Frontend Transport; Wed, 5 Mar 2025 14:28:22 +0000 Received: from airavat.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 5 Mar 2025 08:26:55 -0600 From: Shyam Sundar S K To: , CC: , , "Shyam Sundar S K" , Mario Limonciello Subject: [PATCH v2 1/4] platform/x86/amd/pmc: Notify user when platform does not support s0ix transition Date: Wed, 5 Mar 2025 19:56:12 +0530 Message-ID: <20250305142615.410178-1-Shyam-sundar.S-k@amd.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF000023D1:EE_|MN0PR12MB5762:EE_ X-MS-Office365-Filtering-Correlation-Id: ae0b6ac3-729c-4b37-0838-08dd5bf1fbf3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: 07lT+JsgbHUsmQ7lCQueytoUEeLE/pevN3pRdFvZ5jP5AdLqJOeah5IcPXlPVw11KBB668peBRriYIjsubzSKKA/tu3YNHpKIkX1qqbcccuaudH/DBptq8mUrhceosCMMLOFGZ/d0hH2wQPX98eeBFryu+jO2qMItL/Y38M2hy2my6oRwuIqFSetObrGrDZ6eANCzzew9OJ5WJuZ59WfYpWQ6r7zf2rBPJtlNf5LeZtaWn3tgU5cpOs9mqeh+Py/9vzyPJzqj0YkNgkNlFH3ZeKtlLu1ucitk6nalAwE8zTkzb90U8nAlmJ9dMIDKHH2lUXVhfmCJ9SmqqxiLDB80/qJYghMdRHjniVmsWjnnyjcaqsrf+l2zs3anaHGIdoesEOXu2F7g1YyYZM9Z0h2HqXhCXBF3cyjXWQFFS0wYE5NSPj1izYN8RdGjNZOtwRieckK98Y3lo6MWzN8i/+hbpU36595t+x/cBKCIk+T/nAG99gsXfr0FbKLrX1pqLUDLfbcKMeBlYVY4vUWA7yuwfQ9u1kmqGATIcKSUbNw8fVA6WRc2vhUf9Doe0UzyhykbGl83bgTzMnb90g7hHxxE0a+Z7KMTPTPXsDEGecDapXHe4gFLSop/e6YuH2wyQvkEiZHtnc8BDq/B9iJe9uImSbpIUPwqEJrT3lfack3vDq8MxOYezJ6PCtv9608z0r5hlyCVCyWop59JB/32PsnAws0tH5fFLUgMVb3k87FpwUmzUiRxaCPQNuzSEu7+oruf9+gH4wtAtvYSLy/6n2NT38xvzSFx04Vz2rwCft+PQQAdDmy4uMjqHxcMC48EHn557PxczpztHnq7+i9q+689hUsMKnKo2se66jDX6hy6FNyTtpBBKCfd8jwVc2fHwSMpsafZVwbFhHyTcXO5P4Le17CBDqESEwtd0jKfvxpxfCeK0B0ygBOUJUzb1Dwfv2+8rNtIpakII6h3S0DF3OGl9FUbgeapK0El+Vc/ISPP9nN5T4Ukc/AsqwOenVMY+WSjktZtzSVZ39rXkgeWbRvh8os0i+7eYXbwYuUoybM5T9QNnCgsONXZtb+/zPCvTbBt9q6BMvybbLsPjw0KgRbW25fFUkABk0AAgoSwV1bBgA7frUIrj1h1FI3cuHiX2wiJE6yDE8rxRo0Dkdvb3HJLj7igfg5e+ljtXVJhmk2dMqeXSexQ55eR/HRA/O1IplFHagqrwhO4FeAegrMTu/dK3VRy/2ge8ZV5Qk2aES35xD7v8Sai4DjCFAtKDfSt/LJHcb3fjySyUuk5OUaMb/1KJBsLBF/QFylU55xMUEG2vGxfi11V7cDSOeQfMx4HTplDDlF75VpBxNV3YxlbO5Par7sC267DV0JLKzRMAxsPFNR7R6g2vf+t+1TzUSi3JrWB2vkjIKgGoBNFLKloOO5YRTcUG8Y2G5HC+56lCZSVzH/PblL1vvHpCmU3GLVomvcihRnr9jz5l54cqb1V39cb0988+vTF4gvPdmfj1IjAto= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(1800799024)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2025 14:28:22.7170 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ae0b6ac3-729c-4b37-0838-08dd5bf1fbf3 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=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF000023D1.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5762 Some of the AMD platforms do not support modern standby, so when such CPU ID is detected, a warning message will be displayed to the user. Reviewed-by: Mario Limonciello Co-developed-by: Sanket Goswami Signed-off-by: Sanket Goswami Signed-off-by: Shyam Sundar S K --- based on mainline with tip commit 48a5eed9ad58 v2: - add tag drivers/platform/x86/amd/pmc/pmc.c | 3 ++- drivers/platform/x86/amd/pmc/pmc.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/amd/pmc/pmc.c b/drivers/platform/x86/amd/pmc/pmc.c index e6124498b195..c7c7afb8a431 100644 --- a/drivers/platform/x86/amd/pmc/pmc.c +++ b/drivers/platform/x86/amd/pmc/pmc.c @@ -808,6 +808,7 @@ static const struct pci_device_id pmc_pci_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_PCO) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_RV) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_SP) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_SHP) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_ROOT) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M60H_ROOT) }, { } @@ -832,7 +833,7 @@ static int amd_pmc_probe(struct platform_device *pdev) dev->cpu_id = rdev->device; - if (dev->cpu_id == AMD_CPU_ID_SP) { + if (dev->cpu_id == AMD_CPU_ID_SP || dev->cpu_id == AMD_CPU_ID_SHP) { dev_warn_once(dev->dev, "S0i3 is not supported on this hardware\n"); err = -ENODEV; goto err_pci_dev_put; diff --git a/drivers/platform/x86/amd/pmc/pmc.h b/drivers/platform/x86/amd/pmc/pmc.h index f43f0253b0f5..8f39988ce7a3 100644 --- a/drivers/platform/x86/amd/pmc/pmc.h +++ b/drivers/platform/x86/amd/pmc/pmc.h @@ -79,6 +79,7 @@ void amd_mp2_stb_deinit(struct amd_pmc_dev *dev); #define AMD_CPU_ID_CB 0x14D8 #define AMD_CPU_ID_PS 0x14E8 #define AMD_CPU_ID_SP 0x14A4 +#define AMD_CPU_ID_SHP 0x153A #define PCI_DEVICE_ID_AMD_1AH_M20H_ROOT 0x1507 #define PCI_DEVICE_ID_AMD_1AH_M60H_ROOT 0x1122 #define PCI_DEVICE_ID_AMD_MP2_STB 0x172c From patchwork Wed Mar 5 14:26:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shyam Sundar S K X-Patchwork-Id: 14002819 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2066.outbound.protection.outlook.com [40.107.100.66]) (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 D54D024A077 for ; Wed, 5 Mar 2025 14:28:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.100.66 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741184911; cv=fail; b=XrIxCzsL06Qc1+RqVSsEEtOA+BG2/LY3pSuI+cJzxDEsH2RLpQxoHX7wJ+hzyO4wRWjJiUwNhChJQc2Yuk6NtgvYDsaVWap0Jixawdh1EljRec5EvZaKDDAq17BDjEXh6zpJm0mATgMTe6rymdK8lVVJTEEHKiGqaaCOjD3Ubys= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741184911; c=relaxed/simple; bh=51K9CnFW/SVGMsqmbBrnaJT/1OaPi1J/Dr8Dawz/CcU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=eGTomta/r26ml2LQugDh9uiLdLn+KWwIJ06taO4KPBdurYQOR+0r0ulskblNKAVJ/XxBEzfcHAE69IqrW/9bt3X41Lf+e7zl2PDOHURQynXEow6sW9hbp+yqddVbjLBghvVFZGaf5KUB+mLbfLXHd+5nWm9xlL2FORySVBaCrYM= 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=J7+VEgvH; arc=fail smtp.client-ip=40.107.100.66 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="J7+VEgvH" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mR68iCkjbeuMufOJSY1nyxY3zzDsxsV/cWGUZYvfnWu5hS9Wo/dWC4asyvdaeoxfxQwwROKLjqeyUSH0yLE8ZV1hnV5dp6+TuC0wKwcSBjhKPZDujn2lB+JHjCJp95ZEAAytaFu7EkOJ3DRNLSLwLxKMGL32VAz2XRLRIE4CyeZm+M8l/fNgFto7zoosbKNEK1HpgBOtlUuKlan84Vx+NLa1Xnw7j1FKrfWHftASMpbuWEIU4CSKye1iPul4fESg83fv9TQ7LWwBo3B3m+AWCJSthgsgMGUtqz9wL3PddgcD7+Pd12MjN/zSCsRlfXuxuJrloeF9+vWZ7yBsembHug== 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=2So+/XMCFStmKc2Trc4JntAMbBkT0vAfPQKb0q+QD7U=; b=hKhOaJWEjEiHESmjfJgMDNrBOPTZBAXL2qYB6hAOIzuD0Qhps1HvaGex3H3oKe+7Ztkp2odcE75VtvgAZYznrVWxpjYotsKyLQJYg9RXVaEpmfFP2RAEt+tpGs4XJGgK+PmNb0nyMvajDd6QEImmQ/C84VWChuZA2NYKE3JvmPDInuGaQ2S8oHCa5SN8PAOibHkeiNNfVujR/HfZfc8e2oTvA25xJ2OMJIPFZWIM4frDgJFnPTpZcw3NZ5DrcnkPjEClknMtHXtypU4HM/PEx115QL3FhGhQsL8bYA+3nvy+3lbubV24kYgPc/zUOtAELywPTM90NqZGSG9jgF05vw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com 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=2So+/XMCFStmKc2Trc4JntAMbBkT0vAfPQKb0q+QD7U=; b=J7+VEgvHeud5JTRZEsatB0FAFZLX+wmOM7QVi/lBE20a+eK/D9iaiErcIxxDjoT+L/hHgJ3XH+JLzvR2OACgniBFbK40BPCl5dSI1bkyDwBWeezVDeb3ALia5aRNXiFtm2V5mHSnfVRz9ToObAx19Y9rFZf2609BfYaskIDGzgE= Received: from SJ0P220CA0021.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:41b::8) by CH3PR12MB9026.namprd12.prod.outlook.com (2603:10b6:610:125::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.17; Wed, 5 Mar 2025 14:28:25 +0000 Received: from SJ1PEPF000023D1.namprd02.prod.outlook.com (2603:10b6:a03:41b:cafe::67) by SJ0P220CA0021.outlook.office365.com (2603:10b6:a03:41b::8) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.17 via Frontend Transport; Wed, 5 Mar 2025 14:28:25 +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=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SJ1PEPF000023D1.mail.protection.outlook.com (10.167.244.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8511.15 via Frontend Transport; Wed, 5 Mar 2025 14:28:25 +0000 Received: from airavat.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 5 Mar 2025 08:27:58 -0600 From: Shyam Sundar S K To: , CC: , , "Shyam Sundar S K" Subject: [PATCH v2 2/4] platform/x86/amd/pmc: Move macros and structures to the PMC header file Date: Wed, 5 Mar 2025 19:56:13 +0530 Message-ID: <20250305142615.410178-2-Shyam-sundar.S-k@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250305142615.410178-1-Shyam-sundar.S-k@amd.com> References: <20250305142615.410178-1-Shyam-sundar.S-k@amd.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF000023D1:EE_|CH3PR12MB9026:EE_ X-MS-Office365-Filtering-Correlation-Id: 2a65fd22-9c87-487e-8002-08dd5bf1fd70 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: uJFYhsYrhw6rcmDdRVyXyGtgStiyvyqx0VIcg34mbxKxMsNT/wHx4oEEwRYTNW2IGClqU95Uy6cLxMdS4nPgyih6qzXzZbhtGoFZ/Nq+t+4NZCd1YK2x6zFIAZAFLNrDzKbATA+zCY2YQJEWuM5yBwU41kmmzsdnTCoaMfSdn9rS6Q9LWOVLSfMVn0gTZNUG+sIhNXDGWLKqNItXk9CNB/xYiKxHFgw8H4YBdU/RcjK33/jtBl7RC9YZ9M3t+th7wWTckml253CkS6dq4yLVQyY+UW9D4a1/gib/m0jBIuDYphV/8FbzyZEUwLME0UiZoeJVvBBAJ6CvdRJBlX3GCVXpxGa/+wfLJ/tIUxA70+HZXZ8Qm5+8gQfBs3XMH8d0kKMP4XxZTs5sd0/v/a0AY1dWFmQmc83qKbLxVE9PV5t5wFvWVGOswAHM/TKM0vNOiRE+cZrV7JUw74Bjb4JWkWVuSVz4uxz1FaAlMfpZtkzC/RvVQlkKGZSjpP+Vm9TJkaAxgmivI3HPOMVQYPNfJ/C7Sv/XcI7QdA/wypXBBi3INAe13Pm277QHd9MBn1ZlB7HMJOvRU31DBXjg7i0kZD+K9P8QdeLg60oAbO3Q3gx+SM28NBIu1mmCpg6gnTdkdvrRFBXkOwM3DN/SzOPhFu7ZhFFAAEls2DwetT2Y2JCzbUM9Hcxqujk8xXo5dGCgcWldvG5hWUaHFgMfydCgQzcSiIU+vB8WbX8jq7GXkXkTCn5tW6Ye58b7636JaL0phucLJvkb20Ue2p5QwZjd/ow9tPhcc4AxYYS+raaxIsCaUoWVQsuMqT4RrQOg7UaYF+hoh33/JgKMbpfQOLXKAepUOaLIlAIT/O68Roi/iIvbQDd0/CjVrdGH9IMGjcVNoiLY9XSLrdk5qLZAQDewSLCTa0eKIwxxvsUiKB5WT8zCb3sEw/NYaQx3klqlLsgeVwKNhaR4PiWKCzF+GZLsmvhUfgfG46LwuKEzs9h8I/30ZyB7ah8yS5z8oi6t6F9jjfBfX0+A9XG8W7gcFKU0npk1lp2mfmg2jaYv18xWBI26/mvFyc3s2jiH/tDqScyvx6hLMMkTHdwfW+IviasuiYxlqHOiYjKGKRMLLNOw6Gq96XUTECNVsJ4R8fxsDCmKcyT4JXvSePQuqIFfBCLpL9SgZFv4fnfAlAamgUL+/5/RhYjlZug/WNePtvPDMyQl56JOUVyurCvQxXLihSO1Foibo0kDsmQH+hTkW72iK9QlIMGI7kSeA1e5xD3Z03lrLNbPH8EAiSoDTrL/AJa60uqjhbaQGtMlpJIvVQlA5+DbB9S/jVhI/5L2ZkYRCaAGIV60KgvlSdssY5WGCJluTrDa7faL5ODjelmA+sWqrVZRWvRDzBQE2/PxtjTXjycaOuoXpXAgH9fCcbZ+y5C7mLtv+7/Ooh98807aWA2twXKbBojtt4XqnRyk+ZWyw6MXazAog3ymftXnLt5qqhp/ai8hN6gMOsvopHbaAxa+ZQg= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(82310400026)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2025 14:28:25.2014 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2a65fd22-9c87-487e-8002-08dd5bf1fd70 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=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF000023D1.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9026 To improve the code organization and readability, move the macros and structures from the AMD PMC driver to the PMC header file. Co-developed-by: Sanket Goswami Signed-off-by: Sanket Goswami Signed-off-by: Shyam Sundar S K --- based on mainline with tip commit 48a5eed9ad58 v2: - no change drivers/platform/x86/amd/pmc/pmc.c | 81 ------------------------------ drivers/platform/x86/amd/pmc/pmc.h | 81 ++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 81 deletions(-) diff --git a/drivers/platform/x86/amd/pmc/pmc.c b/drivers/platform/x86/amd/pmc/pmc.c index c7c7afb8a431..742920530987 100644 --- a/drivers/platform/x86/amd/pmc/pmc.c +++ b/drivers/platform/x86/amd/pmc/pmc.c @@ -32,70 +32,6 @@ #include "pmc.h" -/* SMU communication registers */ -#define AMD_PMC_REGISTER_RESPONSE 0x980 -#define AMD_PMC_REGISTER_ARGUMENT 0x9BC - -/* PMC Scratch Registers */ -#define AMD_PMC_SCRATCH_REG_CZN 0x94 -#define AMD_PMC_SCRATCH_REG_YC 0xD14 -#define AMD_PMC_SCRATCH_REG_1AH 0xF14 - -/* STB Registers */ -#define AMD_PMC_STB_S2IDLE_PREPARE 0xC6000001 -#define AMD_PMC_STB_S2IDLE_RESTORE 0xC6000002 -#define AMD_PMC_STB_S2IDLE_CHECK 0xC6000003 - -/* Base address of SMU for mapping physical address to virtual address */ -#define AMD_PMC_MAPPING_SIZE 0x01000 -#define AMD_PMC_BASE_ADDR_OFFSET 0x10000 -#define AMD_PMC_BASE_ADDR_LO 0x13B102E8 -#define AMD_PMC_BASE_ADDR_HI 0x13B102EC -#define AMD_PMC_BASE_ADDR_LO_MASK GENMASK(15, 0) -#define AMD_PMC_BASE_ADDR_HI_MASK GENMASK(31, 20) - -/* SMU Response Codes */ -#define AMD_PMC_RESULT_OK 0x01 -#define AMD_PMC_RESULT_CMD_REJECT_BUSY 0xFC -#define AMD_PMC_RESULT_CMD_REJECT_PREREQ 0xFD -#define AMD_PMC_RESULT_CMD_UNKNOWN 0xFE -#define AMD_PMC_RESULT_FAILED 0xFF - -/* FCH SSC Registers */ -#define FCH_S0I3_ENTRY_TIME_L_OFFSET 0x30 -#define FCH_S0I3_ENTRY_TIME_H_OFFSET 0x34 -#define FCH_S0I3_EXIT_TIME_L_OFFSET 0x38 -#define FCH_S0I3_EXIT_TIME_H_OFFSET 0x3C -#define FCH_SSC_MAPPING_SIZE 0x800 -#define FCH_BASE_PHY_ADDR_LOW 0xFED81100 -#define FCH_BASE_PHY_ADDR_HIGH 0x00000000 - -/* SMU Message Definations */ -#define SMU_MSG_GETSMUVERSION 0x02 -#define SMU_MSG_LOG_GETDRAM_ADDR_HI 0x04 -#define SMU_MSG_LOG_GETDRAM_ADDR_LO 0x05 -#define SMU_MSG_LOG_START 0x06 -#define SMU_MSG_LOG_RESET 0x07 -#define SMU_MSG_LOG_DUMP_DATA 0x08 -#define SMU_MSG_GET_SUP_CONSTRAINTS 0x09 - -#define PMC_MSG_DELAY_MIN_US 50 -#define RESPONSE_REGISTER_LOOP_MAX 20000 - -#define DELAY_MIN_US 2000 -#define DELAY_MAX_US 3000 - -enum amd_pmc_def { - MSG_TEST = 0x01, - MSG_OS_HINT_PCO, - MSG_OS_HINT_RN, -}; - -struct amd_pmc_bit_map { - const char *name; - u32 bit_mask; -}; - static const struct amd_pmc_bit_map soc15_ip_blk_v2[] = { {"DISPLAY", BIT(0)}, {"CPU", BIT(1)}, @@ -165,23 +101,6 @@ static inline void amd_pmc_reg_write(struct amd_pmc_dev *dev, int reg_offset, u3 iowrite32(val, dev->regbase + reg_offset); } -struct smu_metrics { - u32 table_version; - u32 hint_count; - u32 s0i3_last_entry_status; - u32 timein_s0i2; - u64 timeentering_s0i3_lastcapture; - u64 timeentering_s0i3_totaltime; - u64 timeto_resume_to_os_lastcapture; - u64 timeto_resume_to_os_totaltime; - u64 timein_s0i3_lastcapture; - u64 timein_s0i3_totaltime; - u64 timein_swdrips_lastcapture; - u64 timein_swdrips_totaltime; - u64 timecondition_notmet_lastcapture[32]; - u64 timecondition_notmet_totaltime[32]; -} __packed; - static void amd_pmc_get_ip_info(struct amd_pmc_dev *dev) { switch (dev->cpu_id) { diff --git a/drivers/platform/x86/amd/pmc/pmc.h b/drivers/platform/x86/amd/pmc/pmc.h index 8f39988ce7a3..62f3e51020fd 100644 --- a/drivers/platform/x86/amd/pmc/pmc.h +++ b/drivers/platform/x86/amd/pmc/pmc.h @@ -14,6 +14,59 @@ #include #include +/* SMU communication registers */ +#define AMD_PMC_REGISTER_RESPONSE 0x980 +#define AMD_PMC_REGISTER_ARGUMENT 0x9BC + +/* PMC Scratch Registers */ +#define AMD_PMC_SCRATCH_REG_CZN 0x94 +#define AMD_PMC_SCRATCH_REG_YC 0xD14 +#define AMD_PMC_SCRATCH_REG_1AH 0xF14 + +/* STB Registers */ +#define AMD_PMC_STB_S2IDLE_PREPARE 0xC6000001 +#define AMD_PMC_STB_S2IDLE_RESTORE 0xC6000002 +#define AMD_PMC_STB_S2IDLE_CHECK 0xC6000003 + +/* Base address of SMU for mapping physical address to virtual address */ +#define AMD_PMC_MAPPING_SIZE 0x01000 +#define AMD_PMC_BASE_ADDR_OFFSET 0x10000 +#define AMD_PMC_BASE_ADDR_LO 0x13B102E8 +#define AMD_PMC_BASE_ADDR_HI 0x13B102EC +#define AMD_PMC_BASE_ADDR_LO_MASK GENMASK(15, 0) +#define AMD_PMC_BASE_ADDR_HI_MASK GENMASK(31, 20) + +/* SMU Response Codes */ +#define AMD_PMC_RESULT_OK 0x01 +#define AMD_PMC_RESULT_CMD_REJECT_BUSY 0xFC +#define AMD_PMC_RESULT_CMD_REJECT_PREREQ 0xFD +#define AMD_PMC_RESULT_CMD_UNKNOWN 0xFE +#define AMD_PMC_RESULT_FAILED 0xFF + +/* FCH SSC Registers */ +#define FCH_S0I3_ENTRY_TIME_L_OFFSET 0x30 +#define FCH_S0I3_ENTRY_TIME_H_OFFSET 0x34 +#define FCH_S0I3_EXIT_TIME_L_OFFSET 0x38 +#define FCH_S0I3_EXIT_TIME_H_OFFSET 0x3C +#define FCH_SSC_MAPPING_SIZE 0x800 +#define FCH_BASE_PHY_ADDR_LOW 0xFED81100 +#define FCH_BASE_PHY_ADDR_HIGH 0x00000000 + +/* SMU Message Definations */ +#define SMU_MSG_GETSMUVERSION 0x02 +#define SMU_MSG_LOG_GETDRAM_ADDR_HI 0x04 +#define SMU_MSG_LOG_GETDRAM_ADDR_LO 0x05 +#define SMU_MSG_LOG_START 0x06 +#define SMU_MSG_LOG_RESET 0x07 +#define SMU_MSG_LOG_DUMP_DATA 0x08 +#define SMU_MSG_GET_SUP_CONSTRAINTS 0x09 + +#define PMC_MSG_DELAY_MIN_US 50 +#define RESPONSE_REGISTER_LOOP_MAX 20000 + +#define DELAY_MIN_US 2000 +#define DELAY_MAX_US 3000 + enum s2d_msg_port { MSG_PORT_PMC, MSG_PORT_S2D, @@ -65,6 +118,34 @@ struct amd_pmc_dev { struct stb_arg stb_arg; }; +struct amd_pmc_bit_map { + const char *name; + u32 bit_mask; +}; + +struct smu_metrics { + u32 table_version; + u32 hint_count; + u32 s0i3_last_entry_status; + u32 timein_s0i2; + u64 timeentering_s0i3_lastcapture; + u64 timeentering_s0i3_totaltime; + u64 timeto_resume_to_os_lastcapture; + u64 timeto_resume_to_os_totaltime; + u64 timein_s0i3_lastcapture; + u64 timein_s0i3_totaltime; + u64 timein_swdrips_lastcapture; + u64 timein_swdrips_totaltime; + u64 timecondition_notmet_lastcapture[32]; + u64 timecondition_notmet_totaltime[32]; +} __packed; + +enum amd_pmc_def { + MSG_TEST = 0x01, + MSG_OS_HINT_PCO, + MSG_OS_HINT_RN, +}; + void amd_pmc_process_restore_quirks(struct amd_pmc_dev *dev); void amd_pmc_quirks_init(struct amd_pmc_dev *dev); void amd_mp2_stb_init(struct amd_pmc_dev *dev); From patchwork Wed Mar 5 14:26:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shyam Sundar S K X-Patchwork-Id: 14002820 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2069.outbound.protection.outlook.com [40.107.244.69]) (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 5391F24BCFD for ; Wed, 5 Mar 2025 14:28:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.69 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741184914; cv=fail; b=bEXtVPWS5PP7AX5GFZsG76Nvtf2DM7LA6S34oALJjmvwKCB1HZOSWu6HwbTiy0eb8L86X3D/W+jCI5SBr7SVcyDKLajRmrHYAKa1FCZ1MXVvILBU+gPMslBDBw+oy3YFBBbLi1coD/9vNCNtkDX/L5IIVkEJNsEv1ShhBem8ZSI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741184914; c=relaxed/simple; bh=LklFc2z0xpEyUtkKyXW9gCbEx+ETPgfEEaD4wD8JTyc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=dq1Papf2wouNf9izRAGCbLBinv5XJ3gyqNBl5aymGBwDTxiYMY1T1781SjOgnb5CzH7Uf3cz6c1IcQd5FyrHRe6ls+KjZuEAQwIZuOlhpHxlbLvCsGlGzItrPpc1xWVjn2X3bw81bwLRHxFM0ORUTYlCb7XHhviEDafsefed+C8= 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=R6ePtB9q; arc=fail smtp.client-ip=40.107.244.69 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="R6ePtB9q" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Vxmx+v+exrPxF+TLmUqsSq8JLMTwVUES8n6Qoga9O3ePsZdAxCUSBEigHeodyGjssGiGsXgqNV4g2yQuxkQDMN/mi/ClIEWV4g/o6vFzPE3WbfhIZVaMCkkUyVB538jWb8FZ3R2F7llahB4mVYTEJaQhWTeY6RLPcdTVt0sT8AUOo9Ix5lZxumHaHCFTW+h4TPKJDiTv+o8rxbi6aTpKD4Zc4n9lLrBLaw9w8SGP+Pbz0DU++L4tKiq6alMWbNCWEINtKLPDSrM+7gK9YukNWmzGUbiABs+UWsv26jwV9F2ylfGOvgN6w517sZmcKXZfYkepr34zIgCrUJH5zM3p+A== 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=q0RmTgU+TmAA6Ha6F4A/cJ1uhFSYCQ2TOBwlJVfehfI=; b=FgdhjjQuVOGhdGBjHCtxJHb6tb6K7Xa6Gh4TzxUHpWAg/qavwRLirF+0vo/9t4y/9/BDZg2mrCPD6PWDgOt1NTgdiSv+zf8oxmHaTXFLiPcQ1iP2P++cUIb39AHOriI+HHreuJ7WDHenzOu9hsNLr+J77KBSzTkfWE2ImKaFvmThzqdo4itz1pHSiuBEqKcMgiYVRXw+PGjKn9KiSijzJcpxF7sSOtomNtMMjS6O9PxqMWrG43em89fCxZyq+cvqfod2hH9tFEpep9gwjmmtBl+nY/zGTogzkUu4iu9x+jctRMpVxz9zt2ThzYuldL1S2gtYHfdVtrmu8Lrtp8l89A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com 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=q0RmTgU+TmAA6Ha6F4A/cJ1uhFSYCQ2TOBwlJVfehfI=; b=R6ePtB9qLAxy37MCyJsR61jo3zBkodTf6C7eelb5MtdbFaqaxlhLyW+Q70yhJWp8z0Jw2aO8oectjhKlaiJlL+Byg2RZed1CCDIR58NIUxlV82OcB/IFcXY8ar3khNMyPwRhMv1l6nyrtzeUHTCIU3WgbG/zOmJWuqa/K/yHj7s= Received: from BY5PR20CA0024.namprd20.prod.outlook.com (2603:10b6:a03:1f4::37) by SJ1PR12MB6242.namprd12.prod.outlook.com (2603:10b6:a03:457::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.16; Wed, 5 Mar 2025 14:28:31 +0000 Received: from SJ1PEPF000023D0.namprd02.prod.outlook.com (2603:10b6:a03:1f4:cafe::f1) by BY5PR20CA0024.outlook.office365.com (2603:10b6:a03:1f4::37) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8489.29 via Frontend Transport; Wed, 5 Mar 2025 14:28:31 +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=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SJ1PEPF000023D0.mail.protection.outlook.com (10.167.244.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8511.15 via Frontend Transport; Wed, 5 Mar 2025 14:28:31 +0000 Received: from airavat.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 5 Mar 2025 08:28:20 -0600 From: Shyam Sundar S K To: , CC: , , "Shyam Sundar S K" Subject: [PATCH v2 3/4] platform/x86/amd/pmc: Remove unnecessary line breaks Date: Wed, 5 Mar 2025 19:56:14 +0530 Message-ID: <20250305142615.410178-3-Shyam-sundar.S-k@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250305142615.410178-1-Shyam-sundar.S-k@amd.com> References: <20250305142615.410178-1-Shyam-sundar.S-k@amd.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF000023D0:EE_|SJ1PR12MB6242:EE_ X-MS-Office365-Filtering-Correlation-Id: 42d6b2f3-abfd-4a39-2609-08dd5bf200f0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: S5+UmGea1X3Ezd9irR5RES5shQINuLu1dRcgPjuGufFdP8fv0+7JbKOxPay0RAQgk3TJAr5p1zY6zXoERyeF3Kb28Y5rM7+Y2QSkwr7Q+nY81N3mvufNYbLCtrdSTkjnFNllY+R7yiTbCO+/RocLtV9e1LmG64sDxOplA6SazZhQw6RnRf4JiI+uBQvPCv276WfQgy1Jqm7NHZFWVkaBF9sonxFX/C8z9ew6+i863Yxb1Zv9H4IoeuT/5OYo5KH0hWmrB9n8vL+GNxaDsai8caP/xu20me/IF4385DMq7ywIBx9GJVaa4h9HcdYzX7esZM7vY7GoJ6HxteD9MDFOpNCtXkKPwC/FQwZPmJtR7JGdRYUFMtCwFMuA+hrUe2PUc3hLIMCcanHVtqCGe/rxQ7kiaHABTTO1Vpvdaz6DIsfOQek1nJdT+gBMpwfJgUZxHvgxpBPqPv2EJj4HYTReqWdGPbdJP8AXDdPzEZo1BJkpSaYVioBR4Xjs4rsGtniQRdx+gL9gD15AAoA1PZVT717RqwghSG6scR0iAEq9O7HmgdLsvpFfCi4CKSZ1p5bGDP92l1/RB6NoGIgZbWif5Tv4CS1FEUGV4bX5MdVk51DSFBWBKEMC2Ue/PVkd7aUCfzuFyKQM5YDMW1B3p1GPoeb2jtBMvJSGKPD94I6GWWSwPU+yyQandMdNFTryEd3rLuCciqS7tJj490Q5JESMVglwKdqfK+B1e9tuvStmEVNi638/QdoYUIO06cEeBLqIR9uomBZvSRzAJ9pWkomawQLeA65T8YinVylNFa9TMtjV+qxPoIbdP+2FQTVtjwpWiu/rc8OS9q2vOtexnKkDMkQH7wz50Yml0SA+lAtZBeg3vN/zj7suxDH/zZVsbvH+2vUAK0lJszKCN0+mO39JI/3OUtHWLNl++a6d1en9XkfG9gEfPK0IKh/FGN+5hmnsSY607FI3SE4fEgZQ+ZW2jl/onvyaInceJ1IHKxcV4Od0oZQvVelVUw6icF+CpWB/QVBBdCkclyFt9HKdkZDvidAlx1Oc9ALXDbA/TypYSmDvKoBaw4pYIgajab+9YiiozItFoxLVZpgZDFXD4w1s5WpzRspDDFP5tNtmyqkBXvkFLAYbkhIphfk0Q3rdqhaiOPjjWVi1JWW9TRmM2RYDEl9JHuXIeMRAVEYFDzaw4uNFyYACuzKAjQBQ0Ob//z1VwDV2rE4ppNRmhIrS+ou/IN8iZ/bRogp2aNcZIT1XkmEtYSz6vcAR4HOA0NN8/UisO+lEOGfNN78vE9B3wjdPE/S5Jlk9bsc0mbIXArjEaS9inDosAL6ZTyoblIcPBTGp1cEDYGxsK5h7S/wrzLmqFlwik2+zw381UfsT84XGugIGDcbqSRhm454UVc5KnngRtRV06BWoD6T9QDX3E7a89LTXgv8Fl3vZBhI2k4Pv4O37Mx7wSCGJ7LNHCw5rRn8Ah4XWVf6RvcGx1gsWbjDEczSE1DSD17p5dmk6vgeIONs= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2025 14:28:31.0867 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 42d6b2f3-abfd-4a39-2609-08dd5bf200f0 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=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF000023D0.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6242 Enhance code readability by fixing line break and blank line inconsistencies. Also make the return variable "rc" as function level local. Co-developed-by: Sanket Goswami Signed-off-by: Sanket Goswami Signed-off-by: Shyam Sundar S K --- based on mainline with tip commit 48a5eed9ad58 v2: - address Ilpo review comments drivers/platform/x86/amd/pmc/pmc.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/drivers/platform/x86/amd/pmc/pmc.c b/drivers/platform/x86/amd/pmc/pmc.c index 742920530987..1ad3eb935404 100644 --- a/drivers/platform/x86/amd/pmc/pmc.c +++ b/drivers/platform/x86/amd/pmc/pmc.c @@ -166,11 +166,12 @@ static int amd_pmc_setup_smu_logging(struct amd_pmc_dev *dev) static int get_metrics_table(struct amd_pmc_dev *pdev, struct smu_metrics *table) { - if (!pdev->smu_virt_addr) { - int ret = amd_pmc_setup_smu_logging(pdev); + int rc; - if (ret) - return ret; + if (!pdev->smu_virt_addr) { + rc = amd_pmc_setup_smu_logging(pdev); + if (rc) + return rc; } if (pdev->cpu_id == AMD_CPU_ID_PCO) @@ -219,10 +220,10 @@ static ssize_t smu_fw_version_show(struct device *d, struct device_attribute *at char *buf) { struct amd_pmc_dev *dev = dev_get_drvdata(d); + int rc; if (!dev->major) { - int rc = amd_pmc_get_smu_version(dev); - + rc = amd_pmc_get_smu_version(dev); if (rc) return rc; } @@ -233,10 +234,10 @@ static ssize_t smu_program_show(struct device *d, struct device_attribute *attr, char *buf) { struct amd_pmc_dev *dev = dev_get_drvdata(d); + int rc; if (!dev->major) { - int rc = amd_pmc_get_smu_version(dev); - + rc = amd_pmc_get_smu_version(dev); if (rc) return rc; } @@ -697,14 +698,14 @@ static struct acpi_s2idle_dev_ops amd_pmc_s2idle_dev_ops = { static int amd_pmc_suspend_handler(struct device *dev) { struct amd_pmc_dev *pdev = dev_get_drvdata(dev); + int rc; /* * Must be called only from the same set of dev_pm_ops handlers * as i8042_pm_suspend() is called: currently just from .suspend. */ if (pdev->disable_8042_wakeup && !disable_workarounds) { - int rc = amd_pmc_wa_irq1(pdev); - + rc = amd_pmc_wa_irq1(pdev); if (rc) { dev_err(pdev->dev, "failed to adjust keyboard wakeup: %d\n", rc); return rc; @@ -743,7 +744,6 @@ static int amd_pmc_probe(struct platform_device *pdev) u32 val; dev->dev = &pdev->dev; - rdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0)); if (!rdev || !pci_match_id(pmc_pci_ids, rdev)) { err = -ENODEV; @@ -751,7 +751,6 @@ static int amd_pmc_probe(struct platform_device *pdev) } dev->cpu_id = rdev->device; - if (dev->cpu_id == AMD_CPU_ID_SP || dev->cpu_id == AMD_CPU_ID_SHP) { dev_warn_once(dev->dev, "S0i3 is not supported on this hardware\n"); err = -ENODEV; @@ -767,7 +766,6 @@ static int amd_pmc_probe(struct platform_device *pdev) } base_addr_lo = val & AMD_PMC_BASE_ADDR_HI_MASK; - err = amd_smn_read(0, AMD_PMC_BASE_ADDR_HI, &val); if (err) { dev_err(dev->dev, "error reading 0x%x\n", AMD_PMC_BASE_ADDR_HI); From patchwork Wed Mar 5 14:26:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shyam Sundar S K X-Patchwork-Id: 14002821 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2064.outbound.protection.outlook.com [40.107.92.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 16E7924BBE1 for ; Wed, 5 Mar 2025 14:29:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.64 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741184947; cv=fail; b=GHM6fw3Mgsmlq/yUUwCp5J69nT3Tno7a44OXBMGAc7BRYd7lkzDHCzrjPbQ89zL4uDFYA8/Tnuex7yO6M0aJYc75BHXz6aQPKN9hs+a21SQE51KioS8nvHeUpTgat6oyhXnmvWeMyxZmPpaQTWtH0jfKZ4mpvrkhJ/4p1814s48= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741184947; c=relaxed/simple; bh=CS9H0sQBCY2sZYAToaO3JDoJSd61+KKv9erz2X53Zu4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=oNqWQQAmVxEb/4G+6p4uVB0fTP1WCdpLmFTQ7AdRwyRW9lDIZOFUAs5F0lbFDgwIb+V903pFgBwkvJZXuWDK/E+q/d+FstbnXEEbTxQc/NP9gFgeeT8gXDQ6JbrIEiAuO0cZU2t5V6e3MpzFWXqeL+B14Ubze/9Emyefhhb/zBo= 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=Ae0/rF+4; arc=fail smtp.client-ip=40.107.92.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="Ae0/rF+4" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=s3Dse8YzWaogyVFkJ/j32JMejjAPz9eYrpu2KY/IUVJSiC7OqysR2J348YtQ86lgv+kOt37fIsajZ8ngrOJXpX2UDIK6HzY8U4rywouSYUN3VGZV2a49GWflZwLuUAfdhK2+L5Lg/I/Zld5ouuTbXy43CdP+ImincfiUtEZksp3JmeeqdR5EZLll/zn/Lgln8VXQSHQ/knxfSfJfOcAA6rD5G8/cHYxcEKHMQ5pQ9GD4Rwh6ubi0OTKZCFyVZ2/GhLD+ARiQF3pFDL0vuWSI32STEwZUs6ZA6l+GIwRLH72DB5mtyqUM/nDSHaXxdCJwiKd2fmLlWOe9uAINC51Pxg== 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=iHU4VbNoGnvMEojVeolZvZFzOuY6KwV61Vce1pyD8Uk=; b=FPJtpdBDKPX7qo1hVtvM4xXhEpWKZheinz9ayJ9OPE1anbpDMPxv1bUoIrzqljbYnJyT2CaIVpOBQ8i3JGCbxJK70qWmFN+HWpZ0mgIdPe+jtrgCGevohIVn99ldOdXz7zaHtpXHTu34KScz1hioH3Vg19kYum4HAZwRor2Ip3BrEsAfzst9/aStB6zF1JnTeOcI3hOiUk2FzsC9AmDVDQ82srx48pwbNFzymWPq/PPhJKczKUG3OiKOo3U1sRTHmJ9k6mQef6hi8FQ1NkaGSSsJKw2L17H0SNtqBFPMnuoVa1H0+L838dXxrhBTmQCmWXSg47j/Dd0VroqUoUnCLg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com 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=iHU4VbNoGnvMEojVeolZvZFzOuY6KwV61Vce1pyD8Uk=; b=Ae0/rF+4lJ38lxfRyumhG96ii66YlQFDxLOEQbREQFh6NBE6hLWiHbq3LVS/OJa5JPwpn9jdRV2Jyu6mGRz+8SnKeXM2/D+G2zue3VxJmyM9vR2vVEIU4Aap8ww8FJh+TDj3b336T71qhg9mfW3ZigIZ88hr/xBWsmH3y4kth/M= Received: from SJ0PR03CA0222.namprd03.prod.outlook.com (2603:10b6:a03:39f::17) by PH7PR12MB5927.namprd12.prod.outlook.com (2603:10b6:510:1da::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.25; Wed, 5 Mar 2025 14:29:00 +0000 Received: from SJ1PEPF000023CB.namprd02.prod.outlook.com (2603:10b6:a03:39f:cafe::48) by SJ0PR03CA0222.outlook.office365.com (2603:10b6:a03:39f::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.16 via Frontend Transport; Wed, 5 Mar 2025 14:29: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=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SJ1PEPF000023CB.mail.protection.outlook.com (10.167.244.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8511.15 via Frontend Transport; Wed, 5 Mar 2025 14:28:59 +0000 Received: from airavat.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 5 Mar 2025 08:28:22 -0600 From: Shyam Sundar S K To: , CC: , , "Shyam Sundar S K" Subject: [PATCH v2 4/4] platform/x86/amd/pmc: Use managed APIs for mutex Date: Wed, 5 Mar 2025 19:56:15 +0530 Message-ID: <20250305142615.410178-4-Shyam-sundar.S-k@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250305142615.410178-1-Shyam-sundar.S-k@amd.com> References: <20250305142615.410178-1-Shyam-sundar.S-k@amd.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF000023CB:EE_|PH7PR12MB5927:EE_ X-MS-Office365-Filtering-Correlation-Id: ea46f2dd-3108-41de-b813-08dd5bf211fe X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: YWD6UpUr2E3uxt7xJg1JmeQVu1sY67sVx4WR2zHDtvkfBblrFkCjZNuqWFegt3UF5EbqTsYzsvWDVDUpKOSWy8K34WAkDZy0xZrLlMRMoCPmYJ2hq8ooiMhIGyE+V8TskPSGE+v7pVLCQmMjwFAycv+kraR1mjWgP8ro2aUXAYDSCF6r/mDXE1mC8HmjYWqMm7+DAUjDcBSLN+P2O3M+Z2E3S6WgzEKaV4nSC27IvlcML4oGivJf50CefPodG/LkI/1nyObnsufKdMG7a4Iu+qndyfii6e9rRUzJUkp1mujr+K7nCLXUQQ4LEpZgEKRgeRm5y+yv0HJhQeoKXELgMQv8cjaOpaZxmVsLAg1CSMH4iVyTCi6ZXL4gsXCZTsIMgT3Nk1oXJU6zdpapNI/PYSBzUHP3rF0EfcoRo/gxpR+OloW6LtjuG01lZw/ovS5Kz38TRK9sQjFqZA11mXC2/rEgfNfB67yDb+68xZx5tmcWdCa6WSjqhrHR73UZExbCzgRm9nzHB9c9MOdTNsLLHzv9rb9TXjO2jT9m2wK6Va8Toxpujwi1jgV+T/810dg5Mp1fw2saIl9WppDfnH7fvYTEC4IEiGbiq0qWrqwg/+aEDZOiIMNET8jgJIcW+Z0GFwC7eL4X/sKDc4SS+743CSU8UHUWexUJ2riCdYxyGVS1yAV5RGP2lcizClSUu+uhv8y4qXJ+ghqRse0jYGjit6dt/Cn29Z5HSYjxQ1qvU+oGL2i/ovT36Y+VFYy49xwavSmKyiZFQJdurqySuK9dUhDX0486pxcnwf3dg1INqzM5T0DT8E/UkyKpyosp9ziBNFxbnSqdGYa94a3CBkv2zQWl5Ehb8vjBcbWwp3KbfY30JsM8w2rL4ofjUMYzxjKck0SRPm82NRCG93ikq8wPU1KSSxDzFjdJGwIVqL30IadWFlnDsUTFw1UFOFW3XGhOkt01x69VfobCUH/roaaxGxKW4O9KCDt8gHk9p2AKbfFUCmLDM4BP0K/vlVwhxZATllptqsaiSoNCCiIZIiO6ovClPWhH09ABTGHwS0H1jhy9fnuCl2IOXpFRyta8fA6O1yAcNGoT7C8EjAsorKrd7D6zqlOJXQQgTbRPIzelpWKmfcuizdVQuV6B5vDFiaFoVCjJGK8XRZ8tGEyxzC0sRD3aQDP2dC6l4uyc1kpGzXfFfE3efLb6W0GwCD/OSxmrApNUTPDKHSVxNac8AaY2jKp6NaGexwtwqp585REXyQWOZisrWvVxBmiRxQuMYC8qjDr10BvOTcVAu3djQGqM2XY+nFyQFNe7j/on3stLrK2fvyI8yEXnDTpx/ih1LYzV0OKzb1xImHsV3td3kW8jwx0bohzae1OEZOb97pizG5ebQ+PyFLEDkC+yRMfiEXByetHT8D/mQwDzQAo95N6DCvZqXBTrTcdEBOns/UMbwMSoWsYchGdjaij1abrGRE6d511JA/dCHsslxfKNb+5K8Vvu7yuBaciajad/ua2ggRo= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2025 14:28:59.7035 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ea46f2dd-3108-41de-b813-08dd5bf211fe 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=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF000023CB.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5927 Adopt managed devm_* APIs for handling mutex creation and deletion, facilitating automatic resource cleanup. Co-developed-by: Sanket Goswami Signed-off-by: Sanket Goswami Signed-off-by: Shyam Sundar S K --- based on mainline with tip commit 48a5eed9ad58 v2: - add error handling drivers/platform/x86/amd/pmc/pmc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/amd/pmc/pmc.c b/drivers/platform/x86/amd/pmc/pmc.c index 1ad3eb935404..84bc47009e5f 100644 --- a/drivers/platform/x86/amd/pmc/pmc.c +++ b/drivers/platform/x86/amd/pmc/pmc.c @@ -783,7 +783,9 @@ static int amd_pmc_probe(struct platform_device *pdev) goto err_pci_dev_put; } - mutex_init(&dev->lock); + err = devm_mutex_init(dev->dev, &dev->lock); + if (err) + return err; /* Get num of IP blocks within the SoC */ amd_pmc_get_ip_info(dev); @@ -822,7 +824,6 @@ static void amd_pmc_remove(struct platform_device *pdev) pci_dev_put(dev->rdev); if (IS_ENABLED(CONFIG_AMD_MP2_STB)) amd_mp2_stb_deinit(dev); - mutex_destroy(&dev->lock); } static const struct acpi_device_id amd_pmc_acpi_ids[] = {