leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACPI fix for 5.19-rc8

Browse Source 
Fix yet another piece of ACPI CPPC changes fallout on AMD
 platforms (Mario Limonciello).
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAmLa6KsSHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRxh4MP/RYF7zR0gSX+HEiGU8DL4F1vnp2ObRBK
 z7x6ih9EKvey6HUNOgoUdn70r3I5i0ZkTw1w9nge6z8PdGRAINwpVcBFeR8JMYch
 iuoOEl/rkNmz5Wet7gqyfY95rV6m8AONKnnIuuCh8NLJDdXtDIeXSnp22Q6ogr8W
 2rDzjMuH5/5Ry9ZK1vLfzLJvCVFC3GqJcJ2fNUHDuwfMFPqyjuxG1+xRhcbrIpvK
 sgGpklOhyTGiSoDlqF/XV0nyn9vfB2sY9HuXO+oUApIG2TbtvJE9yUvHurpFWPt+
 NirUTlGX+SuGFfCTva1fXOa75xOT/TSnCohEKXYTkNuQaaD1oTtokrwBhaJr6JiW
 MRuCSaNDfURtFFd+5mlksmSreP4iwfyFsa9AY8Ib7ZRtfrTp0h+92fkdzuOIjWTN
 +gamA4gULT4VGjDg7Q9XDLggHDhiOy+k+8TW/DV4EfQQuLl8OD+GzuMpkyPjb7yV
 dt4vQCxOiauWk89o2DJfP1G10hWbG0zko7BYf4BjlmQsFImPusAF9G/JP2AqL1qG
 nSzXA5HDHHGl4FKfahgz1AQQtob1Zt/Ceuvxm6dL9vPhj3KF1A0uuKpc6UGqLjXL
 HGIE/QZfJJ+8MNF7EqRrHDNmy97i2FNc1EfA0HDjSdreGTrp3Lv9+MiTjZCyzhqb
 DUrWXIJxYOnl
 =JirQ
 -----END PGP SIGNATURE-----

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

Pull ACPI fix from Rafael Wysocki:
 "Fix yet another piece of ACPI CPPC changes fallout on AMD platforms
  (Mario Limonciello)"

* tag 'acpi-5.19-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: CPPC: Don't require flexible address space if X86_FEATURE_CPPC is supported
This commit is contained in:
Linus Torvalds 2022-07-22 12:56:49 -07:00
commit ae21fbac18
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/acpi/cppc_acpi.c
View File

@ -782,7 +782,8 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)
if (!osc_cpc_flexible_adr_space_confirmed) {
pr_debug("Flexible address space capability not supported\n");
goto out_free;
if (!cpc_supported_by_cpu())
goto out_free;
}
addr = ioremap(gas_t->address, gas_t->bit_width/8);
@ -809,7 +810,8 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)
}
if (!osc_cpc_flexible_adr_space_confirmed) {
pr_debug("Flexible address space capability not supported\n");
goto out_free;
if (!cpc_supported_by_cpu())
goto out_free;
}
} else {
if (gas_t->space_id != ACPI_ADR_SPACE_FIXED_HARDWARE || !cpc_ffh_supported()) {