Skip to contentSkip to conversation

Drop s2idle quirk

PATCH Applied Mario Limonciello 2 participants 3 messages Feb 23, 2023 – Feb 28, 2023 ACPI

lore
Share & tools
lore
#0 lore raw

cover Drop s2idle quirk

There is an LPS0 quirk remaining for HP Elitebook that forced it to not use Microsoft codepath, but instead the AMD codepath.

This was root caused to be a WLAN problem, and it's been fixed in newer WLAN firmware linked in the commit message.

Furthermore, a separate patch is sent to ath11k list to try to notify users if they have the broken firmware that this might be the reason for a spurious wakeup event.

Mario Limonciello (1):
ACPI: x86: Drop quirk for HP Elitebook

 drivers/acpi/x86/s2idle.c | 24 ------------------------
 1 file changed, 24 deletions(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH 1/1 ACPI: x86: Drop quirk for HP Elitebook

There was a quirk in acpi/x86/s2idle.c for an HP Elitebook G9 platforms to force AMD GUID codepath instead of Microsoft codepath.

This was due to a bug with WCN6855 WLAN firmware interaction with the system.

This bug is fixed by WCN6855 firmware:
WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23

Remove the quirk as it's no longer necessary with this firmware.

---
 drivers/acpi/x86/s2idle.c | 24 ------------------------
 1 file changed, 24 deletions(-)
drivers/acpi/x86/s2idle.c +0 -24
index c7afce465a07..e499c60c4579 100644
@@ -384,29 +384,6 @@ static const struct acpi_device_id amd_hid_ids[] = {
 	{}
 };
 
-static int lps0_prefer_amd(const struct dmi_system_id *id)
-{
-	pr_debug("Using AMD GUID w/ _REV 2.\n");
-	rev_id = 2;
-	return 0;
-}
-static const struct dmi_system_id s2idle_dmi_table[] __initconst = {
-	{
-		/*
-		 * AMD Rembrandt based HP EliteBook 835/845/865 G9
-		 * Contains specialized AML in AMD/_REV 2 path to avoid
-		 * triggering a bug in Qualcomm WLAN firmware. This may be
-		 * removed in the future if that firmware is fixed.
-		 */
-		.callback = lps0_prefer_amd,
-		.matches = {
-			DMI_MATCH(DMI_BOARD_VENDOR, "HP"),
-			DMI_MATCH(DMI_BOARD_NAME, "8990"),
-		},
-	},
-	{}
-};
-
 static int lps0_device_attach(struct acpi_device *adev,
 			      const struct acpi_device_id *not_used)
 {
@@ -586,7 +563,6 @@ static const struct platform_s2idle_ops acpi_s2idle_ops_lps0 = {
 
 void __init acpi_s2idle_setup(void)
 {
-	dmi_check_system(s2idle_dmi_table);
 	acpi_scan_add_handler(&lps0_handler);
 	s2idle_set_ops(&acpi_s2idle_ops_lps0);
 }
Signature · 1 line
2.34.1
maintainer Applied
#2 lore raw

Re: [PATCH 1/1] ACPI: x86: Drop quirk for HP Elitebook

Quoted 54 lines · Mario Limonciello

There was a quirk in acpi/x86/s2idle.c for an HP Elitebook G9 platforms to force AMD GUID codepath instead of Microsoft codepath.

This was due to a bug with WCN6855 WLAN firmware interaction with the system.

This bug is fixed by WCN6855 firmware:
WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23

Remove the quirk as it's no longer necessary with this firmware.

---
 drivers/acpi/x86/s2idle.c | 24 ------------------------
 1 file changed, 24 deletions(-)
drivers/acpi/x86/s2idle.c +0 -23
index c7afce465a07..e499c60c4579 100644
@@ -384,29 +384,6 @@ static const struct acpi_device_id amd_hid_ids[] = {
        {}
 };
 
-static int lps0_prefer_amd(const struct dmi_system_id *id)
-{
-       pr_debug("Using AMD GUID w/ _REV 2.\n");
-       rev_id = 2;
-       return 0;
-}
-static const struct dmi_system_id s2idle_dmi_table[] __initconst = {
-       {
-               /*
-                * AMD Rembrandt based HP EliteBook 835/845/865 G9
-                * Contains specialized AML in AMD/_REV 2 path to avoid
-                * triggering a bug in Qualcomm WLAN firmware. This may be
-                * removed in the future if that firmware is fixed.
-                */
-               .callback = lps0_prefer_amd,
-               .matches = {
-                       DMI_MATCH(DMI_BOARD_VENDOR, "HP"),
-                       DMI_MATCH(DMI_BOARD_NAME, "8990"),
-               },
-       },
-       {}
-};
-
 static int lps0_device_attach(struct acpi_device *adev,
                              const struct acpi_device_id *not_used)
 {

drivers/acpi/x86/s2idle.c static const struct platform_s2idle_ops acpi_s2idle_ops_lps0 = {

Quoted 8 lines
drivers/acpi/x86/s2idle.c +0 -2
@@ -586,7 +563,6 @@ static const struct platform_s2idle_ops acpi_s2idle_ops_lps0 = {
 
 void __init acpi_s2idle_setup(void)
 {
-       dmi_check_system(s2idle_dmi_table);
        acpi_scan_add_handler(&lps0_handler);
        s2idle_set_ops(&acpi_s2idle_ops_lps0);
 }
--

Applied as 6.3-rc material, thanks!