Skip to content

Commit 956192a

Browse files
dsdsmb49
authored andcommitted
Revert "ACPI: PM: Block ASUS B1400CEAE from suspend to idle by default"
BugLink: https://bugs.launchpad.net/bugs/2065805 [ Upstream commit cb98555fcd8eee98c30165537c7e394f3a66e809 ] This reverts commit d528486, which was originally put in place to work around a s2idle failure on this platform where the NVMe device was inaccessible upon resume. After extended testing, we found that the firmware's implementation of S3 is buggy and intermittently fails to wake up the system. We need to revert to s2idle mode. The NVMe issue has now been solved more precisely in the commit titled "PCI: Disable D3cold on Asus B1400 PCI-NVMe bridge" Link: https://bugzilla.kernel.org/show_bug.cgi?id=215742 Link: https://lore.kernel.org/r/20240228075316.7404-2-drake@endlessos.org Signed-off-by: Daniel Drake <drake@endlessos.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Jian-Hong Pan <jhp@endlessos.org> Acked-by: Rafael J. Wysocki <rafael@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com> Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
1 parent 66bb75b commit 956192a

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

drivers/acpi/sleep.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -382,18 +382,6 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
382382
DMI_MATCH(DMI_PRODUCT_NAME, "20GGA00L00"),
383383
},
384384
},
385-
/*
386-
* ASUS B1400CEAE hangs on resume from suspend (see
387-
* https://bugzilla.kernel.org/show_bug.cgi?id=215742).
388-
*/
389-
{
390-
.callback = init_default_s3,
391-
.ident = "ASUS B1400CEAE",
392-
.matches = {
393-
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
394-
DMI_MATCH(DMI_PRODUCT_NAME, "ASUS EXPERTBOOK B1400CEAE"),
395-
},
396-
},
397385
{},
398386
};
399387

0 commit comments

Comments
 (0)