queue-5.15/revert-acpi-pm-block-asus-b1400ceae-from-suspend-to-.patch

   1 From c67b055bebba9e37f7509751d96c6815b578da2b Mon Sep 17 00:00:00 2001
   2 From: Sasha Levin <sashal@kernel.org>
   3 Date: Wed, 28 Feb 2024 08:53:16 +0100
   4 Subject: Revert "ACPI: PM: Block ASUS B1400CEAE from suspend to idle by
   5  default"
   6
   7 From: Daniel Drake <drake@endlessos.org>
   8
   9 [ Upstream commit cb98555fcd8eee98c30165537c7e394f3a66e809 ]
  10
  11 This reverts commit d52848620de00cde4a3a5df908e231b8c8868250, which was
  12 originally put in place to work around a s2idle failure on this platform
  13 where the NVMe device was inaccessible upon resume.
  14
  15 After extended testing, we found that the firmware's implementation of S3
  16 is buggy and intermittently fails to wake up the system. We need to revert
  17 to s2idle mode.
  18
  19 The NVMe issue has now been solved more precisely in the commit titled
  20 "PCI: Disable D3cold on Asus B1400 PCI-NVMe bridge"
  21
  22 Link: https://bugzilla.kernel.org/show_bug.cgi?id=215742
  23 Link: https://lore.kernel.org/r/20240228075316.7404-2-drake@endlessos.org
  24 Signed-off-by: Daniel Drake <drake@endlessos.org>
  25 Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
  26 Acked-by: Jian-Hong Pan <jhp@endlessos.org>
  27 Acked-by: Rafael J. Wysocki <rafael@kernel.org>
  28 Signed-off-by: Sasha Levin <sashal@kernel.org>
  29 ---
  30  drivers/acpi/sleep.c | 12 ------------
  31  1 file changed, 12 deletions(-)
  32
  33 diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
  34 index b277e25b276ce..95deb55fb9a8c 100644
  35 --- a/drivers/acpi/sleep.c
  36 +++ b/drivers/acpi/sleep.c
  37 @@ -382,18 +382,6 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
  38                 DMI_MATCH(DMI_PRODUCT_NAME, "20GGA00L00"),
  39                 },
  40         },
  41 -       /*
  42 -        * ASUS B1400CEAE hangs on resume from suspend (see
  43 -        * https://bugzilla.kernel.org/show_bug.cgi?id=215742).
  44 -        */
  45 -       {
  46 -       .callback = init_default_s3,
  47 -       .ident = "ASUS B1400CEAE",
  48 -       .matches = {
  49 -               DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
  50 -               DMI_MATCH(DMI_PRODUCT_NAME, "ASUS EXPERTBOOK B1400CEAE"),
  51 -               },
  52 -       },
  53         {},
  54  };
  55
  56 --
  57 2.43.0
  58