Commit ae21fbac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a5235996 09073396

drivers/acpi/cppc_acpi.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -782,6 +782,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) 




					if (!osc_cpc_flexible_adr_space_confirmed) {

					if (!osc_cpc_flexible_adr_space_confirmed) {

						pr_debug("Flexible address space capability not supported\n");

						pr_debug("Flexible address space capability not supported\n");

						if (!cpc_supported_by_cpu())

							goto out_free;

							goto out_free;

					}

					}
@@ -809,6 +810,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) 
				}

				}

				if (!osc_cpc_flexible_adr_space_confirmed) {

				if (!osc_cpc_flexible_adr_space_confirmed) {

					pr_debug("Flexible address space capability not supported\n");

					pr_debug("Flexible address space capability not supported\n");

					if (!cpc_supported_by_cpu())

						goto out_free;

						goto out_free;

				}

				}

			} else {

			} else {