Commit e32d546c authored by Mario Limonciello's avatar Mario Limonciello Committed by Rafael J. Wysocki
Browse files

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: default avatarAnson Tsao <anson.tsao@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 2504ba8b

drivers/acpi/x86/s2idle.c

+0 −24
Original line number Diff line number Diff line
@@ -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);

}