From: Raul Rangel <rrangel@google.com>
To: Mario Limonciello <mario.limonciello@amd.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
"open list:REAL TIME CLOCK (RTC) SUBSYSTEM"
<linux-rtc@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>,
alvin.zhuge@gmail.com, renzhamin@gmail.com, kelvie@kelvie.ca
Subject: Re: [PATCH] rtc: cmos: Use ACPI alarm for non-Intel x86 systems too
Date: Mon, 6 Nov 2023 09:17:00 -0700 [thread overview]
Message-ID: <CAHQZ30DP8ED4g3bib-tZ53rm2q2_ouEEL3TxD-SgK4YrCe3bew@mail.gmail.com> (raw)
In-Reply-To: <20231106162310.85711-1-mario.limonciello@amd.com>
On Mon, Nov 6, 2023 at 9:14 AM Mario Limonciello
<mario.limonciello@amd.com> wrote:
>
> 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 <kelvie@kelvie.ca>
> Closes: https://community.frame.work/t/systemd-suspend-then-hibernate-wakes-up-after-5-minutes/39392
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> ---
> 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.34.1
>
Acked-by: Raul E Rangel <rrangel@chromium.org>
next prev parent reply other threads:[~2023-11-06 16:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-06 16:23 [PATCH] rtc: cmos: Use ACPI alarm for non-Intel x86 systems too Mario Limonciello
2023-11-06 16:17 ` Raul Rangel [this message]
2023-11-13 21:36 ` Mario Limonciello
2023-11-13 22:38 ` Alexandre Belloni
2023-11-14 9:06 ` Pavel Machek
2023-11-14 22:28 ` Alexandre Belloni
2023-11-15 0:15 ` Mario Limonciello
2023-11-17 22:57 ` Alexandre Belloni
2023-11-17 23:00 ` Mario Limonciello
2023-11-17 23:43 ` Raul Rangel
2023-11-17 17:36 ` Alexandre Belloni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAHQZ30DP8ED4g3bib-tZ53rm2q2_ouEEL3TxD-SgK4YrCe3bew@mail.gmail.com \
--to=rrangel@google.com \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@bootlin.com \
--cc=alvin.zhuge@gmail.com \
--cc=kelvie@kelvie.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=mario.limonciello@amd.com \
--cc=renzhamin@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).