Commit 9b81df5e authored Feb 28, 2024 by Daniel Drake Committed by sanglipeng1 Aug 23, 2024

Revert "ACPI: PM: Block ASUS B1400CEAE from suspend to idle by default"

stable inclusion
from stable-v5.10.215
commit 5e0a89c49f057d2e83e8a4d9065fdf09ee1efa68
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAJJ2D

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=5e0a89c49f057d2e83e8a4d9065fdf09ee1efa68

--------------------------------

[ Upstream commit cb98555fcd8eee98c30165537c7e394f3a66e809 ]

This reverts commit d5284862, 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: sanglipeng1 <sanglipeng1@jd.com>

parent 2e2a05ca

drivers/acpi/sleep.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -385,18 +385,6 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
		DMI_MATCH(DMI_PRODUCT_NAME, "20GGA00L00"),
		},
		},
		/*
		* ASUS B1400CEAE hangs on resume from suspend (see
		* https://bugzilla.kernel.org/show_bug.cgi?id=215742).
		*/
		{
		.callback = init_default_s3,
		.ident = "ASUS B1400CEAE",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
		DMI_MATCH(DMI_PRODUCT_NAME, "ASUS EXPERTBOOK B1400CEAE"),
		},
		},
		{},
		};