From nobody Thu Apr 9 12:50:24 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 3C641ECAAD2 for ; Mon, 29 Aug 2022 13:29:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230073AbiH2N3t (ORCPT ); Mon, 29 Aug 2022 09:29:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229498AbiH2N3Z (ORCPT ); Mon, 29 Aug 2022 09:29:25 -0400 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2087.outbound.protection.outlook.com [40.107.102.87]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE025175A5; Mon, 29 Aug 2022 06:29:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MG2gFioQRd393edyZdNDGNzpaevewiXzx00n/D4khYmxud7Tr+LYsJC5zswFXjmKMfk0m4lsxymV6ZrxY+fNExEDUtIWTXhBh5vHTNCgQEC+8NcgVJo2T3Mm2qWHFHVTJMuvo2o6FwDdgrcSz++LkKONdW+7oHwXEFz0hM0r1VAxEvoWKyn0Mz0QX8bGa6PYd4x3NihZnHgfZFNV8pJs9M7ixlHG962m8UJ8uvxOHZn7H1n6WSFwpCCEN5R2fR8YnqLTe9nNK4cFvl2vUd/X4EY582EeKEZpo7JDp9yoYfFcZxG6NonSH2Hpl4ljKTI2qAEB1L/wOtIY1f2EY90hxQ== 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=0xSJjRcgg/532Juh2XbTd4Y/tZ1aN24c4BmxM+xCeHk=; b=bbMui2kllPDdScKNieWWSccA35En/5aem76hzCC3sylMA+TKhZ64yNGFs63CrKLg3iPUmUSArRNm7JDtALqHPfYz98gBuWjc7RHUWP/rUnDmAuGmqLAOfzULpcKn7JCt4qRg9spE58EZ3TR2syuQGS4yhCsDZIcWIm24ATnyxaFeDRQobpKvUGGgPMm06opNiP45qf5wVRv8KmpD/8A8ZFR4d/kCN6JffSk1+9IF+EH/k1h28Qpam7E/XEiSlVA0zH6lmZUpRLyU6TCUpewP48XEtkxaKanNy82vMpbuiW5EtWXf4m+zllvVtVNttrVCBQ7+FnJp0nCVMMX9Q1R+ZQ== 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=0xSJjRcgg/532Juh2XbTd4Y/tZ1aN24c4BmxM+xCeHk=; b=I8gQ8TW0C4z8DgCDSpCyCt75wHh2k5mZFP1w9ia7L03PqUP2yQKidFC1bMQKjdEyLVUCqYi11aYQQjvczGA3IIrjJT78bmqN/uTXj007PP1i42tJ3f2RHZbKL0xjQRIZm63MV6jHqObBLD3ON6SjHpimn8+GKRrQriZa2puP9hk= Received: from MW4PR04CA0355.namprd04.prod.outlook.com (2603:10b6:303:8a::30) by BL0PR12MB5508.namprd12.prod.outlook.com (2603:10b6:208:1c1::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15; Mon, 29 Aug 2022 13:29:12 +0000 Received: from CO1NAM11FT044.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8a:cafe::5e) by MW4PR04CA0355.outlook.office365.com (2603:10b6:303:8a::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15 via Frontend Transport; Mon, 29 Aug 2022 13:29:12 +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 CO1NAM11FT044.mail.protection.outlook.com (10.13.175.188) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5566.15 via Frontend Transport; Mon, 29 Aug 2022 13:29:12 +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; Mon, 29 Aug 2022 08:29:10 -0500 From: Mario Limonciello To: , "Rafael J. Wysocki" , "Len Brown" , Pavel Machek CC: , , , Subject: [PATCH v2 1/4] ACPI: s2idle: Add a new ->enter() callback for platform_s2idle_ops Date: Mon, 29 Aug 2022 08:29:04 -0500 Message-ID: <20220829132908.5254-2-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220829132908.5254-1-mario.limonciello@amd.com> References: <20220829132908.5254-1-mario.limonciello@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] 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-Office365-Filtering-Correlation-Id: 0da723c7-ea1a-42f0-5d1b-08da89c27606 X-MS-TrafficTypeDiagnostic: BL0PR12MB5508:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 630xAkuK3lf0IYdhyPVkM0rM4/MUSD5Ll8/D6pP/b9QSGmOMsC1qls66Yo5K17BenfwJVRwHhaR0f1BZwyz4BdBgGynT8CqV4h9YEfIMQ5nklz2EBBfd6JgJqrTeghau5OjT+uW0AMhDX72sWNp2TTu6voTv9+7/UXDETyWZ/uGP/LC+v4wcI8gQOmn0BaQIzSM8W3sZrfkZJTGEa+jJwGjODKtOJipc9be7Ik7V7P8rd33NJn6G7pENeY4LfpENL7+ynILOllI6jBRhqi+jxzzdzLGr4T1f9JgkmTB+T4GidcJ4PrLcPaYVkDvVxVlqRDV9zkPCVN2+/lXzUAlAaZutY6fEW5CYJH2rA28mN056jg3pnP4RdxnbZwLzIoru4/55EG8R4/wqZjeNiXfq7/BG42ui6QBbsnSIrWg1KjKVT5q19KhvkBwqcZiuHcehTmd1F5nK74u629HOPZuM+TQ0EvYG33hXUHXe7B6Xeas4mU4qNygMomW3BGUz9LoRRn19e3ilaB1nWQ1Q5dpRFy+K0JxwWiAa8WGjO7yTq2JWOd5R/IlSfZdS9CbxftZk7MdsP9IEHy3oTRAxHeJNH3b/7EYo4F6u2QaJlGNR9GFkG5TYP5yxudoIQlweUdP2HKQ10mobpXOEt0oZCMvvLfyoHEM3KqJcJGBDzH9RnMY+tZma/pSo8LlCweW0VpfeQwv0cMn+SwhOGADjY7IMW3p8XIzFOzgnwfsbK2PD+yGt/gP7am2Ha1vx0HtO2m+/sPzaTul0KL2Nj1lxQW5Rdpe9Cvxi+8tTjvlt4JCYZj5Gpxr4VKJtzBSyqivNjhrz 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)(39860400002)(396003)(376002)(136003)(40470700004)(46966006)(36840700001)(82740400003)(110136005)(36756003)(82310400005)(1076003)(70206006)(81166007)(2616005)(316002)(8676002)(70586007)(54906003)(4326008)(86362001)(356005)(336012)(186003)(40480700001)(2906002)(47076005)(426003)(83380400001)(40460700003)(8936002)(36860700001)(16526019)(5660300002)(44832011)(6666004)(478600001)(26005)(7696005)(41300700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2022 13:29:12.1260 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0da723c7-ea1a-42f0-5d1b-08da89c27606 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: CO1NAM11FT044.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB5508 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 --- v1->v2: * Add a prototype for `acpi_s2idle_enter` drivers/acpi/sleep.h | 1 + drivers/acpi/x86/s2idle.c | 14 ++++++++++++++ include/linux/acpi.h | 1 + include/linux/suspend.h | 1 + kernel/power/suspend.c | 3 +++ 5 files changed, 20 insertions(+) diff --git a/drivers/acpi/sleep.h b/drivers/acpi/sleep.h index 7fe41ee489d6..7856930a7da9 100644 --- a/drivers/acpi/sleep.h +++ b/drivers/acpi/sleep.h @@ -18,6 +18,7 @@ static inline acpi_status acpi_set_waking_vector(u32 wake= up_address) extern int acpi_s2idle_begin(void); extern int acpi_s2idle_prepare(void); extern int acpi_s2idle_prepare_late(void); +extern void acpi_s2idle_enter(void); extern bool acpi_s2idle_wake(void); extern void acpi_s2idle_restore_early(void); extern void acpi_s2idle_restore(void); 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 Thu Apr 9 12:50:24 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 17C91ECAAD2 for ; Mon, 29 Aug 2022 13:30:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229796AbiH2N36 (ORCPT ); Mon, 29 Aug 2022 09:29:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229716AbiH2N3Z (ORCPT ); Mon, 29 Aug 2022 09:29:25 -0400 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2086.outbound.protection.outlook.com [40.107.93.86]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EFEFF18B3C; Mon, 29 Aug 2022 06:29:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fJZGomWPlm9k/Bn1roJWYgeMbSn5MkwTDv6rRrYM4tKmvGMbTCbDW/6w/GON03ZJMeBrUgYWtT6xuRW1on7kh2ykJ8qgQtFubJ0lVmtwDerdBQgm+XQmTasIInNxncloolgGDVsprvwFOI5w9Ayh4P+6V+9iU3FMMg6qzIq/0hj+4zKrlj1DxnUdWtyUtHfef/UfZ3cmHwIgzVDADNfApsovJxKy85w+BniYPeCUz2d0wdU/yzu3g1tJntWg9MAfu07pyfdmVkxXO+lash3a8HgMr5PYtg7ly5us0E54JAhD60CYGlVAtRwBnGqMBg95EnQ4HC5mygYPrFUqologNg== 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=gZ8vcqqGIICB+wesnMXObm31pLaVw/bSjcFfUVHm/TTZY6FIOhirA6EIFJDSWfA6PUy5lDmqwLs6MR9N8ucoj79+knyI7CEs0EalniQXFl4qyg68CAQLxnfrSN9vMZznoMrQj8mu0U/2BzIGCAVhl5Bjx7DByXVZUOFPqH2M/bgB69Vt7hCFR7Yc0W4vtfVvFh4BtoTu4rYRBIk9dBgLS59dHObjtvfq4PCYUbA5xsSJJ1YnM3IgXbcMH9LLAnl0JmRtmCF1rR55mYt2FVEtVUaPSyTEf15NPr9hFX0EuGPDmffU0VoK774w7O93szpCdmi01Mz/Q2RG7XEs7Vskcg== 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=y0PvoXRSniIlXd3XfLO5QTNIIKrCOxWIF3iiXFix26BTLibJKz/mCo35bVL9jirBSF8TUvn72otXsaUTia8+2siLVQ/kxxYzrnNfXztvlzGaHCQHIaLWo4vuzRF5nv9SdqFQOGCe83zENdczp40QLEys1w2Jc7IGlduoYwrFM1c= Received: from MW4PR04CA0358.namprd04.prod.outlook.com (2603:10b6:303:8a::33) by BN6PR12MB1921.namprd12.prod.outlook.com (2603:10b6:404:fe::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15; Mon, 29 Aug 2022 13:29:13 +0000 Received: from CO1NAM11FT044.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8a:cafe::ef) by MW4PR04CA0358.outlook.office365.com (2603:10b6:303:8a::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15 via Frontend Transport; Mon, 29 Aug 2022 13:29:13 +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 CO1NAM11FT044.mail.protection.outlook.com (10.13.175.188) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5566.15 via Frontend Transport; Mon, 29 Aug 2022 13:29:12 +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; Mon, 29 Aug 2022 08:29:11 -0500 From: Mario Limonciello To: , Shyam Sundar S K CC: , , Mark Gross , , Subject: [PATCH v2 2/4] platform/x86/amd: pmc: Add defines for STB events Date: Mon, 29 Aug 2022 08:29:05 -0500 Message-ID: <20220829132908.5254-3-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220829132908.5254-1-mario.limonciello@amd.com> References: <20220829132908.5254-1-mario.limonciello@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] 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-Office365-Filtering-Correlation-Id: 7df7374d-cf6f-4929-079b-08da89c27674 X-MS-TrafficTypeDiagnostic: BN6PR12MB1921:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WNcK8QLsXl5UIcVGsBjTpOke4VTpQwlq4GoDF0lwNyoB7s7GckoTDXML3Zgj856PUFJQ8t6ibZL2IJht98kJa+zB1+7VLNZdRyUDcqFD3cbyRMZ1tS3QhLWMh7N/4H+d4xacze5dqwu9aU5/t12jSGzYECzeQwrnHIP6h2WOM/XipS9q7QCdj22sPC4nuGHuj7VTjtCm6pxsHlaxB8mqSfYHQkP76wJM9EX+rmeKcwChsXXkreHHGucqYg6xiv1vACrLIhxD3CUDKBy9hEW6+3+S2EWZkTwuLcRmhYTRwiM5MV/UKKK7s/9allp+NQe/B8Ne+Xzeif5ZM7aDQF1EqD01DF6//VnLstbeK6jnrlWvXGbcXTb6roYsMUcD5i92X+y+Eq+TxjU1Vv8OXpLHPL5a18rb4ygQ7e0mdRHgVqFURQo7fRL0nBK9Ve05GQ/HhNzDRpmoVnSEweONR3seK42LX8tIksbLX4Wg7BgzRj+R1vXTkhD44CmBHMpZW3r3mJpXupUDatXYKMndngrMBAsTb/ILR/ro2VsSgvNbxamjVJpfMIq1nfdgyQHOreo8EaWiuU+pYiPnySnzm/y28CPcsgiozVoryY8D8gLi5T/DUeDxgQDmHNtQOqxC4UCpVI6DAv4HpiLsipUsnxU6p4cnl6eJmfthZBbqOr1wXFKXzBqXfE1WnZDNU4B1fKcvLL2X0dRRWtaKChpnVM/nccQRXp3QFSfEZ7MUTKsCvS1HzyaWgIk9rqyS8NHD/b1lGxU+Wjqnrli6Kb3r92TyZd87gXFhFWU/Iqb7IFiZMN+IVcspns3av/VsTWnQ8GWH 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)(39860400002)(396003)(136003)(346002)(376002)(40470700004)(36840700001)(46966006)(81166007)(86362001)(356005)(83380400001)(1076003)(426003)(186003)(2616005)(16526019)(47076005)(36860700001)(36756003)(336012)(82740400003)(40460700003)(5660300002)(44832011)(8936002)(8676002)(4326008)(70206006)(40480700001)(2906002)(70586007)(82310400005)(6666004)(26005)(7696005)(478600001)(54906003)(316002)(41300700001)(6636002)(110136005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2022 13:29:12.8447 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7df7374d-cf6f-4929-079b-08da89c27674 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: CO1NAM11FT044.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1921 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 Thu Apr 9 12:50:24 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 81BC3ECAAD2 for ; Mon, 29 Aug 2022 13:29:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230222AbiH2N3x (ORCPT ); Mon, 29 Aug 2022 09:29:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230307AbiH2N3Z (ORCPT ); Mon, 29 Aug 2022 09:29:25 -0400 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2069.outbound.protection.outlook.com [40.107.237.69]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D727917E10; Mon, 29 Aug 2022 06:29:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mwB1a0YPAa43QC2T5LbcG1aPW/gSxFW+tmsHngXjDrQROV0tnzXrYdfj509T000Phj6whHyRINpn6c3K9SCoWhWp7S6v4ka1k3EdlH/JpabEPBFEKVWqH9AYTxdAndBC/G+fl3tsStgF1V07JIQAsN4yYpDVk4//yVrX3a3w7ZF3a2M/AKOQtTRZSpPB9O+rtRMxYBzrTVy63qja75mHDm4mxpMFNnphnrAUmIn4WKD/yf0ms4Fw9pSxwwSuFnDuxYDSjnOuPSv81ztZSiQ8qwsHEAtsHLxclDPUZG7Sm0DbH0TjT+73Ww5DzL/MfzXwDnnGBFWkxYY7G5h3zmgYYg== 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=OQWPrqzj5O6iS0IvjI4TBvtUqV7PBZdmGpOd7Rkc9IW8Qbhr6q0yFc3pVA0dlVQjgo1g5lnxzesaDCaEWStSfeUhdvCB1IT7X74HgbYQ9r64F7ayXagVA9M635xqqiG7kCIpsr0P705hNEk/vuS/JEY2tD/pp0/FHT8lmyq/fTu996IyO5NCZmxtwnhR1ci07hW5oXNDCazPia/syTQbU9g4YGiWWmE5ajrR/ZEm+PN9um4I86AINcQl7cKBV0DyyXyXxdQZ4lBzvt4EFoc4dVulIjeJPfr4EDPKJY2rM+JAi5BT8tCwexFEvnmRlc5TstkDq/rB3DH9eLFeWVlN7g== 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=ltriAG1c2wUCthC8v5w/MyNBATiLmLeeTqyuztcyZMRzUFl6tWio8tYm2an7FEN6rwN/ZEDKowoiH0BaoyPMsaS441grUCKd3IdAujayZ5JeIupFBKl/xjCYNncnGONPFEMDd15dM+PzmLwe1S76api2hjEn6KhKnWXZa/5UvwQ= Received: from MW4PR04CA0352.namprd04.prod.outlook.com (2603:10b6:303:8a::27) by MN2PR12MB4110.namprd12.prod.outlook.com (2603:10b6:208:1dd::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.14; Mon, 29 Aug 2022 13:29:14 +0000 Received: from CO1NAM11FT044.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8a:cafe::7d) by MW4PR04CA0352.outlook.office365.com (2603:10b6:303:8a::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15 via Frontend Transport; Mon, 29 Aug 2022 13:29:14 +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 CO1NAM11FT044.mail.protection.outlook.com (10.13.175.188) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5566.15 via Frontend Transport; Mon, 29 Aug 2022 13:29:14 +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; Mon, 29 Aug 2022 08:29:12 -0500 From: Mario Limonciello To: , Shyam Sundar S K CC: , , Mark Gross , , Subject: [PATCH v2 3/4] platform/x86/amd: pmc: Always write to the STB Date: Mon, 29 Aug 2022 08:29:06 -0500 Message-ID: <20220829132908.5254-4-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220829132908.5254-1-mario.limonciello@amd.com> References: <20220829132908.5254-1-mario.limonciello@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] 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-Office365-Filtering-Correlation-Id: 197ac685-a2ca-46f4-c0bf-08da89c27732 X-MS-TrafficTypeDiagnostic: MN2PR12MB4110:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l5e7qs4wj+p2wXIewLd44g9Ed/G1pv7PTFRioHddPckWK8DMKS8GOiF622wwIH9cCsFofE9EpfPqYGWvsan6WYZXyCGWf6VaVkkz90lBoAuu9ivPiY4Epu2RaJ8zm6jPstUicnxti6Vb5+j7xMX1qacLsmD1OQBVPQkD6tcPVjWOeAslcAmtwUDxJsrN85LXZEeQ/+2iq8hOiJ9jgY15+/OVuaqXQRBauVfZ1ZiwZvtrARUqcsINr5Rx/0iSPD08XmrMfEoUgOWDcC17rYIoAvVuJT/OBhVM/N+SJ3ekGFDbLT8peSAHKSusbz2osXFpte8xQzGjabUnE9QBJ23nzP+HgC/f5+zHRKa6QQwDyxR/zO4LILqbssGpjS8znabKkoiR2f5c+46dYa+QUzZu78nYrkhuAkrYNQI4XZ9rXSat2HaisIav7qI1+YWU1J2TRogGE7mjRxxehfDEbzSikzUtThTpbXCOk66MpoCwWGo90AjbPUrtDv6Yl+8ZEzNXUq8apgP2x2IVnE62PnPjnZOPvtjo+lRTK3PVsWBDIobO2Ybe+apWKw36p/6ni8xXTehtYARLsQ0dYpMErrKPL+kkVxGXUel0yiXnj+vV7YuPftFAi0p2AmlbKNO+QHlaJMbGCcTNfSVj+L64bb1A+O5SYbKLo4jUGn6y2lFPCLfZWYh6vFLeIqH3PPtd9wjpfa0FQcCGc9xmHNb07v2EaB2kkUa4uhlIdW0zFZvUC3vnKE0RllPl/F+Qr7ZFjkKLLVIIcmZRfOPJ2W9GYnLGSIdXMg0rBhh0xz0Vnxxvon7PmiSMxrdY17x8B47pH0DS 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)(376002)(39860400002)(136003)(40470700004)(46966006)(36840700001)(110136005)(6636002)(5660300002)(8936002)(8676002)(4326008)(36860700001)(47076005)(1076003)(2616005)(426003)(44832011)(70586007)(316002)(54906003)(36756003)(2906002)(478600001)(6666004)(7696005)(41300700001)(26005)(70206006)(86362001)(82310400005)(81166007)(356005)(82740400003)(40480700001)(186003)(336012)(16526019)(40460700003)(83380400001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2022 13:29:14.0790 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 197ac685-a2ca-46f4-c0bf-08da89c27732 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: CO1NAM11FT044.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4110 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 Thu Apr 9 12:50:24 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 BAA4AECAAD2 for ; Mon, 29 Aug 2022 13:30:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230395AbiH2NaC (ORCPT ); Mon, 29 Aug 2022 09:30:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229590AbiH2N3Z (ORCPT ); Mon, 29 Aug 2022 09:29:25 -0400 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2050.outbound.protection.outlook.com [40.107.100.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 436B860F6; Mon, 29 Aug 2022 06:29:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XPt3mBSEQRzUMdWn20FIWuHbHeoDE5nhB0ntQipKwcgJtZMrRBMsPAJUTijdlH1fU47MeQg/ln6Kd0DlhL5SbXUZuLpMAo7/NmPHnOXeJsLxzWq/v56ivX24EwIsicpu7k3re9O98XXOQcywg/Thc4YVyu3clTgV0y4lhEregNjtGk0+9tD+jYucFTm7ucU6z5SzAeA8QyYQIgpnkqRLnoMsp0soeW36GT9/8h102eB0cGQI0bQKz9NslfnFpbVPsJ2zWD8ZRRq82wTC3KzJ0Gn6v0wqrOHJuv0yDsPmQs4tcgKiN5zEA+VFyL5kxjqseZOCq/dc5o4uDsNtb+ebGg== 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=Y/Rdy/fUX8nm8LLBBiCBCHCG1rG+TE5gzSZBBNS11I0=; b=J04HHZ+vRZFsInr+TZ8bUhidGLhsTfXYSRkj8CN/xL14u92WUFLQVwls8aktOdLASo4at38EynCS6S9/j+eLa/GigP/O4ExdBiOO2DtXQDLyJtmSyozfO4yXLdhhsq3L6tT1lFUuTGUsREMjVsO9VYwPK6LgD1OsjIC/341Y11BUr1J+A4GPDcHhhZEfvckR9xg4cyOJ8ZmrVc+NIjKxL1tRkFvh/5aCmo3wjH47A3Rf0Xe9DmHpvmpI7qOUsswc8A6O1oA/oWoLDg7lFoTfuqUCn6+P19eJdM2udML7vt+JJf3yp6NmHoVcZMtNqTrPMmR8vec3ihTsffu5KGU+jw== 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=Y/Rdy/fUX8nm8LLBBiCBCHCG1rG+TE5gzSZBBNS11I0=; b=3G38VH+f/9GP+mnhWzZ3z6pmmJqdKnd5rfUmOLo2uKtZtK+pRGytZoUoJpU1eN1DTaU0amwdkJCzF9+cgFRhjiPmn+YEz8gZ+rJdUnnsXimR/mBd1TWGLOVKmz0Yz8IijWchBSjGpG6zxeBEqh8t5EekkC/yYcpxDOvpXQUUZPI= Received: from MW4PR04CA0353.namprd04.prod.outlook.com (2603:10b6:303:8a::28) by DM4PR12MB5119.namprd12.prod.outlook.com (2603:10b6:5:392::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.14; Mon, 29 Aug 2022 13:29:15 +0000 Received: from CO1NAM11FT044.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8a:cafe::bc) by MW4PR04CA0353.outlook.office365.com (2603:10b6:303:8a::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15 via Frontend Transport; Mon, 29 Aug 2022 13:29:15 +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 CO1NAM11FT044.mail.protection.outlook.com (10.13.175.188) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5566.15 via Frontend Transport; Mon, 29 Aug 2022 13:29:15 +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; Mon, 29 Aug 2022 08:29:13 -0500 From: Mario Limonciello To: , Shyam Sundar S K CC: , , Mark Gross , , Subject: [PATCH v2 4/4] platform/x86/amd: pmc: Add an extra STB message for entering s2idle Date: Mon, 29 Aug 2022 08:29:07 -0500 Message-ID: <20220829132908.5254-5-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220829132908.5254-1-mario.limonciello@amd.com> References: <20220829132908.5254-1-mario.limonciello@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] 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-Office365-Filtering-Correlation-Id: 47080e07-acaf-4f7a-675f-08da89c277de X-MS-TrafficTypeDiagnostic: DM4PR12MB5119:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: s5cl3OfYhxyGwvjwlvEi5Re1OSAGyeIrT3jDhk4N9K+JVpUJVn/ab7BOywgzGInNteSrmBCKBqroJHImsc5M7SokAIc6VtF2PfyAF9SnfOCJCcywswgex3KbDyqxS58od9ZI36Q+f6eD9lk87XIFwpVyGglZ6sXELAOdKpgl/CNc6X4BmqqTO4keDmc2luR9sHvOlhtPkx/Jekxv7drPHZ1KpAXjdfL5fD+fCZ7rTPPDTbPbec92cjgRRTXnQRG9IxoTXeYcZdpVKwtBuNKTIZVt/M6Qnm9/v+kvLqNHnsdRgWVTLqZsEWNcUGPxVsJa5nJAa/G3dIE9kjT8SmAMJzjacwknyBcBp02+VdhE8SnWW26ff7mWl/n5yTihUpFsoqfCF3l7mxwlkhyj+dkjQ11qCfT+HtI1ICmah+jorNIR0M91DnGe5gwj8N8qaDmPoTW2moFAZDEYQTB0l9mUSsv6wRD6c9MdI37Ii6VzPCh20NefvPkKaP1gvJaJ0XPfJIj7T8S8VgxT4eg8ZzJyFvefYmBNOkox3LY0mfRjJu90s99C5xg6G0ll15Zg0LhkZi2HTVTBNOY5YJfl69937AIimHXHBKj3SqmDUCL6RmKjEqwMGTZq7+QuiH+AKxBnKUNiA2UNU4ZXfFykt7sHZ5pVY02eiJv5IhHOMp7LNx4Q+h9ecooocnISVbhHF2aFV2aZAs2eV9wdkKTXpVWvxoWRWZBuQ6sPba3f9lTLOs4jL82LcR/V47SCcjCtc0q3Evr0J0ccPtJX9YxulS1ihl6lJ+39rD1ccI/YtH13IdBbq8cVv2AFACHR+NU4MgQ1 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)(136003)(39860400002)(376002)(396003)(36840700001)(46966006)(40470700004)(82310400005)(81166007)(1076003)(26005)(356005)(36756003)(54906003)(110136005)(6636002)(82740400003)(316002)(8936002)(7696005)(8676002)(41300700001)(40460700003)(44832011)(70206006)(70586007)(15650500001)(2906002)(186003)(83380400001)(36860700001)(478600001)(4326008)(426003)(6666004)(16526019)(47076005)(336012)(5660300002)(86362001)(40480700001)(2616005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2022 13:29:15.2196 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 47080e07-acaf-4f7a-675f-08da89c277de 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: CO1NAM11FT044.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5119 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 --- drivers/platform/x86/amd/pmc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/platform/x86/amd/pmc.c b/drivers/platform/x86/amd/pmc.c index fba42036682d..33300db461d1 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,16 @@ 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 +744,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