This is a note to let you know that I've just added the patch titled
rtc: cmos: Use ACPI alarm for non-Intel x86 systems too
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
rtc-cmos-use-acpi-alarm-for-non-intel-x86-systems-too.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 3d762e21d56370a43478b55e604b4a83dd85aafc Mon Sep 17 00:00:00 2001
From: Mario Limonciello <mario.limonciello@xxxxxxx>
Date: Mon, 6 Nov 2023 10:23:10 -0600
Subject: rtc: cmos: Use ACPI alarm for non-Intel x86 systems too
From: Mario Limonciello <mario.limonciello@xxxxxxx>
commit 3d762e21d56370a43478b55e604b4a83dd85aafc upstream.
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@xxxxxxxxxxxxxxx> # 6.1+
Reported-by: <alvin.zhuge@xxxxxxxxx>
Reported-by: <renzhamin@xxxxxxxxx>
Closes: https://github.com/systemd/systemd/issues/24279
Reported-by: Kelvie Wong <kelvie@xxxxxxxxx>
Closes: https://community.frame.work/t/systemd-suspend-then-hibernate-wakes-up-after-5-minutes/39392
Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx>
Link: https://lore.kernel.org/r/20231106162310.85711-1-mario.limonciello@xxxxxxx
Signed-off-by: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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
--
2.43.0
Patches currently in stable-queue which might be from mario.limonciello@xxxxxxx are
queue-6.1/rtc-extend-timeout-for-waiting-for-uip-to-clear-to-1s.patch
queue-6.1/rtc-mc146818-lib-adjust-failure-return-code-for-mc146818_get_time.patch
queue-6.1/rtc-add-support-for-configuring-the-uip-timeout-for-rtc-reads.patch
queue-6.1/rtc-cmos-use-acpi-alarm-for-non-intel-x86-systems-too.patch
queue-6.1/rtc-adjust-failure-return-code-for-cmos_set_alarm.patch
