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

Merge tag 'pm-6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fixes from Rafael Wysocki:
 "These fix three issues in the amd-pstate cpufreq driver.

  Specifics:

   - Remove checks for highest performance match on preferred cores when
     updating preferred core ranking in amd-pstate (Mario Limonciello)

   - Make amd-pstate call topology_logical_package_id() instead of
     logical_die_id() to get a socked ID for a CPU (Gautham Shenoy)

   - Fix uninitialized variable in amd_pstate_cpu_boost_update() (Dan
     Carpenter)"

* tag 'pm-6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq/amd-pstate-ut: Don't check for highest perf matching on prefcore
  cpufreq/amd-pstate: Use topology_logical_package_id() instead of logical_die_id()
  cpufreq: amd-pstate: Fix uninitialized variable in amd_pstate_cpu_boost_update()
parents 922842a3 15d75184

drivers/cpufreq/amd-pstate-ut.c

+8 −5
Original line number Diff line number Diff line
@@ -160,14 +160,17 @@ static void amd_pstate_ut_check_perf(u32 index) 
			lowest_perf = AMD_CPPC_LOWEST_PERF(cap1);

		}



		if ((highest_perf != READ_ONCE(cpudata->highest_perf)) ||

			(nominal_perf != READ_ONCE(cpudata->nominal_perf)) ||

		if (highest_perf != READ_ONCE(cpudata->highest_perf) && !cpudata->hw_prefcore) {

			pr_err("%s cpu%d highest=%d %d highest perf doesn't match\n",

				__func__, cpu, highest_perf, cpudata->highest_perf);

			goto skip_test;

		}

		if ((nominal_perf != READ_ONCE(cpudata->nominal_perf)) ||

			(lowest_nonlinear_perf != READ_ONCE(cpudata->lowest_nonlinear_perf)) ||

			(lowest_perf != READ_ONCE(cpudata->lowest_perf))) {

			amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;

			pr_err("%s cpu%d highest=%d %d nominal=%d %d lowest_nonlinear=%d %d lowest=%d %d, they should be equal!\n",

				__func__, cpu, highest_perf, cpudata->highest_perf,

				nominal_perf, cpudata->nominal_perf,

			pr_err("%s cpu%d nominal=%d %d lowest_nonlinear=%d %d lowest=%d %d, they should be equal!\n",

				__func__, cpu, nominal_perf, cpudata->nominal_perf,

				lowest_nonlinear_perf, cpudata->lowest_nonlinear_perf,

				lowest_perf, cpudata->lowest_perf);

			goto skip_test;

drivers/cpufreq/amd-pstate.c

+2 −2
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static inline int pstate_enable(bool enable) 
		return 0;



	for_each_present_cpu(cpu) {

		unsigned long logical_id = topology_logical_die_id(cpu);

		unsigned long logical_id = topology_logical_package_id(cpu);



		if (test_bit(logical_id, &logical_proc_id_mask))

			continue;
@@ -692,7 +692,7 @@ static int amd_pstate_cpu_boost_update(struct cpufreq_policy *policy, bool on) 
	struct amd_cpudata *cpudata = policy->driver_data;

	struct cppc_perf_ctrls perf_ctrls;

	u32 highest_perf, nominal_perf, nominal_freq, max_freq;

	int ret;

	int ret = 0;



	highest_perf = READ_ONCE(cpudata->highest_perf);

	nominal_perf = READ_ONCE(cpudata->nominal_perf);