Unverified Commit d491f09c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3998 cpufreq: CPPC: Fix performance/frequency conversion 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zeng Heng <zengheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/O6VDPOFYYCNYJPTKZUPURVH3XDK6LDPS/ 
 
https://gitee.com/openeuler/kernel/issues/I8WAED 
 
Link:https://gitee.com/openeuler/kernel/pulls/3998

 

Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents bc0ca496 72f6fabb

drivers/cpufreq/cppc_cpufreq.c

+23 −24
Original line number Diff line number Diff line
@@ -95,52 +95,48 @@ static u64 cppc_get_dmi_max_khz(void) 


/*

 * If CPPC lowest_freq and nominal_freq registers are exposed then we can

 * use them to convert perf to freq and vice versa

 *

 * If the perf/freq point lies between Nominal and Lowest, we can treat

 * (Low perf, Low freq) and (Nom Perf, Nom freq) as 2D co-ordinates of a line

 * and extrapolate the rest

 * For perf/freq > Nominal, we use the ratio perf:freq at Nominal for conversion

 * use them to convert perf to freq and vice versa. The conversion is

 * extrapolated as an affine function passing by the 2 points:

 *  - (Low perf, Low freq)

 *  - (Nominal perf, Nominal perf)

 */

static unsigned int cppc_cpufreq_perf_to_khz(struct cppc_cpudata *cpu_data,

					unsigned int perf)

{

	static u64 max_khz;

	struct cppc_perf_caps *caps = &cpu_data->perf_caps;

	s64 retval, offset = 0;

	static u64 max_khz;

	u64 mul, div;



	if (caps->lowest_freq && caps->nominal_freq) {

		if (perf >= caps->nominal_perf) {

			mul = caps->nominal_freq;

			div = caps->nominal_perf;

		} else {

		mul = caps->nominal_freq - caps->lowest_freq;

		div = caps->nominal_perf - caps->lowest_perf;

		}

		offset = caps->nominal_freq - div64_u64(caps->nominal_perf * mul, div);

	} else {

		if (!max_khz)

			max_khz = cppc_get_dmi_max_khz();

		mul = max_khz;

		div = caps->highest_perf;

	}

	return (u64)perf * mul / div;



	retval = offset + div64_u64(perf * mul, div);

	if (retval >= 0)

		return retval;

	return 0;

}



static unsigned int cppc_cpufreq_khz_to_perf(struct cppc_cpudata *cpu_data,

					unsigned int freq)

{

	static u64 max_khz;

	struct cppc_perf_caps *caps = &cpu_data->perf_caps;

	s64 retval, offset = 0;

	static u64 max_khz;

	u64  mul, div;



	if (caps->lowest_freq && caps->nominal_freq) {

		if (freq >= caps->nominal_freq) {

			mul = caps->nominal_perf;

			div = caps->nominal_freq;

		} else {

			mul = caps->lowest_perf;

			div = caps->lowest_freq;

		}

		mul = caps->nominal_perf - caps->lowest_perf;

		div = caps->nominal_freq - caps->lowest_freq;

		offset = caps->nominal_perf - div64_u64(caps->nominal_freq * mul, div);

	} else {

		if (!max_khz)

			max_khz = cppc_get_dmi_max_khz();
@@ -148,7 +144,10 @@ static unsigned int cppc_cpufreq_khz_to_perf(struct cppc_cpudata *cpu_data, 
		div = max_khz;

	}



	return (u64)freq * mul / div;

	retval = offset + div64_u64(freq * mul, div);

	if (retval >= 0)

		return retval;

	return 0;

}



static int cppc_cpufreq_set_target(struct cpufreq_policy *policy,