From nobody Tue Apr 7 12:06:07 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B1BCECAAD5 for ; Sun, 28 Aug 2022 22:21:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229570AbiH1WVq (ORCPT ); Sun, 28 Aug 2022 18:21:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229477AbiH1WVd (ORCPT ); Sun, 28 Aug 2022 18:21:33 -0400 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2041.outbound.protection.outlook.com [40.107.96.41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FBD22F667; Sun, 28 Aug 2022 15:21:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kJPRWXMP3127IxaY85Sj0pIaiplVJKcfietT3MY0QS9+AfiTBfGyzyGFuk/HMxkEhCPnUIWsbbJ/ZoW8o6eFx50/dQhdlIrPAUJmJyh8haXmKJVzH/CHQDGjo6RfJq8O3J4KFAJtT9g4LDl335r91RFS3yIkRS+OBgyewyVB/HFPAm1CoKWq5HjwAcFiqkdXhu5IhwtG4rec6gXWveUOY8B5yb02LJXtYWS+el+UMleMpLkLdoMO6cXxJ1kMmQRT9pz8bRQ65xvE9y1RfLSnaBtl7q8NhNpAaRNVdh+sswimaTD0BxK6Vw1I6u6KRgckCMno8cYU7qxbYsddUx+GoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=drevcUYjzqs21Vih8vPeyiPAB2TElvuLnvfR/597mSY=; b=graSdPx9f8pkW0kUhWhMU9V+pKLQgH3hxN5WGOPfLyx1FkbwmeG8t5tQZ0WxqW8WMNzQ2fMELwSBrZxjerO2ewO3cY+7bTV6XiacAvWHvQJ9ShLkPQ+2+IDlJY39I5ayddqnIl9pCSvrDKfxOuQFmz3rXQn6DeFaen0nRvjPm39XgmVjcUSdhpx74GTUzySLl8hEgtkab3XTeQIVXTghyx0wS2plUFWov17aMg/nbdLas9kfilRe1SoFDhgyYRTXI+lj7nPZPlgtz0h78A9PMf03E4aM3QyT0lOm75YxNA9EPvQx7pKyARXU5Qtw1W9hH5uQt9vdn/vEh6Zzqxy0TA== 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 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=drevcUYjzqs21Vih8vPeyiPAB2TElvuLnvfR/597mSY=; b=1zLwBMB9RvBvn+BvfxgU+aomB1GksXd8mvNXsAxF2y9OM4Kbv2Adfkd3h+mL0IZqrZV1hgBRkikboCF/EHTFH+O9rcEgJ9ETlxwQT2K9tXk5s08Y3mfcViQL96nsTJt0qCwUJlrcLRFxLlbdy+ZtvGEzovYkiGjvNmln6oVtAxQ= Received: from DM6PR02CA0157.namprd02.prod.outlook.com (2603:10b6:5:332::24) by DM5PR12MB2391.namprd12.prod.outlook.com (2603:10b6:4:b3::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.19; Sun, 28 Aug 2022 22:21:22 +0000 Received: from DM6NAM11FT050.eop-nam11.prod.protection.outlook.com (2603:10b6:5:332:cafe::f) by DM6PR02CA0157.outlook.office365.com (2603:10b6:5:332::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15 via Frontend Transport; Sun, 28 Aug 2022 22:21: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 DM6NAM11FT050.mail.protection.outlook.com (10.13.173.111) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5566.15 via Frontend Transport; Sun, 28 Aug 2022 22:21:22 +0000 Received: from AUS-LX-MLIMONCI.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.2375.28; Sun, 28 Aug 2022 17:21:21 -0500 From: Mario Limonciello To: , "Rafael J. Wysocki" , "Len Brown" , Pavel Machek CC: , , , Subject: [PATCH 1/4] ACPI: s2idle: Add a new ->enter() callback for platform_s2idle_ops Date: Sun, 28 Aug 2022 17:21:18 -0500 Message-ID: <20220828222121.4951-2-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220828222121.4951-1-mario.limonciello@amd.com> References: <20220828222121.4951-1-mario.limonciello@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] 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-Office365-Filtering-Correlation-Id: bcb7d181-b852-45eb-9f37-08da8943a381 X-MS-TrafficTypeDiagnostic: DM5PR12MB2391:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VodE49efcsnJRBXN2MfqTxJ8z56ivvRNPS/M5P9673njBtMhsMRtfRL+b4vuiqQonwiJ9+rEPNQZ78Txyr5g+hqirTTTg4/P2I7SbV18r8jmwWgVGnDkC5Te53KfQqeLQVgtZvWessotM4kNYmeeJh2sRiD1U2SWeBkIQn9Bivs8ofroyY9yK6dR5QSCk3hpceaUY9Owy05/un0QLt8AsbbSibrkV0xBYITQCpTOCcTP4XKOJkfrsXAJub28h+7LjRqVugooNNkW+sxybeU93/Md8JUZWVRb1LDm12ALu7dcf/CEuQrhSjSS6IxmpqzjQpBa1h0D0+okPjLhIuTBuneWnpCy+AjnFKzcletNmad2OkJTuePFz//UHG6BNO9SBMVnumuK0cTgN/wwfHSO+HRsoaJL2/UChjWpoIBvzaztL4l8Ijds0OawJ/MT1Y9XwQaiZJxIypbYTJq4z2zHviibGssZMp2u3hU4ztLQHc8xS3p67tmtJhFAFaGOr/ngoADIQxVyFxYZlpnE3ADbbUjjY4M5uMqK81uTnpEkoPQhjlyjbC0un7qfkCg5Rge7f4dAX95Ke/T/QFv+qR0a3peQTGSosI7tJfFVGpPO9c2/kbkMZDsIO5Vd6/05BsWRnm9XFrAn3o7qfPjzX/uyCKdb6Pe3Wk+TUFSKvmuFdHtw3ijjz/E/LgPHY67GLWxwcEOLpXdzJ5+V+p3gBWFc0wzHK46Bas/tOuhCFcWyD0j45wiizM2EbpXvmwL31DBlgfrL2Rt+4u3FQR7J4i0gICbyscZUCGJmcg3k16tA4GKTKC0Xy70rXP5RBXfCbdFe 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:(13230016)(4636009)(396003)(346002)(39860400002)(376002)(136003)(36840700001)(40470700004)(46966006)(6666004)(7696005)(86362001)(26005)(36756003)(426003)(336012)(186003)(16526019)(1076003)(47076005)(478600001)(41300700001)(83380400001)(2616005)(40480700001)(82310400005)(40460700003)(4326008)(8676002)(54906003)(70586007)(316002)(70206006)(110136005)(82740400003)(81166007)(356005)(44832011)(8936002)(5660300002)(36860700001)(2906002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2022 22:21:22.2529 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bcb7d181-b852-45eb-9f37-08da8943a381 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: DM6NAM11FT050.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2391 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" On some platforms it is found that Linux more aggressively enters s2idle than Windows enters Modern Standby and this uncovers some synchronization issues for the platform. To aid in debugging this class of problems in the future, add support for an extra optional callback intended for drivers to emit extra debugging. Signed-off-by: Mario Limonciello Reported-by: kernel test robot --- drivers/acpi/x86/s2idle.c | 14 ++++++++++++++ include/linux/acpi.h | 1 + include/linux/suspend.h | 1 + kernel/power/suspend.c | 3 +++ 4 files changed, 19 insertions(+) diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c index f9ac12b778e6..c984093a3657 100644 --- a/drivers/acpi/x86/s2idle.c +++ b/drivers/acpi/x86/s2idle.c @@ -486,6 +486,19 @@ int acpi_s2idle_prepare_late(void) return 0; } =20 +void acpi_s2idle_enter(void) +{ + struct acpi_s2idle_dev_ops *handler; + + if (!lps0_device_handle || sleep_no_lps0) + return; + + list_for_each_entry(handler, &lps0_s2idle_devops_head, list_node) { + if (handler->enter) + handler->enter(); + } +} + void acpi_s2idle_restore_early(void) { struct acpi_s2idle_dev_ops *handler; @@ -527,6 +540,7 @@ static const struct platform_s2idle_ops acpi_s2idle_ops= _lps0 =3D { .begin =3D acpi_s2idle_begin, .prepare =3D acpi_s2idle_prepare, .prepare_late =3D acpi_s2idle_prepare_late, + .enter =3D acpi_s2idle_enter, .wake =3D acpi_s2idle_wake, .restore_early =3D acpi_s2idle_restore_early, .restore =3D acpi_s2idle_restore, diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 6f64b2f3dc54..9df14b5a875c 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -1076,6 +1076,7 @@ struct acpi_s2idle_dev_ops { struct list_head list_node; void (*prepare)(void); void (*restore)(void); + void (*enter)(void); }; int acpi_register_lps0_dev(struct acpi_s2idle_dev_ops *arg); void acpi_unregister_lps0_dev(struct acpi_s2idle_dev_ops *arg); diff --git a/include/linux/suspend.h b/include/linux/suspend.h index 70f2921e2e70..5a3fdca0a628 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -191,6 +191,7 @@ struct platform_s2idle_ops { int (*begin)(void); int (*prepare)(void); int (*prepare_late)(void); + void (*enter)(void); bool (*wake)(void); void (*restore_early)(void); void (*restore)(void); diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 827075944d28..0c08032d6b50 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -136,6 +136,9 @@ static void s2idle_loop(void) break; } =20 + if (s2idle_ops && s2idle_ops->enter) + s2idle_ops->enter(); + s2idle_enter(); } =20 --=20 2.34.1 From nobody Tue Apr 7 12:06:07 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6AF9AECAAA2 for ; Sun, 28 Aug 2022 22:21:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229478AbiH1WVj (ORCPT ); Sun, 28 Aug 2022 18:21:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229475AbiH1WVd (ORCPT ); Sun, 28 Aug 2022 18:21:33 -0400 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2075.outbound.protection.outlook.com [40.107.244.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 738922F3B8; Sun, 28 Aug 2022 15:21:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fC07m0fKYy6Y2lW8lVh40ItOrt53vyRscnbmRQ0MCh8+6wr6lCBSrMaY54ED6x5HKjWLg4iA+scaHm1vrfJVfYmrGorKjJuoJn6pOuDfmEu57QxacGzCFTynn9imsQT79NNNmXBsKn1dEmWeUKMm5S8xFaKt+6RtwVj5dc5Mc/w9te9AoUexkhRDtdudT6w37jfaJQBPSJR9A4m/cYBM0ubDK6f9PYL4+B3xG25LnwFuQsAxG0OMCdwHwXmxWbX4i3MvgESkwrj0XmGeTcGWKVJIyktk8m8ICWcLS+4JVSoTT0TZ9FNRm72Z1ZO4x3Ahz5jmIg+0vhxKFLedZ5yK/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=XnZ/N898WaCzVG9jDcNt0kIKmLu//Xa4CSeyFO1a5j0=; b=hCENVFlkmttologqqRZjt2Z6dkMmh0Ixc2rgxjLOhsfrVYno5tVJVh8q1gaukX32u9KpKLbIqb42eezCzDZ+2RBLdgCOQb7kKqYz6wH7QAeXbXWW/XiogLfKgldi9cOV2jkfhLeLjGJpF9cfJO9ZOvFuMNTZ1VbNHcLws7e0Ev7/wNVieWvPW04dN07QmuZ4jKtgL7u6mMasf7MYsbPySrEHwbH9TrLbV4yDy7rnV5SbrhFQBk6wf7XgIqNznUdSfixK8MCeHewm0Z2RtD6lfcePfNJ9MS3fefjUy2xyKmHv43pJtJOUCt5HjeTmu3Ed/a7qD5Mr4ceuNEgesBUk/A== 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 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=XnZ/N898WaCzVG9jDcNt0kIKmLu//Xa4CSeyFO1a5j0=; b=GLY4GA5ys77/7/Ga0zijg1CeQz3OUOncs0C0YqgMcD78Qyjp992ybgi5mkMXnxkdYSj4VMScbg+gbeXQlpoJ5GiHXN3YM1VDpy6QWL/pxRCWKY+EZjJCD/QbpMqNHv5NNBQHo22cpa/4BKmxdj5dTLDLh6cie1Klc4rHUCX15i0= Received: from DM6PR18CA0035.namprd18.prod.outlook.com (2603:10b6:5:15b::48) by MN2PR12MB4990.namprd12.prod.outlook.com (2603:10b6:208:fe::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.19; Sun, 28 Aug 2022 22:21:23 +0000 Received: from DM6NAM11FT092.eop-nam11.prod.protection.outlook.com (2603:10b6:5:15b:cafe::75) by DM6PR18CA0035.outlook.office365.com (2603:10b6:5:15b::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.21 via Frontend Transport; Sun, 28 Aug 2022 22:21:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT092.mail.protection.outlook.com (10.13.173.44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5566.15 via Frontend Transport; Sun, 28 Aug 2022 22:21:23 +0000 Received: from AUS-LX-MLIMONCI.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.2375.28; Sun, 28 Aug 2022 17:21:22 -0500 From: Mario Limonciello To: , Shyam Sundar S K CC: , , Mark Gross , , Subject: [PATCH 2/4] platform/x86/amd: pmc: Add defines for STB events Date: Sun, 28 Aug 2022 17:21:19 -0500 Message-ID: <20220828222121.4951-3-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220828222121.4951-1-mario.limonciello@amd.com> References: <20220828222121.4951-1-mario.limonciello@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] 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-Office365-Filtering-Correlation-Id: 521673e0-03e9-45a7-be18-08da8943a411 X-MS-TrafficTypeDiagnostic: MN2PR12MB4990:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Eh8duTQblkBhAMSZeS1/Sh42x6gNI+vio8VZa2g3DKlJr0sLQMSJMNrdbVh18R5yoSyzIasl91+C0yQ/ZgxfbNdh4Fev6q4GKsxxCjtgfC+br7v3hdfR+1GPx+dL/cpa/UorlHtPxOU7a3XXXW3a4kHizfGvhSMiLdSka3sk73n/8a/3N72pMx302KUdC6qRpVnqoYPcyKUxsbSlcpfQO9OnfYDUwgjcANPy+VPJ+hM6vrDHi07RXIT3riO8gmePfjJqikpWI55pm1fiBG+tBT0iz01wHwqePjAyj/62LIbFFgpXpULuIEEHXBj+Bzb0h4yBvDDikdsxu2CBxJ19Ygsys/rLO8mwyVkuCvBKr32tZWD3QBaPHwHv+LHLQggSVk8pN45QyYw6RmHHgWg21Cwtd+WmuHpX8Gj7fx4d0Sci7M0c0wqNG5Yh3lmIeCbjdV+vBRCW2cGwht1ZovQl7u6D2rNtC5D0GEwsaoVKcuEmYE4ZaSyO6Xy8VLk64hxAGkE2oPEkoCfa7FpWSTzzHWpAPTvKNBjMK0P/do9CiGaParlGxRc7jFpmdCKA9zrPgUvT/N2XA7e2cWWDvY3AlGmqY+8TVlkPxvB0kNGD6ru4VFc9S4AWGLMLkJZDVuDaoD2FppzSFkBX5cbCqkAtWdgG/ZeqEowPM/1zJXrCPogLc4zGU0TJ1syHaExxm9u97/d+9K7V6Lhgo7XV3/i8LlbnqyHRcm2TX4GyMz5Pj8TGC7BuE1ahOd5/BjF4vFAEQHJ8UmSpgJUcsCubBuGeXbwwqOMjaVl2Hg186HKzxrUjyntJ70aFq5S/ynITTmAp 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:(13230016)(4636009)(346002)(396003)(136003)(39860400002)(376002)(40470700004)(46966006)(36840700001)(82310400005)(40480700001)(36860700001)(356005)(82740400003)(86362001)(40460700003)(70206006)(81166007)(110136005)(4326008)(8676002)(478600001)(41300700001)(8936002)(5660300002)(70586007)(54906003)(316002)(6636002)(426003)(16526019)(47076005)(1076003)(2616005)(186003)(83380400001)(2906002)(7696005)(44832011)(6666004)(26005)(336012)(36756003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2022 22:21:23.3849 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 521673e0-03e9-45a7-be18-08da8943a411 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: DM6NAM11FT092.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4990 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Currently `amd-pmc` has two events, but just adds one to the first to distinguish the second. Add a clear definition what these events mean. Signed-off-by: Mario Limonciello --- drivers/platform/x86/amd/pmc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/platform/x86/amd/pmc.c b/drivers/platform/x86/amd/pmc.c index 700eb19e8450..39e6ab88861d 100644 --- a/drivers/platform/x86/amd/pmc.c +++ b/drivers/platform/x86/amd/pmc.c @@ -39,7 +39,8 @@ #define AMD_PMC_STB_INDEX_ADDRESS 0xF8 #define AMD_PMC_STB_INDEX_DATA 0xFC #define AMD_PMC_STB_PMI_0 0x03E30600 -#define AMD_PMC_STB_PREDEF 0xC6000001 +#define AMD_PMC_STB_S2IDLE_PREPARE 0xC6000001 +#define AMD_PMC_STB_S2IDLE_RESTORE 0xC6000002 =20 /* STB S2D(Spill to DRAM) has different message port offset */ #define STB_SPILL_TO_DRAM 0xBE @@ -701,7 +702,7 @@ static void amd_pmc_s2idle_prepare(void) } =20 if (enable_stb) { - rc =3D amd_pmc_write_stb(pdev, AMD_PMC_STB_PREDEF); + rc =3D amd_pmc_write_stb(pdev, AMD_PMC_STB_S2IDLE_PREPARE); if (rc) dev_err(pdev->dev, "error writing to STB: %d\n", rc); } @@ -724,9 +725,8 @@ static void amd_pmc_s2idle_restore(void) /* Dump the IdleMask to see the blockers */ amd_pmc_idlemask_read(pdev, pdev->dev, NULL); =20 - /* Write data incremented by 1 to distinguish in stb_read */ if (enable_stb) { - rc =3D amd_pmc_write_stb(pdev, AMD_PMC_STB_PREDEF + 1); + rc =3D amd_pmc_write_stb(pdev, AMD_PMC_STB_S2IDLE_RESTORE); if (rc) dev_err(pdev->dev, "error writing to STB: %d\n", rc); } --=20 2.34.1 From nobody Tue Apr 7 12:06:07 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9459ECAAA2 for ; Sun, 28 Aug 2022 22:21:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229577AbiH1WVu (ORCPT ); Sun, 28 Aug 2022 18:21:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229526AbiH1WVd (ORCPT ); Sun, 28 Aug 2022 18:21:33 -0400 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2076.outbound.protection.outlook.com [40.107.92.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2F1112091; Sun, 28 Aug 2022 15:21:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lKwmpI6LZmTkQnXINSRUX1V7hDFUc86G3nnObNdZZslAdTdtUoVQXElRMHb+lNxcW6oGcQculXcl1daHefjc4bcHWt++19j1Wic8AR1aDphNM2h2eGRAiPtU+tOcBNHrf9atpvJ6td1WjtoFnBXL5jqMWXhbELKT0KZbTj+xQxYLvhfYOeu5dlL2s/2hl7hKLhloLQ2bYhYIcUydL0VB6pEpNzy13rhwiuV8kIbu8BtXlmm6EKFbxWdxjok8/y3RHr69KNxH+gIlzeeRxtY0HQOu9ui3/6giK8RFShUg9bWOoPheCTEmP2RmjWbhaXGb7Khbt2hD7fDTYauK8FkYHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=ilsrEfqeQeGNIwJPwlMXeq9QSa2qNQJ8jTqOJs0TQOw=; b=N3GV/8dnI7+oe65ZKPktLG7tTXM9oBO6jXPHnTkph1ybcS0Cq33f80ahnLnVOkXwkHCScItiD2tv05dYIFkolN1Dfhib3AhCrGk0GLuZok3Z+S9Q8MtMxJoGEuEfVrRSTJa1ms6mUXzFScYIDsEbUATwGNbIB/jJ4NpKO2c5LqbNbhWj9KIOVj5wdhMKwiRs0jqn/3VIj+N4UUsV8f2TEp9Jb6qTfSQkt80N8et0kiQo2akkY3OYyez1/0C06qEO9WyhDsoYOuCT7fQJ5gp8k107GJHo+HVBggQjtzT/Pc3OJ6Gu9FRSHYjzTb9OiWw9537Gxcs4b14jc3RR0xAztw== 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 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=ilsrEfqeQeGNIwJPwlMXeq9QSa2qNQJ8jTqOJs0TQOw=; b=VVbk6fqr6hl2RVt4W9fSmaFIq/JWSzy2XtGdudb50DqUGptoKgup5UvGfITbgzTWn7AG59iibNGTV/QaSkp3o1bjwjqQ5IyYglZnsIVcREkngVeZYvw0cVT7hMA2YKnwGcXdv3VQ7oEiewC97fnih8RclvviVHBxAxjV7IOthfE= Received: from DM6PR18CA0031.namprd18.prod.outlook.com (2603:10b6:5:15b::44) by PH7PR12MB5710.namprd12.prod.outlook.com (2603:10b6:510:1e1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.21; Sun, 28 Aug 2022 22:21:24 +0000 Received: from DM6NAM11FT092.eop-nam11.prod.protection.outlook.com (2603:10b6:5:15b:cafe::73) by DM6PR18CA0031.outlook.office365.com (2603:10b6:5:15b::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.21 via Frontend Transport; Sun, 28 Aug 2022 22:21:24 +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 DM6NAM11FT092.mail.protection.outlook.com (10.13.173.44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5566.15 via Frontend Transport; Sun, 28 Aug 2022 22:21:24 +0000 Received: from AUS-LX-MLIMONCI.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.2375.28; Sun, 28 Aug 2022 17:21:23 -0500 From: Mario Limonciello To: , Shyam Sundar S K CC: , , Mark Gross , , Subject: [PATCH 3/4] platform/x86/amd: pmc: Always write to the STB Date: Sun, 28 Aug 2022 17:21:20 -0500 Message-ID: <20220828222121.4951-4-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220828222121.4951-1-mario.limonciello@amd.com> References: <20220828222121.4951-1-mario.limonciello@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] 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-Office365-Filtering-Correlation-Id: 1ef8f347-e97f-4de7-a405-08da8943a47a X-MS-TrafficTypeDiagnostic: PH7PR12MB5710:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aGpCMlWzWkTTZg3R3HC9yIHya5qRNKxsXDUiD7hQ/IB3T/NkTig199AWVk2/XSdOyTOR4sZPehxvCAV/fPl5+1EZ/Bz42Kdxg2JaDWhgsEEWNKPWmyhCIdWhnkiSp1VGapktGPTVqWHYfuyJQkO04HKA4Y1RazDm50xEp4TJsjpA12Mx3liWY7C39/amvv0AyR0ZUxyLp2A7GsNy85NaKDSSV6gQBpymInfuugX6ICuJkLQTn28lo6kJSLSKFPW4a98dyftAJNl7b8vSD03NMbYFJjEVXyvIcdnQsDLF6krpdAB3u8UeXQ7u/4btVIeH2amquZYGS76SkctqJCyoEHPiv5ayNN2V7LcNe5T0NU4YE5eS0E3+7Mw3LwwsOkepS6Jj7H0+ZKIYqZmqCcNl/wMSL00jFVGcXaCkvR0HzLuHO6uBL+mSu93XSwHdJgXuE9Y86enfRccxJ2z/AftGxGP9JuhSHOEZ52W+bnztZs4vdGzaJH1zvjCBjgWBXoeVOvDYKX3KTOexzUUbq5cBjtNa2VW7WU0GYm6CgjzNKS/UbNQ3mJ7w1v0dARQQPlmtASdyyPDY/VPQeKfsMwoQt1hIKwb5/tAIyM4gCVCqlDyrnclVtXRXmJM31Fu4SP3qRNG7RDeq0/h60Xhn3FTgwARZVyoLrQQk1lPUr44RPzZd2KhM2IU9rO5343FrZxjnSP38IRwS/32ioAN2Fkk0RfC30lONC0af0KG7u0mj23MgGB8Ke+muuwPDxOb5fzrNMN248/AUP4UKo/YUUXsuN+xTznvnGBtFYp4x328o2HbwACkIDUpM+V+j4T6mhjXG 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:(13230016)(4636009)(136003)(346002)(39860400002)(376002)(396003)(40470700004)(46966006)(36840700001)(70206006)(110136005)(6636002)(54906003)(8936002)(5660300002)(8676002)(4326008)(36860700001)(426003)(1076003)(2616005)(47076005)(44832011)(70586007)(316002)(36756003)(2906002)(478600001)(41300700001)(7696005)(26005)(86362001)(82310400005)(356005)(81166007)(16526019)(83380400001)(336012)(40480700001)(186003)(82740400003)(40460700003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2022 22:21:24.0723 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1ef8f347-e97f-4de7-a405-08da8943a47a 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: DM6NAM11FT092.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5710 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The kernel parameter `enable_stb` currently gates the access to the STB from debugfs and also controls whether the kernel writes events to the STB. Even if not accessing STB data from the kernel it's useful to have this data stored to review the STB. So in suspend/resume always write it. Signed-off-by: Mario Limonciello --- drivers/platform/x86/amd/pmc.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/platform/x86/amd/pmc.c b/drivers/platform/x86/amd/pmc.c index 39e6ab88861d..fba42036682d 100644 --- a/drivers/platform/x86/amd/pmc.c +++ b/drivers/platform/x86/amd/pmc.c @@ -701,11 +701,9 @@ static void amd_pmc_s2idle_prepare(void) return; } =20 - if (enable_stb) { - rc =3D amd_pmc_write_stb(pdev, AMD_PMC_STB_S2IDLE_PREPARE); - if (rc) - dev_err(pdev->dev, "error writing to STB: %d\n", rc); - } + rc =3D amd_pmc_write_stb(pdev, AMD_PMC_STB_S2IDLE_PREPARE); + if (rc) + dev_err(pdev->dev, "error writing to STB: %d\n", rc); } =20 static void amd_pmc_s2idle_restore(void) @@ -725,11 +723,9 @@ static void amd_pmc_s2idle_restore(void) /* Dump the IdleMask to see the blockers */ amd_pmc_idlemask_read(pdev, pdev->dev, NULL); =20 - if (enable_stb) { - rc =3D amd_pmc_write_stb(pdev, AMD_PMC_STB_S2IDLE_RESTORE); - if (rc) - dev_err(pdev->dev, "error writing to STB: %d\n", rc); - } + rc =3D amd_pmc_write_stb(pdev, AMD_PMC_STB_S2IDLE_RESTORE); + if (rc) + dev_err(pdev->dev, "error writing to STB: %d\n", rc); =20 /* Notify on failed entry */ amd_pmc_validate_deepest(pdev); --=20 2.34.1 From nobody Tue Apr 7 12:06:07 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9CE52ECAAD5 for ; Sun, 28 Aug 2022 22:21:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229527AbiH1WVm (ORCPT ); Sun, 28 Aug 2022 18:21:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229455AbiH1WVd (ORCPT ); Sun, 28 Aug 2022 18:21:33 -0400 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2073.outbound.protection.outlook.com [40.107.212.73]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39FB022285; Sun, 28 Aug 2022 15:21:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gBhYOhVXykvTecvZQlgmjZlRk3xkdwvYPEa2DEDHy4MfmSBOlA3Cpkb0oySOu7ocnjmrclax9ePnsPKFfGDNcYGDfwIr1S4Rp5mQCJL5sKOPL76698/JnvnnD8kWlIp2kcApqfw+tfmCKBJxRcvzQtKXucP6c8SVpkIh0kIyiBGDG6ZHF8lhPUmJkm8BAw9RBHgAOahap7FZko9USYfILBHjDA83D8krCCNBekTliGyIO5CmGLgtH3AqhcLJlwbIhJJSeO8pV3Z6/N8hX7E/hRFXHgutOYUa1oQq74f8cOFifHJYh5zfCY9/KLB+lJfzmbflmAxD7Ez1p4FZd31lwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=Qi9ZUfTpmVduCRIEpa+V80hUGZgU4eRFRZeo55K2zzo=; b=agsGblNUGETVzV+nd3v1bo7f2V7gHakDJ8BzZ19hKoLO8JEsLBCvFwNsrszt8E2fWhvMQY0/ScEWVOKNaO1J0lU9kSWFRtHpFf5wrVmbfpn1o4rPeg56wsPd52NPmoL9SEq2W9dtTL6/9zOXUi1xk/dl7P7FpaDFDh5VlxiRf8QqZd99lQH8VqxCPS2oTSqQydDq+Eoqbv8VSAIumay9mWiAgmTxS7IQaWKCfgNIfKwW9ERxSpWBRtv6tj9Tk04EGBb+Rm3Nz5AIKDkzxx5aAhVloRLqmvfZaPlUF5kQuH0yAP078wPAMFd9deoYoDOXlWOGMEp97SH0nmg82MN4Rw== 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 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=Qi9ZUfTpmVduCRIEpa+V80hUGZgU4eRFRZeo55K2zzo=; b=NXX9wBAldhb4Kfqcr2ht7pu56kjyPpe4N/NAG7LLZbC0afQGGUG5nML2vRxxHY/UEGI+7Yo50Q+2mTjhDgaGYtoV0M9Zzv+5+VCjzO+S0/QJ1FXEhslFSZfbRAwWBO2j49ZPhCqogsNqrUriPVrsILX6XdWQHaXh6dY9R4wW6vI= Received: from DS7PR05CA0009.namprd05.prod.outlook.com (2603:10b6:5:3b9::14) by DM4PR12MB5101.namprd12.prod.outlook.com (2603:10b6:5:390::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15; Sun, 28 Aug 2022 22:21:25 +0000 Received: from DM6NAM11FT093.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b9:cafe::e5) by DS7PR05CA0009.outlook.office365.com (2603:10b6:5:3b9::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.3 via Frontend Transport; Sun, 28 Aug 2022 22:21: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 DM6NAM11FT093.mail.protection.outlook.com (10.13.172.235) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5566.15 via Frontend Transport; Sun, 28 Aug 2022 22:21:25 +0000 Received: from AUS-LX-MLIMONCI.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.2375.28; Sun, 28 Aug 2022 17:21:24 -0500 From: Mario Limonciello To: , Shyam Sundar S K CC: , , Mark Gross , , Subject: [PATCH 4/4] platform/x86/amd: pmc: Add an extra STB message for entering s2idle Date: Sun, 28 Aug 2022 17:21:21 -0500 Message-ID: <20220828222121.4951-5-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220828222121.4951-1-mario.limonciello@amd.com> References: <20220828222121.4951-1-mario.limonciello@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] 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-Office365-Filtering-Correlation-Id: 505c66b0-ffaa-4dc4-8c56-08da8943a561 X-MS-TrafficTypeDiagnostic: DM4PR12MB5101:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AwP8BBP1FhLCzbLJCFvtG6ExQvT4Egi+VwIR4B9bKv4sCHqeJuHkXAF4ilSfXquPxPcO15onlcDd6gahuSK+CbKe5OrHIPFSpBbMclaWGFz3cYagZiuKlIxbntcxtw0CfTqG8oS6+klNPQiWD0G2z/kbozF0JC7p7SqrQ2mFWvhPsBYeZPklUMMWLR9aUEftGtJA71UuntjP2GSYem1TsCyyBosiorUuC+Tlm7ov9cVkivsiWlZtC4TAfc16A+2xFFCIFTmvmldkSXmKct91dev3hCoqj4r1E1iGmnJAxwreVWr5+fvyElE2LSs+MX1K9X1VFfbIfKgi89K67LljLnC71J8jfZU9m6ifwgNJhpmRpQo6xTqZutEd7Skf1U/FyRkmm2w8Hs6SMWA9Ro2qGupmLmjBJOf7lPzLdiTMhBP//CyB5XPppcfwk1Zzr9cxC6JR7VI/wigJj4VD0UllBLGl4Nl2YS4zday3x3M0Z9EQTcWeoTdlIIsLEIBSQ5PYuwZ91/oDMnupwsSrwfm+rClPFfmIQrbnZ3d9HxDWD85wEsg6uXxjKAzC0O+lqtBxpBleoeRqLMy6zHjWfgnWIMcFfGp4Iy8mUCVIxy7Qy4UcjTJUHx15u1Eo1/Ru9tTJZQ1Y+hLdEkZl0AMOHY4pMcxsGjVs345nosuN5DzUz5uK20VJnFcyelkBu17MDCFxtx78RnYjcYpRX8MPbRVYDR+cSTc5xa+JA/iDWSd2ofT95c2jhrVIe1X8AY5ASseJ3a32odSmxh/L6QqJog+j6sGpm+jJ30ixRr+t11KYvZrI0JGS+XJ3YL2cGNsqLYMq 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:(13230016)(4636009)(396003)(376002)(39860400002)(346002)(136003)(40470700004)(46966006)(36840700001)(8936002)(44832011)(8676002)(4326008)(36756003)(82310400005)(70206006)(70586007)(40460700003)(5660300002)(40480700001)(2906002)(15650500001)(86362001)(36860700001)(83380400001)(356005)(82740400003)(110136005)(54906003)(478600001)(316002)(6636002)(336012)(16526019)(426003)(1076003)(2616005)(81166007)(186003)(47076005)(7696005)(6666004)(41300700001)(26005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2022 22:21:25.5856 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 505c66b0-ffaa-4dc4-8c56-08da8943a561 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: DM6NAM11FT093.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5101 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The `enter` callback is run right before the cores are put into HLT. This will allow checking synchronization problems with other software that writes into the STB. Signed-off-by: Mario Limonciello --- In this patch it's intentional that `int rc` isn't directly set to `amd_pmc_write_stb()` so that if a workaround is added related to this in the future it can come before the STB message about entering s2idle without having to change either of those lines. drivers/platform/x86/amd/pmc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/platform/x86/amd/pmc.c b/drivers/platform/x86/amd/pmc.c index fba42036682d..0f1b5b1a0bb8 100644 --- a/drivers/platform/x86/amd/pmc.c +++ b/drivers/platform/x86/amd/pmc.c @@ -41,6 +41,7 @@ #define AMD_PMC_STB_PMI_0 0x03E30600 #define AMD_PMC_STB_S2IDLE_PREPARE 0xC6000001 #define AMD_PMC_STB_S2IDLE_RESTORE 0xC6000002 +#define AMD_PMC_STB_S2IDLE_ENTER 0xC6000003 =20 /* STB S2D(Spill to DRAM) has different message port offset */ #define STB_SPILL_TO_DRAM 0xBE @@ -706,6 +707,17 @@ static void amd_pmc_s2idle_prepare(void) dev_err(pdev->dev, "error writing to STB: %d\n", rc); } =20 +static void amd_pmc_s2idle_enter(void) +{ + struct amd_pmc_dev *pdev =3D &pmc; + int rc; + + rc =3D amd_pmc_write_stb(pdev, AMD_PMC_STB_S2IDLE_ENTER); + if (rc) + dev_err(pdev->dev, "error writing to STB: %d\n", rc); + +} + static void amd_pmc_s2idle_restore(void) { struct amd_pmc_dev *pdev =3D &pmc; @@ -733,6 +745,7 @@ static void amd_pmc_s2idle_restore(void) =20 static struct acpi_s2idle_dev_ops amd_pmc_s2idle_dev_ops =3D { .prepare =3D amd_pmc_s2idle_prepare, + .enter =3D amd_pmc_s2idle_enter, .restore =3D amd_pmc_s2idle_restore, }; #endif --=20 2.34.1