From patchwork Mon Nov 6 16:23:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 1860277 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=RxCi2Y4n; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=permerror (SPF Permanent Error: More than 10 MX records returned) smtp.mailfrom=vger.kernel.org (client-ip=139.178.88.99; helo=sv.mirrors.kernel.org; envelope-from=linux-rtc+bounces-215-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org [139.178.88.99]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPGdV719Zz1yQ9 for ; Tue, 7 Nov 2023 03:14:38 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 444F6281093 for ; Mon, 6 Nov 2023 16:14:37 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DB2E628E3D; Mon, 6 Nov 2023 16:14:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="RxCi2Y4n" X-Original-To: linux-rtc@vger.kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 65ACB24214 for ; Mon, 6 Nov 2023 16:14:34 +0000 (UTC) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2065.outbound.protection.outlook.com [40.107.243.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0774191; Mon, 6 Nov 2023 08:14:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RIUDPjWMcxpydh/gGHmxw3ldn0k+e2AwFk/Xvvm1SfJfz0mngTFZv5ftvvLwheRjEscGb3yr4I8Mnd+V1IpM/uxJmBJeqM1EpzmF7CZZST72TflKseneHVyDtV1PBOCU+M4JT9B6vAUqkGnkfIWY1yLb5mObwywvfDpysVsDEz3gf3beD0EL4viPn8ggd/kt9VAL9jYPAnUuhhU01Suths4c1omCysbk+/h1WgqOiptez3LcZ0UM3/TUcJOAyQgPYDohkhNmrKwlpksyQTB26LLLq+luftXq9bT/7e1ZQ7BcjB2ku0aJTLTzvqe9lSV/9wkNLhnZ6axdl63P7t07PQ== 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=b2mL+KkGXonHJHAgYbiK6/0T1VVxwti/vlt9O5i6ZWw=; b=dyKr1P8yL+a9CzEzxIoW7fpW5fCuJ/LAd5+VaTYXDyeW2dcghr6UvjXO2KCeUpzTAUMXoORn+GdgKHcCQxiOKRJufS5X8sGCR2i1SY1pJ0u3+YY20cbQUEwLY5gfSmP+gLp9s4jHeqe1QZNQrVe5++/jny3xkaWxltry1o3lgxqbNVtz2l9Niqx9ENhLVayap2R3COpIJDsqHf8CS13p60+/oL2JPVYooLG397YzA6ConokBi/AGaucyllLOlfTgD0Av7pCPzGw7XxTErc71/1Dmx1M8oT6NaQIGlWn8alO6JG8n7uSeYCUk6SZyaqwEjtmcoQ/AszjhgyfubYmwnQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=towertech.it 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=b2mL+KkGXonHJHAgYbiK6/0T1VVxwti/vlt9O5i6ZWw=; b=RxCi2Y4nlYmQhvXs8icrlFFucfMBnvLG5wIg+3Oxt7atcgwO15+T0zkb9TmlITjhcMX1wi8w9sfkxviBMMxCB/SycnjLHmQMTAw53MulPo4+Qc/++c9lAhkh+VETCK6Kt0vHpw0DsqQC4VWRygjC09guM0Pxg4E02rPH+g9Amf4= Received: from MN2PR14CA0002.namprd14.prod.outlook.com (2603:10b6:208:23e::7) by SA1PR12MB7365.namprd12.prod.outlook.com (2603:10b6:806:2ba::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.28; Mon, 6 Nov 2023 16:14:30 +0000 Received: from MN1PEPF0000F0E2.namprd04.prod.outlook.com (2603:10b6:208:23e:cafe::6c) by MN2PR14CA0002.outlook.office365.com (2603:10b6:208:23e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.27 via Frontend Transport; Mon, 6 Nov 2023 16:14:30 +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 MN1PEPF0000F0E2.mail.protection.outlook.com (10.167.242.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6977.16 via Frontend Transport; Mon, 6 Nov 2023 16:14:29 +0000 Received: from AUS-P9-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.2507.32; Mon, 6 Nov 2023 10:14:28 -0600 From: Mario Limonciello To: Alessandro Zummo , Alexandre Belloni CC: "open list:REAL TIME CLOCK (RTC) SUBSYSTEM" , open list , , , , , "Mario Limonciello" Subject: [PATCH] rtc: cmos: Use ACPI alarm for non-Intel x86 systems too Date: Mon, 6 Nov 2023 10:23:10 -0600 Message-ID: <20231106162310.85711-1-mario.limonciello@amd.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-rtc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-TrafficTypeDiagnostic: MN1PEPF0000F0E2:EE_|SA1PR12MB7365:EE_ X-MS-Office365-Filtering-Correlation-Id: ccc86b6d-c54b-4fd9-4c31-08dbdee37495 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v+dVZ+BcEwg7JLP4u+nVCEd7EapiAXTtrAW6yjCCA5qwLVeEpCnhHaE2N5WAUwVe4pG0goUHcc+5mh+WpbNYtqEMvgoFw5ZoJ2B1dCAdOlpwcZto+qjWyQIDfdxexDoj9Lvyq/qyUQj6FioACtk/hlHYGYphLaUS+UpQvD1rDs9SUPG4zSpNVQUzdRnbRa+E9UuL5VowsiBlYr9SXuQr1l++NFiwKEpK8QHVDsCgpgP6MPMQoDxVkF6nWcF/ZlpJ3nYpdiH0sVlnf5dV05vB1dscgrGtOliagKQgEeOh+nP+OFX84DO3DWZNp4f4M52Aa9VaWZvWSJqi1bvLOjdjpcfbXw7/YrXCX4NcDA8voZU6gBJdTPN/MOUo8Msca6Z4x3RYE9J+8oUwyEQb215IPZA2ohFMyAaCMPXdxmZ4kvZkOcElS63lrU1B30YEm2MYq9jPJu//PA9k8LFPMBWtpZTOs9Yjmcghkz34ZriSMrRlgwpoSZIcr6zrPdJEmLGW21cS4Iz4Mx6cJPHnYxeWJSQSAWhv++tZLKOh3zS1jerdZmKR7SJKXk3lHr8QKtOG7t/xuSwYP4S+BnBN4zxgURRKoMmj5Zvdj9KW1LKmU32gvaldDVtMcRvIR6Uoz8++6LkXvE2zjyE4XIKe7lZY/ubO5mvbzJudLmbmlmNaUjvYpXd9deyYR4BxjHGiF/cxRFBpPsTTl6hWIuo/8T//WnOUyFdTs4WS0MvoCFhffCkhMsRJdf/3DfS+AAAivbOfOsMwu0/BDaeo+dptb7zvSg== 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:(13230031)(4636009)(396003)(39860400002)(346002)(136003)(376002)(230922051799003)(64100799003)(1800799009)(186009)(451199024)(82310400011)(40470700004)(36840700001)(46966006)(5660300002)(36860700001)(40460700003)(41300700001)(2906002)(86362001)(36756003)(356005)(81166007)(82740400003)(16526019)(478600001)(426003)(336012)(83380400001)(70206006)(110136005)(70586007)(26005)(2616005)(1076003)(316002)(54906003)(966005)(44832011)(6666004)(47076005)(7696005)(40480700001)(4326008)(8936002)(8676002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2023 16:14:29.7316 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ccc86b6d-c54b-4fd9-4c31-08dbdee37495 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: MN1PEPF0000F0E2.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7365 Intel systems > 2015 have been configured to use ACPI alarm instead of HPET to avoid s2idle issues. Having HPET programmed for wakeup causes problems on AMD systems with s2idle as well. One particular case is that the systemd "SuspendThenHibernate" feature doesn't work properly on the Framework 13" AMD model. Switching to using ACPI alarm fixes the issue. Adjust the quirk to apply to AMD/Hygon systems from 2021 onwards. This matches what has been tested and is specifically to avoid potential risk to older systems. Cc: stable@vger.kernel.org # 6.1+ Reported-by: alvin.zhuge@gmail.com Reported-by: renzhamin@gmail.com Closes: https://github.com/systemd/systemd/issues/24279 Reported-by: Kelvie Wong Closes: https://community.frame.work/t/systemd-suspend-then-hibernate-wakes-up-after-5-minutes/39392 Signed-off-by: Mario Limonciello Acked-by: Raul E Rangel --- drivers/rtc/rtc-cmos.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index 228fb2d11c70..696cfa7025de 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -818,18 +818,24 @@ static void rtc_wake_off(struct device *dev) } #ifdef CONFIG_X86 -/* Enable use_acpi_alarm mode for Intel platforms no earlier than 2015 */ static void use_acpi_alarm_quirks(void) { - if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL) + switch (boot_cpu_data.x86_vendor) { + case X86_VENDOR_INTEL: + if (dmi_get_bios_year() < 2015) + return; + break; + case X86_VENDOR_AMD: + case X86_VENDOR_HYGON: + if (dmi_get_bios_year() < 2021) + return; + break; + default: return; - + } if (!is_hpet_enabled()) return; - if (dmi_get_bios_year() < 2015) - return; - use_acpi_alarm = true; } #else