Commit af149b66 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-cppc' 

Merge a revert of an ACPI CPPC commit that increased the log level of
some debug messages which turned out to be a bad idea:

 - Restore log level of messages in amd_set_max_freq_ratio() (Mario
   Limonciello)

* acpi-cppc:
  Revert "ACPI: CPPC: Adjust debug messages in amd_set_max_freq_ratio() to warn"
parents b7cdd59d db5dadb5

arch/x86/kernel/acpi/cppc.c

+3 −3
Original line number Diff line number Diff line
@@ -88,19 +88,19 @@ static void amd_set_max_freq_ratio(void) 


	rc = cppc_get_perf_caps(0, &perf_caps);

	if (rc) {

		pr_warn("Could not retrieve perf counters (%d)\n", rc);

		pr_debug("Could not retrieve perf counters (%d)\n", rc);

		return;

	}



	rc = amd_get_boost_ratio_numerator(0, &numerator);

	if (rc) {

		pr_warn("Could not retrieve highest performance (%d)\n", rc);

		pr_debug("Could not retrieve highest performance (%d)\n", rc);

		return;

	}

	nominal_perf = perf_caps.nominal_perf;



	if (!nominal_perf) {

		pr_warn("Could not retrieve nominal performance\n");

		pr_debug("Could not retrieve nominal performance\n");

		return;

	}