Commit 711c3686 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fix from Rafael Wysocki:
 "Add a missing device ID to a quirk list in the suspend-to-idle support
  code"

* tag 'acpi-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: PM: Include alternate AMDI0005 id in special behaviour
parents 8fe31e09 1ea1dbf1

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",