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

Merge tag 'amd-pstate-v6.12-2024-09-04' of... 

Merge tag 'amd-pstate-v6.12-2024-09-04' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux

Merge an amd-pstate driver update for 6.12 from Mario Limonciello:

"amd-pstate development for 6.12:
 * Validate return of any attempt to update EPP limits, which fixes
   the masking hardware problems."

* tag 'amd-pstate-v6.12-2024-09-04' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux:
  cpufreq/amd-pstate: Catch failures for amd_pstate_epp_update_limit()
parents 287f97a1 c3e093ef

drivers/cpufreq/amd-pstate.c

+7 −4
Original line number Diff line number Diff line
@@ -1555,7 +1555,7 @@ static void amd_pstate_epp_cpu_exit(struct cpufreq_policy *policy) 
	pr_debug("CPU %d exiting\n", policy->cpu);

}



static void amd_pstate_epp_update_limit(struct cpufreq_policy *policy)

static int amd_pstate_epp_update_limit(struct cpufreq_policy *policy)

{

	struct amd_cpudata *cpudata = policy->driver_data;

	u32 max_perf, min_perf, min_limit_perf, max_limit_perf;
@@ -1605,7 +1605,7 @@ static void amd_pstate_epp_update_limit(struct cpufreq_policy *policy) 
		 * This return value can only be negative for shared_memory

		 * systems where EPP register read/write not supported.

		 */

		return;

		return epp;

	}



	if (cpudata->policy == CPUFREQ_POLICY_PERFORMANCE)
@@ -1618,12 +1618,13 @@ static void amd_pstate_epp_update_limit(struct cpufreq_policy *policy) 
	}



	WRITE_ONCE(cpudata->cppc_req_cached, value);

	amd_pstate_set_epp(cpudata, epp);

	return amd_pstate_set_epp(cpudata, epp);

}



static int amd_pstate_epp_set_policy(struct cpufreq_policy *policy)

{

	struct amd_cpudata *cpudata = policy->driver_data;

	int ret;



	if (!policy->cpuinfo.max_freq)

		return -ENODEV;
@@ -1633,7 +1634,9 @@ static int amd_pstate_epp_set_policy(struct cpufreq_policy *policy) 


	cpudata->policy = policy->policy;



	amd_pstate_epp_update_limit(policy);

	ret = amd_pstate_epp_update_limit(policy);

	if (ret)

		return ret;



	/*

	 * policy->cur is never updated with the amd_pstate_epp driver, but it