From patchwork Mon Feb 17 08:17:17 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: 13977283 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2087.outbound.protection.outlook.com [40.107.236.87]) (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 7CF95155C82 for ; Mon, 17 Feb 2025 08:19:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.87 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739780363; cv=fail; b=RifJPLKnIk/TRPjmHE7OWjhNM1bJnwIkr3QHTNj78Qn3XxbGiqFsaYV4eBQ6pgT/U1eiKYZx5B2uxc8OTR+RrZn16ZY7KwZepvShOLMGrPz7Peq4tCml/kYy7b2UOTCPaI/zRi19UZqvzSIt2zcuvrsHTEYqG9ASSC8tVJ5lFs4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739780363; c=relaxed/simple; bh=FeUkRUMrmjA148ANxb1ofQuSeCOWRLlZ9UFGg1wIsYQ=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=WU/KX217JIHKi5i1A9k6nppsNEAAK4g60yaoTuPL8vkLRZNEIfuV3AtnBarkvGr1cekhA6I8qTGqmOiAa+wLD1dTaXBcUj6Sv4J1cPafho9NVt7RG3nmmPhPbI1HIHHlkucqct3ZkoXg5CVQjEQ2hxuc3Oy6WiGHXjY/4j9XH3k= 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=Ao0wugxC; arc=fail smtp.client-ip=40.107.236.87 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="Ao0wugxC" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nOL4vEbw5jINBhf66Vm7TQbiNPCiS2M7PJzscTDhZ5yYzetuQOoAKazrkRF3vu1AKsBt79HyV4iW0fY4+6dvCjR4H/Dtc/PYdAtMmNa/lQAgXMWKE6brYrqzzkI8w6WDCV5GjeXDGTI6ptIKGkd4qbWaC1MKoyRWc5CflqhwW/FIHRy7eUdx7DJokf7JRGxW5X/dZvV46zDmqE3MQW5DJ4z/4B2uf65dnORKHxCuS3O45ooJvscTlfs0+AzaFxVDVY4av/HWDKqUZ+/+IC2c2kEcKhVmpRXX5++eJQSBpSzv1modvHedRPra/Kkn1vPKX0UmmndWM3brqwe95edTXw== 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=noNBmpIi2fU7xD1a/7tX0xgLy57cLmI+c1q2q15YKEo=; b=uzOZAadfx3+yeimttf0bI2OMSisClTXUZAZLBNBFSvTPxFj841lclV4sWzyGQL03yo13Z8C/FULsNMejkc5s9XYWOpvEt9UNF+N+bsoRFfBXzeY9S++I+0CUw3RqPz00oCV1krS7ASIYarCRutIXuEexIm9Ew6bIhDSh9Qj/jYGXmVfQacYqtEBR5OGL65n/hblz1E5ANlMFKe0WDmgbCxOaDo9pOqnLRusWXL0tpIidIBNvkJW2VNfccxFKlzJfucsLEJrpWzbKI7QDQ2BbbYxPfQi5WyrGUI2dTNrLMqEj5eVnPEFBExKz1Hjylrt0AVMfbO+hUUroAUurxXTzqQ== 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=noNBmpIi2fU7xD1a/7tX0xgLy57cLmI+c1q2q15YKEo=; b=Ao0wugxCbwGHJ6y3kPuhyXx0YgoFEz994HQwOdHegiJzQd5BtJnAcuvrmEyAmUKAHbwLfsNYcgvIKQ/pzaxg97J7GHnx3EMncnU59ZE2OqtKJJt4UojaaR3SQiMhfpdrXQYitpnaTTSXW3HSGDKHVl77bCovdEf6uIYRSYnX4Qk= Received: from BYAPR08CA0012.namprd08.prod.outlook.com (2603:10b6:a03:100::25) by SJ2PR12MB8160.namprd12.prod.outlook.com (2603:10b6:a03:4af::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.15; Mon, 17 Feb 2025 08:19:16 +0000 Received: from MWH0EPF000989E8.namprd02.prod.outlook.com (2603:10b6:a03:100:cafe::17) by BYAPR08CA0012.outlook.office365.com (2603:10b6:a03:100::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.16 via Frontend Transport; Mon, 17 Feb 2025 08:19: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=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by MWH0EPF000989E8.mail.protection.outlook.com (10.167.241.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8466.11 via Frontend Transport; Mon, 17 Feb 2025 08:19:16 +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; Mon, 17 Feb 2025 02:18:17 -0600 From: Shyam Sundar S K To: , CC: , , "Shyam Sundar S K" Subject: [PATCH 1/4] platform/x86/amd/pmc: Notify user when platform does not support s0ix transition Date: Mon, 17 Feb 2025 13:47:17 +0530 Message-ID: <20250217081720.107719-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: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000989E8:EE_|SJ2PR12MB8160:EE_ X-MS-Office365-Filtering-Correlation-Id: 369bff48-6199-4cc8-7ed9-08dd4f2bc514 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|376014|1800799024; X-Microsoft-Antispam-Message-Info: 6MGpmchBYnp0X8GRu0GqSWDonktrR4kmnxZRceesP3KtqDsL9nxCax+RYeEoj1rfcqG9hSSmhgCLDDcPS9nO7osbUaAs68aXdfmlQIY36ugrhwEJ94XYjUXeG6uvAWCEN+LCsordQ4X+sT58r10DTYtgGJ5nj9q9deXosET9ljVoS7OViiI8aJPCFqdbf56g918I3WFw0cUYn8Zz3CoSaa5VAlhW/FUf6v3CdjbC5xfBG6RIqDuPAmS3v4ihxyWkR/xX15rZ7sQP8TAYW/uTwxz9tnP6zIK9JI7bQaTWLMKJzkahn+kCJuJ7LLTDEO71rc7YJTxW2k/aaFt1Ees4iNsxGmsRGtIkvqGTUObi87mqQ0WWXnsYJc1rlg8PzTNmq4YKaYoBSogIaxrNTnnP2rhNDaOB53/CUSAi+UzpsDkljF1KXHdhd5ER68YcC6Itdh4lKx/0X57gEyH0GbC1ebcBDspHWYfTFP5LJg5UiKTG/SraytOj212lPrCsRDX6bpWcuiUdRd92WK2Owq583I8x/zBFz6qcL0Ao+mIG7wBqi/FT4vXMjBqCoS/4tawdgpBYbryZtVYNFJc8KiRxprr/kVJzgeyqY0VS/gM407GcCWUJdqvos6B4O3UHERfRfUcbF7Sr3ARm6arTvTNDfXYte4o8CrK7CQUmu4dTVJAN5BCmPRp/D20GjQfrIIxrEIhOh08fyvdK2LbDUwbne9biDk2bzfkf78OAB/BoV/PMd0f+jGOJKfVzQUrFHPpPf59cGLTJ4koba6cYoTWdfS8zYK9RtmWydNIqaMqB0BhKlCxWP3rdWLW4iVId06BxcyjXfkmE3hCKFdSwh8mhKBDDImjzgUOzhyv97mElmo3fx2/dGZ6wIgc3PeqOQ6lZM/8rrRuzglEALBXyBTDmPBIH9MoEv+JAZX6I7lXEXdkx6RMTod2v4hGObsW5uGiWNybNCpp1t0N0t+OAAh8ME+wH9qqA8lxvpm+caDpA2URGrtCgRQx3bPNaUhZEOSUx5KHIHYyFJuRTzb/F46+6EjXSAB9ZnGjmFPGSh4LpmdSPxGXBKF14G+lk2STs7enlML8AgpjUCxnijRd8zV13NlHv/0tJSliLWYwAgb+M6eqv0BlP5Mc5ao46s22rxF/FZDy4ZH71xWe2k8WoWX/cLFXhzca/NSL/Rf1u8P7QrTqQadPgA3zaScYEelN2HUhKNZUhE9G8Uck8QfoHuDr5ebQNZBQiqTDYKdPnZ8Lm3Gg35qDMN4W6SppGjFYvrZJwNRsonFJgy7JFGBoGQrDDfk/a1XR7IW3R+IwkMRwyIGnQ0KtCiYzKIkAT6J7cMg4USzGLljMy8eixnqgHvjn8PDZbdBbxNe0olUN/07nH7lz2eZvEKk8f+pdCQew+So5BjrLOZhiEduRTR3NDg8uyHPhgKPrBXDQTEhAVGkyIuyo9QAOpAskd2RDMSNnzABkMEhZnsHCoO9jBWx9XTbEkhp0A7wqXkAFLZ0q4v8Pg00c= 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)(36860700013)(82310400026)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2025 08:19:16.3402 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 369bff48-6199-4cc8-7ed9-08dd4f2bc514 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: MWH0EPF000989E8.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8160 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. Co-developed-by: Sanket Goswami Signed-off-by: Sanket Goswami Signed-off-by: Shyam Sundar S K Reviewed-by: Mario Limonciello --- 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 Mon Feb 17 08:17:18 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: 13977285 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2052.outbound.protection.outlook.com [40.107.93.52]) (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 BE0CF155C82 for ; Mon, 17 Feb 2025 08:19:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.52 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739780365; cv=fail; b=E+xaMErPuHtl0TuyikB19pwl9dc5WAk848EHhEaEZtJlF0wf6pwwm/2Z+g8CC/1nW3K8SkCKnbee9Na5yMmDpLXguvsQmwNc8YzwBfuwMw6vZIH+n+RYFwK+2d5VUvZtfOKhApt2mPl+lD3XWrz53AnHbiwtSraRAeDJe92GZr8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739780365; c=relaxed/simple; bh=YE5pkrycIEkFgC9g7cxtYAy2qQ2tFHDqWNn1pE9OBgQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=r3Z1fm8o47vcbDXHNqfEssjSdukvbu+UtNHNBXsO5mqNHpaxQtQ/NInlqPjV2TnzQfsmP1DEI9qnh6ls90YtFUiGzOzRZ1a3TjD2PhIaugcDY+B/Lw+lWsPpiwrlD4HTo4lHAYtRuvK+q2JvfZnP8uMfNB4kNuPv/G4aKB8rLH0= 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=ny2NRG8p; arc=fail smtp.client-ip=40.107.93.52 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="ny2NRG8p" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Z36h1KWRjGIlXfkdq6BcQIA7PBRP2FiBOD19vdbBcK4CjTFsUnO1YQm0/3XkKkMRXhDKJ+I4tZYBuDQmV/CC3jz1GNvRDQD5YD99PsDlayccaK0cfR1ziyBMQSBumXe3bEy1ulsQ/cBo6Y6yStu43Y9enMcFXUbyZhvZTnd75ev+QDLlFzKr19YDdmLfoRMleYD7yLMR7yzc8DdoB2LfGLknB2RR0Q3dKXgGgZwlraVyWjkOoLqAEvo+dqXfy9q++C1I6+G54zYVfLWGRReoKH19qLF6Ys1htCT+RqXxNm6AkJ5Ny1bLHiU0uIL/Itz5uoWb/lfxZyN3nYWItMPfoQ== 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=GDXDWA+v5wgZWRahmJKU++VLKYUu7t7DTL7RcFH4Kl8=; b=TUtRqGAvNX5oA/9c+MozEjwfrd9cvXjuF3r99uFy4+EO8ebeu0W9zdqfy9PFPh+CjTV75kOA9HReVJ+fEKrnS4J+GrtcFwxvaXq5DGSi9zgTn+26NGXx9cDibwK6Jd7jvs2w1dovWpN/NKsQYKdP6xtUpOLB0hk43jcVw8gzVx3k7mnMbu/pGffjlulgxppaXzVeELgvwfPh9c9CRSM6ZmhcsYOSkFiYcTFVCtciftXgKsdR9lAgLklDFYLWq3X/pm6zmYJ2NjAJxEtitJpyCJp8DH+3tbfzU5201TCWYNlr/0R57gg9sBwZGHhosAGDjnazUL3qIsE9EhbpZeLrIA== 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=GDXDWA+v5wgZWRahmJKU++VLKYUu7t7DTL7RcFH4Kl8=; b=ny2NRG8pPf9mtrA+Ig/sHpZ67Kv1zZS0HvJFORIssn3vvqW7lxXdba7QOJY5BAD/55c8Oqdm4cdqBUYAz8bQIsseOKIX9gtDU3HsyVkD/IOKGjiQ3KsoZHotuH/bvN1K4W5n6bCVZ+vPxGfVr40Bl4CUueaSjb7cvHSrLG6MdUE= Received: from BYAPR08CA0035.namprd08.prod.outlook.com (2603:10b6:a03:100::48) by PH7PR12MB6739.namprd12.prod.outlook.com (2603:10b6:510:1aa::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.17; Mon, 17 Feb 2025 08:19:20 +0000 Received: from MWH0EPF000989E8.namprd02.prod.outlook.com (2603:10b6:a03:100:cafe::a0) by BYAPR08CA0035.outlook.office365.com (2603:10b6:a03:100::48) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.17 via Frontend Transport; Mon, 17 Feb 2025 08:19:19 +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 MWH0EPF000989E8.mail.protection.outlook.com (10.167.241.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8466.11 via Frontend Transport; Mon, 17 Feb 2025 08:19:19 +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; Mon, 17 Feb 2025 02:18:48 -0600 From: Shyam Sundar S K To: , CC: , , "Shyam Sundar S K" Subject: [PATCH 2/4] platform/x86/amd/pmc: Move macros and structures to the PMC header file Date: Mon, 17 Feb 2025 13:47:18 +0530 Message-ID: <20250217081720.107719-2-Shyam-sundar.S-k@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250217081720.107719-1-Shyam-sundar.S-k@amd.com> References: <20250217081720.107719-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: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000989E8:EE_|PH7PR12MB6739:EE_ X-MS-Office365-Filtering-Correlation-Id: 217b4f6e-d5eb-4ed0-084c-08dd4f2bc6e3 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: 6lHB0p/cUJGshJ8U3nhPt+kUeQ7DTtHnC73FPrHWHX/gFCnZ8ExlEG36hUAk2jYp6nyX1sIO7M2SZuOCLu7yCwQoDsRQjjA+cFmIWMDDztQL+PNnuncm7mGZCxvTzALPv/hpOZIDOABjMrMplVprd4vKGD8vDk21RV7NJ16bM4zynvdElvvf7OSbNv2lbgIA2+RNSuoduJNZgWZ6fPc+G90k3D10lbIEcj4pCe2aosEKziijqP3Dp4VKDZqBHjvGI2/DWmT2BnO4EGL29G4mq2j/azzcIHWqM0WrSYACgw0U68wVRKH+KrHFdfCteLJOyQJZq+TwkeMLjTTw1kwilFeGOCBaNGs5GkXgIozQw3v9bGB4ss7W5m0/mlDxnro6FfpL6DrlFk5KJsMKWawVf9K0BVoHYjwnX6nTPYK53V+Jcoc4QdDo58oGQG5dzLtIbAOUHWkJVSFXGbx7+9zXR1rwZxzk30IRfynSDh4AygC1/UOQdvNE8wEzifnzV7fYkUmwAuoq/u3IS01Og2t3G94/U8r8cQ43yQVER+o6iwla1VOOBpdFaJtgYY6bM7g89AugY68Grxt1AfVc6SsYKPJcmYNA2lmpLAJxw+NBucpLf+EsyUAt0ewihrUx4ctxjNJ3ipc7WNb3QAY6XhSj2yVtwbi99k8cZgRIdWyfLEdlldvjr7CwrsEeYpQ5bbk8943m1Kedze2XwBYO85c0WY3lnwI1I+fPik3SXEy/WmPY3Q6KoOdeVthtg15PHrVZmd7ic8AKtdpSVALaTD2y0/Gyy8ia0y3yM0PYNn9a+IDoIGc4CdbUyqULmxjqdIPkGNDzdgSggR5ygLNjFwfZz4XwM5NB3Z28Xav4Js1v946BiYqytOgC/xNk1Fo8HBRuBXNXd6oFXuybtWTkfHmXWcxqChDHhDJaCTuNv8n7nNaMhxDTtis4z6yyxGC1Sir3eX6wMVYdqFvgSZOnKx4wyi23U/D/fosE6EryLrd3N3Dpc3OVKztLSSOVRj2EGqqlbOsiRXKd2T7SWGbcgqriUDFe2nyCH8yhmuquasAqGOjNXLQYm7+7lsWJMgETXCotAib5QLvLSRJKgYyeG0KhEvr1EV+V61TKXnTcxAopyqI0ApsLNhIskSs8h3upW3Mf8Pa8Fzi1nzNTK24DEFhQEfQRK4iajXgp2p80YWiMYDVZitCTO4FOkxe2l8bqtQmu0GWLE5R3RArHLCUb10Fr9axSG74+uHtcUTwkyAuew3kmhifBLLEEhE8fenkDh8gvYvyEzqNK3T0C6zUjZURScbQwrTJUKdVdbXUGsS3Mwiq1nEFZVaAxCAvUG/BguoRCNgZ/rNZPanf3MuW+udpeTEWygDVMGDNc2y0eQSuikdsBIhyvKhNoezIfUwwymRx1PXM/y/8ni8ATbFchnTi88Z6m32LZPGrJ3p1zLQDWn5kJL8emhCshrmzR4t1I29k1B8Kmm4Wi7LzoPGGR0yLb8/VSnPGjJzK9G3+iogPjvE8= 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: 17 Feb 2025 08:19:19.3402 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 217b4f6e-d5eb-4ed0-084c-08dd4f2bc6e3 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: MWH0EPF000989E8.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6739 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 --- 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 Mon Feb 17 08:17:19 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: 13977284 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2059.outbound.protection.outlook.com [40.107.236.59]) (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 5DF7819259D for ; Mon, 17 Feb 2025 08:19:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.59 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739780365; cv=fail; b=Fb2o77pfj/EiiUi3KhU7FiiYZYHe8LrOrqoKKEz34FZzNpRJVplJsQKkmrAlB/nX0v58BPQinEnkabcKf6t50GNxu2KEbHZfAeEOXulT0es/1S8kT/Fni92r7usq+eXSm+o90EW0GfqtTVdixqZ+kpa852hHV8xge28CKZpOyLM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739780365; c=relaxed/simple; bh=O2YoVxsm6lOY5Co+syrw6oqyFXgUhs+O6YSyUkmxpws=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fG8WdrmImd+AKDJySt3O1d4c1KPli7GuNH6NVSdD88aGGTfqvelUDVAYMD1GauWYRxwdxSE/l1SZtkOp47QfvHmv0c3hyxtmIi1DYulPhwJDSdb9M5Ey0SB3XJzBGPGf+xfiQE8RhM46p8bpfFCv1FrJhJpbSZaFYm+07SM8KMA= 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=wXZ4iwr7; arc=fail smtp.client-ip=40.107.236.59 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="wXZ4iwr7" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YgW6d4Lq1pwaZm5ve6V3/D+7heyc+hvmeJkoVLcSnD/3Z9lzCj8RtzIkalRatJsaNLgsGGibiKP7bBKAABMn3aZ61LGLlgSIeZEqRVxR1KF5flQKkqhJrrWMhuyEEhgeVpvzqEjNGs6vHjxEaGe/URbwf14JQ3udybIWiHdkYcU/6/nUpQEabMSsZMpqUCNd+vU7RwfKFNj/5Rrpb/6c9DP4+fvN+GR350TYrFOWIX3MCjihG4wQfcebkDUnmo7MRD+6kAs+WVJPrd/SUPwkrfRLKgiUDMNrT80O4Mx8lDm5tu+6ki9OR91vjuv+m+dmGbeiwqnKz5FRqZgznXyIBw== 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=u+EnlFnmR6xHYpiVbjLxFJvqnsq1NeCaHUxabngmG6k=; b=RaXHWzwtvvluDk+oAHcCYlc5IyQnBAmJ0ipECTyYm/Ncy8rSMZ1Cy2cyAQXVobOY3k7xaSoSK7BihYYWCc+1We/DqBwCxcznmqFsmccNUnZPHSO8pGr+uWsaWrQXuz8AIstN7zt6cGeFAQcV/cTGlaDJwZRO0+Us2PRSIatBlq0OIEKMbCWbBVwk67dJJNi95bfyoI7nMjVY5U6lW+ouDYO/DIFB5VSwEiQ8Wc/SI9/m2mFXHXMbFN58+x/mH7CVYESJtkg5vBlWUIA8Dnhs3ohukEyOfyMy+OTeYUDFzslTIPVjAM+1rsX4avDvbt9f11xLbs1d8zvyWmeDc4buCw== 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=u+EnlFnmR6xHYpiVbjLxFJvqnsq1NeCaHUxabngmG6k=; b=wXZ4iwr70OHB2dgPVLOpeEdpeZWZvT5nOnEzbVyfpsiJ6XxRKQbqr9f3ug8LMZy1MYOJzlPDYFnvrZVCSGjYz+ENVa3zNrSR/Kse+Az3m4nnNboNDpUDYhGpM+X0Z+D8lO9X9i6kBo+tJU/J10L9c+VvHBZA8uhHKJH95bMB/Ps= Received: from MW4PR03CA0313.namprd03.prod.outlook.com (2603:10b6:303:dd::18) by CY5PR12MB6453.namprd12.prod.outlook.com (2603:10b6:930:37::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.18; Mon, 17 Feb 2025 08:19:19 +0000 Received: from MWH0EPF000989EA.namprd02.prod.outlook.com (2603:10b6:303:dd:cafe::4b) by MW4PR03CA0313.outlook.office365.com (2603:10b6:303:dd::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.17 via Frontend Transport; Mon, 17 Feb 2025 08:19:19 +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 MWH0EPF000989EA.mail.protection.outlook.com (10.167.241.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8466.11 via Frontend Transport; Mon, 17 Feb 2025 08:19:19 +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; Mon, 17 Feb 2025 02:19:16 -0600 From: Shyam Sundar S K To: , CC: , , "Shyam Sundar S K" Subject: [PATCH 3/4] platform/x86/amd/pmc: Remove unnecessary line breaks Date: Mon, 17 Feb 2025 13:47:19 +0530 Message-ID: <20250217081720.107719-3-Shyam-sundar.S-k@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250217081720.107719-1-Shyam-sundar.S-k@amd.com> References: <20250217081720.107719-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: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000989EA:EE_|CY5PR12MB6453:EE_ X-MS-Office365-Filtering-Correlation-Id: cf55f74a-3bdb-4084-84b8-08dd4f2bc70a 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: UQfkTUnPQY+rud6NibW5Sn8+E+iDH4bxHvUl8PTPPorf0I5z9qY1DeFDDuPLZx6upWw6yYLA52/T5jKAqXzIaXbrypO4SaqfmN7AJz6q2axxDTgpX0ZPQHM1ITx2aaLnPfxJJLhw8U0RUy69v50E66LZ2UBtJMH7pWzTUK+FMnRnDLmMa170HJ+M8rijfahK9cIAHw/nu484xF4dtPunv8KNHxkVwxDRpa+cCJiyXhiHvWfnfOCfQhIwvcK1oAaUa8nq29tKOZ9G0IgrcPVK8VRPbvGBgAhsYdR/wLWE1BfmcsB0FcLOH7vF/vN6DwbbqDuCpmDCOOg+ytwWNt01zh2K8v1r4sIzf4pI4lgGsvDGRSx6ocjGrtqoDDLl79NGUq9F3BnwZvpUv51LZbKtN3fdj1ZBSlm6jSmuJTYDkpfglFwJgXlXVxmMCa7NvOWKP59ORTVZY6RPjsrh1GzW3FydbfVqc0HiwAFeBNnqCBBv8pcB7tpwry5pR9nga1gJVSriIz1EWFLS5uIV3OXn60bis7vbOauumPSV9iAoc8ulPxcQHjgKl92BEojDEt9/KCCpNReOO2hsSPePYWfZsKqeI4YFuxPZlzyAT2E+bJFPsqBFp1pAVd9qsYGO3D24llo3GSmgG2swHYZJEHZlIKGBDBfP2DsNslFXxZwTOIADCIdDtHNavacUGxpNtdh6cEc2wDIMWBOqGqP5EbYjeXvnVWQqbW/hSn5kTKnVrROMnLGCRzdIKlwDbJ0YBG0dhdHTBFiyfkFNEHsyHNggDkFovtm37bYC39fgxNZ4difsWn1HUM0qr1UksP9br52xdfkFQhEGuWQ3XdzaPY4YTdonKEi8VCDnO+FiViNUNP5c3RNauccGCgsTz1u+ARDq+B45pOgXEn3xWqZUM98lpa9Ks6dGBvkww+YSWuJQnNk4wjS4G3bi+0OyuyUxnywZv3q+r3obNEP2HRqe547SoLxxfUw4yif0I8uyqH5wboMpemyy+KwQOvZr3gC0ChgxE7U5NgCrT6gXiu5l5C1uvD9aEurJZERV5gCXJcfBcxpnKZ0RThI5t0PtRIwuqrLTA3MOTfn2d1SlHb8fQnzMy65sqL17HckgJL+q+qXlptQCRfZ7EEADmlEE/qndqneQ2uqicqo9iCY5AMF0e/LP5dc3ILm/GNUrfATLnGBE7wumxRAU5PmAnXsNyzDeah6ivY/yTkzZic/cc4qHcsLwlPzrijgaGssItw0f1kcC9fWqeIJpKU9nayM5QkmYhaJCVGi6qRJLQG4EKUbOwR4Pjqam/qUcCQPCpfsAB4MI+J9oGGylSz1YXtuQENeaGfti81T2Tq0Q1FrUBgyI4PK6JrLYXOU6NiLW8e0c1CN4v5TSITv9XRkLxqI6jknKn8COvzJEDfuv+g0O8lVvF+eJRRsi21EkDOOqax0OziKYPbq3sYUAGukYbVPzML99Ry3HFvRrexuDWNnkWfOxphu2bVe580UDkiD3scN+3vJnjls= 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: 17 Feb 2025 08:19:19.6303 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cf55f74a-3bdb-4084-84b8-08dd4f2bc70a 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: MWH0EPF000989EA.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6453 Enhance code readability by fixing line break and blank line inconsistencies. Co-developed-by: Sanket Goswami Signed-off-by: Sanket Goswami Signed-off-by: Shyam Sundar S K --- drivers/platform/x86/amd/pmc/pmc.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/platform/x86/amd/pmc/pmc.c b/drivers/platform/x86/amd/pmc/pmc.c index 742920530987..d80a5b899a1d 100644 --- a/drivers/platform/x86/amd/pmc/pmc.c +++ b/drivers/platform/x86/amd/pmc/pmc.c @@ -168,7 +168,6 @@ 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); - if (ret) return ret; } @@ -222,7 +221,6 @@ static ssize_t smu_fw_version_show(struct device *d, struct device_attribute *at if (!dev->major) { int rc = amd_pmc_get_smu_version(dev); - if (rc) return rc; } @@ -236,7 +234,6 @@ static ssize_t smu_program_show(struct device *d, struct device_attribute *attr, if (!dev->major) { int rc = amd_pmc_get_smu_version(dev); - if (rc) return rc; } @@ -704,7 +701,6 @@ static int amd_pmc_suspend_handler(struct device *dev) */ if (pdev->disable_8042_wakeup && !disable_workarounds) { int rc = amd_pmc_wa_irq1(pdev); - if (rc) { dev_err(pdev->dev, "failed to adjust keyboard wakeup: %d\n", rc); return rc; @@ -743,7 +739,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 +746,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 +761,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 Mon Feb 17 08:17:20 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: 13977286 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2069.outbound.protection.outlook.com [40.107.93.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 31DE319D07E for ; Mon, 17 Feb 2025 08:19:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.69 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739780366; cv=fail; b=K9BF6P7SLywRQJspNjw96HgCO7yEE6dN165T7y5EV0SR5QV69HiY0bNiQP6mbLUmPNgpdrecbedgywt4mOpWqrfxZad/cNiV6xKiJaC/W1XEDnEgXcIttJ5+ZaQCjK0wyDf8aQWikeK6gqEbRbK05bBgT87LHIQYbU0o9hk1+WM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739780366; c=relaxed/simple; bh=kcb5ZCTjAuTbGMvFn2d5sS1Bvh/vdIWAPQTmgYzImhA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Cdlh1Dspm49V5q4TrywLtcn6yOBGCNKYC8tAm/l0lKOYg04K/vUA1TaxXL2sPcZTmK+zDd+NKqcaYAbg4B/bqD8d7WBzPkyCtq4SAsXy/IKTB33goTP0u06IQbjw+mG7SitzXJ3oltZGyzJ6lgfgStevMLD19lEtv5W5+jG1ums= 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=yahb8CZS; arc=fail smtp.client-ip=40.107.93.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="yahb8CZS" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=V1vuOjEpwh3Ioy7GF5eyJNrO1+oZY4WyhhZA+6o7sNZmIt2VVaJt00txc+ZVrFQs3hp1hdMrZ+p490s93/0lJ8e861x0YYBUUIaV5J48EPk3jgDa8xJBIMkB0ObN5sVxD8FTAaTh6Qbvi+jjzV3od+gaNf54FAQjwDOzWDbqYTQus4iW8hRTPnX4tRrJu9gHNn3DDN4lEP7eMt9vwHofSu+8436x7oowId3s8YLeQ1MrbNpqfuUvCP0FWV/cdat4loqF0UPLD3/frmzV8FJeXwYc3DfgVhemR3XzNWTCIXQ6NVfySCgoYI1bTNQK1v+AHs9XBzwknpXbhMB7n4K0Wg== 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=HdRAeUjDv6/xJ7/5mnvkDOPPI1tN0TZ5k9uRZ4dtYoM=; b=hg9jf6KOgrgsufi+easPf10jHtBi47btb5XM9wclBkAJwFdEMjai6tOZHGqpdDaiS8roOblVRB9sAE1WVZdSzEPZlZlugz/34KI072y38LztLQSE5SsNSu42q9hWusBOS+48YZ8zAOVUGLS1eAfq6WA62kzgtskxkIC/VXJCMnRGEXwDMux1RAnruVAs1hmRE3CdvyluLmv1QUyN8vFSNEAf6owfGEDjX9ooupKqHMPx3ysIncVQk6P98dKLkDFVGSvSZt7UxgZhWyiIj+iymixjet98o5L1Ck4T2dt21NN9ot8ZNmuTD5KiKGUY9ZS/holF7pVZvp18yUkC59CJHg== 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=HdRAeUjDv6/xJ7/5mnvkDOPPI1tN0TZ5k9uRZ4dtYoM=; b=yahb8CZSFdrz5xExep4k2hDwlRPMoggU4NbuJQmSbaSToeLLdh2ayCK8ZMj5U+5zdmKEGZ/moVyBj5u2yGCNez4DxJ1W7qJtutjrHD0voQ0irLbe0agJsR2X42DZgqlLhXtebCHYOhDOMGU6l5cgGefyGAFNjcm7LE577fnnfAI= Received: from MW4PR03CA0308.namprd03.prod.outlook.com (2603:10b6:303:dd::13) by SJ2PR12MB7942.namprd12.prod.outlook.com (2603:10b6:a03:4c3::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.18; Mon, 17 Feb 2025 08:19:21 +0000 Received: from MWH0EPF000989EA.namprd02.prod.outlook.com (2603:10b6:303:dd:cafe::b5) by MW4PR03CA0308.outlook.office365.com (2603:10b6:303:dd::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.12 via Frontend Transport; Mon, 17 Feb 2025 08:19: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=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by MWH0EPF000989EA.mail.protection.outlook.com (10.167.241.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8466.11 via Frontend Transport; Mon, 17 Feb 2025 08:19:21 +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; Mon, 17 Feb 2025 02:19:18 -0600 From: Shyam Sundar S K To: , CC: , , "Shyam Sundar S K" Subject: [PATCH 4/4] platform/x86/amd/pmc: Use managed APIs for mutex Date: Mon, 17 Feb 2025 13:47:20 +0530 Message-ID: <20250217081720.107719-4-Shyam-sundar.S-k@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250217081720.107719-1-Shyam-sundar.S-k@amd.com> References: <20250217081720.107719-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: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000989EA:EE_|SJ2PR12MB7942:EE_ X-MS-Office365-Filtering-Correlation-Id: 3545790b-602e-482f-b3ff-08dd4f2bc81c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700013|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: qdfSzsF9MCueFz24qnR7OlcZ84Cl/ElSLZUSFTvRlCOLufD4UDH/GNGzNB74kLUBGOtPlGzaNXNI34YJAdhSC0eRAkBdGig+R9XzzUs9nU0/apOH+WosjYgdh2UMGh1FlcVT82lTIEGHSGbR8QrCV+eiT5Aa6JrxyiKwdsKSRbyLpSZHjf2hsVNdx8ebR8kznPaz4NUuzJu/6kkqIUGAT5bCQOHLsjI0RxkDuCqcaOxeDNp+labPDTtkyfKSO47qV8WaFpdl2/DJLQ9UWVOHO6mQwrSHhkTg3cqLr92raQKeBjUSLbjfZOBHhfV5LPoQ07tTtoxTg+5BsEVhg6Tc6kjD06aRt1ohmIfqx4RvYQ3UtwSXUwWh43spgbKTT4JmA9JNFDYP04l8Xybm1pDZPcAX7kLGE1KXZfOKpBkmN/L5S0ZUiuI4UFSGnFhYMRFu9CRAzLQegxpCRQ91tFb+Nt4mPpVsGeD9ZymzH0kmyN2mgym8NsXnkRy+MX3CzfOHZLj8RwPoi0czGyVf/tU1PFuqul4MZmZPR21odC/zs6HMpyA1z2lzfnMuQIsXtKWntVgZAq9iYGdd7iWRZtA6obJxXHO2V5JbVd+EpAeXxtn9BER0OKXS+limdhoUcIrAnlBSdGifFCAFazU6fgd0KmP+FsKXxXhBpskZw0LYUEzqs6Crrb6nTFGQ2rgzbuyRjst956lRE48KcUV5Lfc48AhBGWCGjCJXMHNj2U/zhLTpGifS8XuqqIoizDet+NfnNLqvUZ53CMqy1SwKoT8Kb2Z726kuTM4dGY1a7z1fQqvExZEiLsxQTXmVK5bnBVOrStcr7enuy3INlwniF60cHFWIh9Xs8rxvyas9Nisz/P+ck28YTJ8SsJYD4VFB99/H5/z6KlqADW8nPtaiYU8xGX2dfjfvwLO3gugGiu5mEKVNA9OZEYHVn3aV1gd4T0ciALqnb9PM1n1qWHPGRy2dGLfzQvpvIvR1dYkUXh+p9E4hK1k+swHUuXnJWxNdIlJqc7WS56s3u3YCUaqQPSTpdipIMQc6mpNbiyUHJxqiJAWD+lXu9XxULUifd/tkcq7Lwk1CflMjBh2nLHhAiFvibGyFFa9dBJQhsp6UQnBnJvrIvl3WOGIQ5qS+eBNMHHZTy66YavsyQeQBLfZAQr+eYmnX9fZADuMGJiErQ14zK6yD97Rp0N8PeVd0TIPdc8AnLtzcPWUwmvG6H59oclP5l5TGh2DTKuZa3e4SIcZpvkysdELYC3YICwh4t2Olnn6oz7Fne0RJSIeA5u9hyDtNtza/Yqr5b+W/Q7Fkky/nWn7OgWtyy/KjhrddXl7oR8He+/fz/rtXM9Iutxt5zwR8FvtiRpljspq8gFneV1gVnlE0x/6Ejx87GpANOUx0izUa0ZINSmu74T9IDCP650M4Ro8f6TCngeWARifxIRBYPU5nHwMXFXpcp6DAcooPSKCvR31qmokb0LEg/PmjmK5EtV8ArJKXtD/6hmhj4xo8QwE= 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)(36860700013)(82310400026)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2025 08:19:21.4272 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3545790b-602e-482f-b3ff-08dd4f2bc81c 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: MWH0EPF000989EA.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB7942 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 --- drivers/platform/x86/amd/pmc/pmc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/platform/x86/amd/pmc/pmc.c b/drivers/platform/x86/amd/pmc/pmc.c index d80a5b899a1d..f4768bd6b424 100644 --- a/drivers/platform/x86/amd/pmc/pmc.c +++ b/drivers/platform/x86/amd/pmc/pmc.c @@ -778,7 +778,7 @@ static int amd_pmc_probe(struct platform_device *pdev) goto err_pci_dev_put; } - mutex_init(&dev->lock); + devm_mutex_init(dev->dev, &dev->lock); /* Get num of IP blocks within the SoC */ amd_pmc_get_ip_info(dev); @@ -817,7 +817,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[] = {