mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-15 13:15:57 +00:00
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: 8110dd281e15 (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+
This commit is contained in:
parent
39dae59d66
commit
71630b7a83
@ -160,6 +160,14 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool acpi_sleep_no_lps0;
|
||||||
|
|
||||||
|
static int __init init_no_lps0(const struct dmi_system_id *d)
|
||||||
|
{
|
||||||
|
acpi_sleep_no_lps0 = true;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
|
static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
|
||||||
{
|
{
|
||||||
.callback = init_old_suspend_ordering,
|
.callback = init_old_suspend_ordering,
|
||||||
@ -343,6 +351,19 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
|
|||||||
DMI_MATCH(DMI_PRODUCT_NAME, "80E3"),
|
DMI_MATCH(DMI_PRODUCT_NAME, "80E3"),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
/*
|
||||||
|
* https://bugzilla.kernel.org/show_bug.cgi?id=196907
|
||||||
|
* Some Dell XPS13 9360 cannot do suspend-to-idle using the Low Power
|
||||||
|
* S0 Idle firmware interface.
|
||||||
|
*/
|
||||||
|
{
|
||||||
|
.callback = init_no_lps0,
|
||||||
|
.ident = "Dell XPS13 9360",
|
||||||
|
.matches = {
|
||||||
|
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
|
||||||
|
DMI_MATCH(DMI_PRODUCT_NAME, "XPS 13 9360"),
|
||||||
|
},
|
||||||
|
},
|
||||||
{},
|
{},
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -485,6 +506,7 @@ static void acpi_pm_end(void)
|
|||||||
}
|
}
|
||||||
#else /* !CONFIG_ACPI_SLEEP */
|
#else /* !CONFIG_ACPI_SLEEP */
|
||||||
#define acpi_target_sleep_state ACPI_STATE_S0
|
#define acpi_target_sleep_state ACPI_STATE_S0
|
||||||
|
#define acpi_sleep_no_lps0 (false)
|
||||||
static inline void acpi_sleep_dmi_check(void) {}
|
static inline void acpi_sleep_dmi_check(void) {}
|
||||||
#endif /* CONFIG_ACPI_SLEEP */
|
#endif /* CONFIG_ACPI_SLEEP */
|
||||||
|
|
||||||
@ -863,6 +885,12 @@ static int lps0_device_attach(struct acpi_device *adev,
|
|||||||
if (lps0_device_handle)
|
if (lps0_device_handle)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
if (acpi_sleep_no_lps0) {
|
||||||
|
acpi_handle_info(adev->handle,
|
||||||
|
"Low Power S0 Idle interface disabled\n");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0))
|
if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user