Commit 1ea1dbf1 authored by Sachi King's avatar Sachi King Committed by Rafael J. Wysocki
Browse files

ACPI: PM: Include alternate AMDI0005 id in special behaviour 

The Surface Laptop 4 AMD has used the AMD0005 to identify this
controller instead of using the appropriate ACPI ID AMDI0005.  The
AMD0005 needs the same special casing as AMDI0005.

Link: https://github.com/linux-surface/acpidumps/tree/master/surface_laptop_4_amd
Link: https://gist.github.com/nakato/2a1a7df1a45fe680d7a08c583e1bf863


Signed-off-by: default avatarSachi King <nakato@nakato.io>
Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Cc: 5.14+ <stable@vger.kernel.org> # 5.14+
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 64570fbc

drivers/acpi/x86/s2idle.c

+2 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ static int lps0_device_attach(struct acpi_device *adev, 
		return 0;



	if (acpi_s2idle_vendor_amd()) {

		/* AMD0004, AMDI0005:

		/* AMD0004, AMD0005, AMDI0005:

		 * - Should use rev_id 0x0

		 * - function mask > 0x3: Should use AMD method, but has off by one bug

		 * - function mask = 0x3: Should use Microsoft method
@@ -390,6 +390,7 @@ static int lps0_device_attach(struct acpi_device *adev, 
					ACPI_LPS0_DSM_UUID_MICROSOFT, 0,

					&lps0_dsm_guid_microsoft);

		if (lps0_dsm_func_mask > 0x3 && (!strcmp(hid, "AMD0004") ||

						 !strcmp(hid, "AMD0005") ||

						 !strcmp(hid, "AMDI0005"))) {

			lps0_dsm_func_mask = (lps0_dsm_func_mask << 1) | 0x1;

			acpi_handle_debug(adev->handle, "_DSM UUID %s: Adjusted function mask: 0x%x\n",