From: "Michał Grzelak" <michal.grzelak@intel.com>
To: intel-xe@lists.freedesktop.org, intel-gfx-trybot@lists.freedesktop.org
Cc: jani.saarinen@intel.com, suresh.kumar.kurmi@intel.com,
mohammed.thasleem@intel.com,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Mario Limonciello <superm1@kernel.org>
Subject: [CI v2 1/2] ACPI: PM: s2idle: Add missing checks to acpi_s2idle_begin_lps0()
Date: Sat, 10 Jan 2026 16:44:04 +0100 [thread overview]
Message-ID: <20260110154405.2825339-2-michal.grzelak@intel.com> (raw)
In-Reply-To: <20260110154405.2825339-1-michal.grzelak@intel.com>
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Commit 32ece31db4df ("ACPI: PM: s2idle: Only retrieve constraints
when needed"), that attempted to avoid useless evaluation of LPS0 _DSM
Function 1 in lps0_device_attach(), forgot to add checks for
lps0_device_handle and sleep_no_lps0 to acpi_s2idle_begin_lps0()
where they should be done before calling lpi_device_get_constraints()
or lpi_device_get_constraints_amd().
Add the missing checks.
Fixes: 32ece31db4df ("ACPI: PM: s2idle: Only retrieve constraints when needed")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>
Link: https://patch.msgid.link/2818730.mvXUDI8C0e@rafael.j.wysocki
---
drivers/acpi/x86/s2idle.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c
index 6d4d06236f61..2a9edb53d5d4 100644
--- a/drivers/acpi/x86/s2idle.c
+++ b/drivers/acpi/x86/s2idle.c
@@ -515,7 +515,8 @@ static struct acpi_scan_handler lps0_handler = {
static int acpi_s2idle_begin_lps0(void)
{
- if (pm_debug_messages_on && !lpi_constraints_table) {
+ if (lps0_device_handle && !sleep_no_lps0 && pm_debug_messages_on &&
+ !lpi_constraints_table) {
if (acpi_s2idle_vendor_amd())
lpi_device_get_constraints_amd();
else
--
2.45.2
next prev parent reply other threads:[~2026-01-10 15:45 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-10 15:44 [CI v2 0/2] acpi: pm: s2idle: LPS0 changes Michał Grzelak
2026-01-10 15:44 ` Michał Grzelak [this message]
2026-01-12 16:50 ` [CI v2 1/2] ACPI: PM: s2idle: Add missing checks to acpi_s2idle_begin_lps0() Michał Grzelak
2026-01-10 15:44 ` [CI v2 2/2] ACPI: PM: s2idle: Add module parameter for LPS0 constraints checking Michał Grzelak
2026-01-12 16:52 ` Michał Grzelak
2026-01-10 15:53 ` ✓ CI.KUnit: success for acpi: pm: s2idle: LPS0 changes Patchwork
2026-01-10 16:27 ` ✓ Xe.CI.BAT: " Patchwork
2026-01-10 17:23 ` ✗ Xe.CI.Full: failure " Patchwork
2026-01-12 17:05 ` [CI v2 0/2] " Michał Grzelak
2026-01-12 21:59 ` Rodrigo Vivi
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=20260110154405.2825339-2-michal.grzelak@intel.com \
--to=michal.grzelak@intel.com \
--cc=intel-gfx-trybot@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=jani.saarinen@intel.com \
--cc=mohammed.thasleem@intel.com \
--cc=rafael.j.wysocki@intel.com \
--cc=superm1@kernel.org \
--cc=suresh.kumar.kurmi@intel.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