korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 20:54:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

ACPI fix for 5.15-rc6

Browse Source 
Add a missing device ID to a quirk list in the suspend-to-idle
 support code.
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAmFpvpISHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRxnIAQAITZ2s2rTPROECYwEpNypSb0qg9Ww161
 SX/ewJA4Ps6ga2pnLIyF3nS4W1enJU3vUXcMhWODuAjFLTnXTAjVUlepLefqExj2
 /8Um8neoX+1fmNvhC302VWWNAU/7RG/uVGkeeY6Nr89Mfvf0qkBD/qwI9uUtv58i
 u0h+khf5/In8W4gk9EoJ5xtfQkVJC4bLN8ZXzEaets5bQ6PTKNmfTQmP2BWvmI0C
 ytoz4z3h9epMJhL4k8MxG7Jl31HZoWZXiI3CSMPR2Zyj2GXfftacexJB4lXVOXz8
 Kr7XZEtvKlVHUOkv7juoalzhKtgW5qMGIwbwX7uSDrOYB6OyGYbVbWQwi7l53wbt
 kKUTqH2KFF+vTmkKHPZGbCzRcRhTYBdXpOh9dWTGuEYTLhrfqQh6DrVgRk8gtL6v
 vAdBs4p0VAB+38Ks9kWmJftPaQ7ZEy38Ly8gmGOrf981ewr0Xdb+CSbog4/f7jpA
 rUkcSju1LRCEBBz6Nwt83sLk3gCx413g7vg7UJnhQaQJaI9LPjo5HaFUvcq6bdx+
 ZB7Te+5Ga9qAKvJR1KRwJPa03hd/Ty9vAgIfUxkiTr9M0apCpGzu5N1LSGva9Pkp
 BLXB3Cs1Ig7tApzmgHr940AhvthbuqRMtVt2Pypf5/PJ3nMBsVh2LMIS5iBAGx/E
 XGpZojV38DJ1
 =04zc
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2021-10-16 08:45:46 -07:00
commit 711c368667
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/acpi/x86/s2idle.c
View File

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