Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+2
-1
+2
-1
drivers/acpi/x86/s2idle.c
+2
-1
drivers/acpi/x86/s2idle.c
···
371
371
return 0;
372
372
373
373
if (acpi_s2idle_vendor_amd()) {
374
-
/* AMD0004, AMDI0005:
374
+
/* AMD0004, AMD0005, AMDI0005:
375
375
* - Should use rev_id 0x0
376
376
* - function mask > 0x3: Should use AMD method, but has off by one bug
377
377
* - function mask = 0x3: Should use Microsoft method
···
390
390
ACPI_LPS0_DSM_UUID_MICROSOFT, 0,
391
391
&lps0_dsm_guid_microsoft);
392
392
if (lps0_dsm_func_mask > 0x3 && (!strcmp(hid, "AMD0004") ||
393
+
!strcmp(hid, "AMD0005") ||
393
394
!strcmp(hid, "AMDI0005"))) {
394
395
lps0_dsm_func_mask = (lps0_dsm_func_mask << 1) | 0x1;
395
396
acpi_handle_debug(adev->handle, "_DSM UUID %s: Adjusted function mask: 0x%x\n",