Skip to content

Commit e32d546

Browse files
superm1rafaeljw
authored andcommitted
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. Link: https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=c7a57ef688f7d99d8338a5d8edddc8836ff0e6de Tested-by: Anson Tsao <[email protected]> Signed-off-by: Mario Limonciello <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 2504ba8 commit e32d546

File tree

1 file changed

+0
-24
lines changed

1 file changed

+0
-24
lines changed

drivers/acpi/x86/s2idle.c

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -384,29 +384,6 @@ static const struct acpi_device_id amd_hid_ids[] = {
384384
{}
385385
};
386386

387-
static int lps0_prefer_amd(const struct dmi_system_id *id)
388-
{
389-
pr_debug("Using AMD GUID w/ _REV 2.\n");
390-
rev_id = 2;
391-
return 0;
392-
}
393-
static const struct dmi_system_id s2idle_dmi_table[] __initconst = {
394-
{
395-
/*
396-
* AMD Rembrandt based HP EliteBook 835/845/865 G9
397-
* Contains specialized AML in AMD/_REV 2 path to avoid
398-
* triggering a bug in Qualcomm WLAN firmware. This may be
399-
* removed in the future if that firmware is fixed.
400-
*/
401-
.callback = lps0_prefer_amd,
402-
.matches = {
403-
DMI_MATCH(DMI_BOARD_VENDOR, "HP"),
404-
DMI_MATCH(DMI_BOARD_NAME, "8990"),
405-
},
406-
},
407-
{}
408-
};
409-
410387
static int lps0_device_attach(struct acpi_device *adev,
411388
const struct acpi_device_id *not_used)
412389
{
@@ -586,7 +563,6 @@ static const struct platform_s2idle_ops acpi_s2idle_ops_lps0 = {
586563

587564
void __init acpi_s2idle_setup(void)
588565
{
589-
dmi_check_system(s2idle_dmi_table);
590566
acpi_scan_add_handler(&lps0_handler);
591567
s2idle_set_ops(&acpi_s2idle_ops_lps0);
592568
}

0 commit comments

Comments
 (0)