Skip to content

Commit 71630b7

Browse files
committed
ACPI / PM: Blacklist Low Power S0 Idle _DSM for Dell XPS13 9360
At least one Dell XPS13 9360 is reported to have serious issues with the Low Power S0 Idle _DSM interface and since this machine model generally can do ACPI S3 just fine, add a blacklist entry to disable that interface for Dell XPS13 9360. Fixes: 8110dd2 (ACPI / sleep: EC-based wakeup from suspend-to-idle on recent systems) Link: https://bugzilla.kernel.org/show_bug.cgi?id=196907 Reported-by: Paul Menzel <pmenzel@molgen.mpg.de> Tested-by: Paul Menzel <pmenzel@molgen.mpg.de> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Cc: 4.13+ <stable@vger.kernel.org> # 4.13+
1 parent 39dae59 commit 71630b7

1 file changed

Lines changed: 28 additions & 0 deletions

File tree

drivers/acpi/sleep.c

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,14 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d)
160160
return 0;
161161
}
162162

163+
static bool acpi_sleep_no_lps0;
164+
165+
static int __init init_no_lps0(const struct dmi_system_id *d)
166+
{
167+
acpi_sleep_no_lps0 = true;
168+
return 0;
169+
}
170+
163171
static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
164172
{
165173
.callback = init_old_suspend_ordering,
@@ -343,6 +351,19 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
343351
DMI_MATCH(DMI_PRODUCT_NAME, "80E3"),
344352
},
345353
},
354+
/*
355+
* https://bugzilla.kernel.org/show_bug.cgi?id=196907
356+
* Some Dell XPS13 9360 cannot do suspend-to-idle using the Low Power
357+
* S0 Idle firmware interface.
358+
*/
359+
{
360+
.callback = init_no_lps0,
361+
.ident = "Dell XPS13 9360",
362+
.matches = {
363+
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
364+
DMI_MATCH(DMI_PRODUCT_NAME, "XPS 13 9360"),
365+
},
366+
},
346367
{},
347368
};
348369

@@ -485,6 +506,7 @@ static void acpi_pm_end(void)
485506
}
486507
#else /* !CONFIG_ACPI_SLEEP */
487508
#define acpi_target_sleep_state ACPI_STATE_S0
509+
#define acpi_sleep_no_lps0 (false)
488510
static inline void acpi_sleep_dmi_check(void) {}
489511
#endif /* CONFIG_ACPI_SLEEP */
490512

@@ -863,6 +885,12 @@ static int lps0_device_attach(struct acpi_device *adev,
863885
if (lps0_device_handle)
864886
return 0;
865887

888+
if (acpi_sleep_no_lps0) {
889+
acpi_handle_info(adev->handle,
890+
"Low Power S0 Idle interface disabled\n");
891+
return 0;
892+
}
893+
866894
if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0))
867895
return 0;
868896

0 commit comments

Comments
 (0)