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

!3641 Make the cpuinfo_cur_freq interface read correctly 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zeng Heng <zengheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/CGPFO7XWD4OSPWLOHW274IMOM23RTETM/ 
Patch 1~2: It is required to ensure that amu can continue to work normally
during the sample period while cstate is enabled.

Zeng Heng (2):
  arm64: cpufeature: Export cpu_has_amu_feat()
  cpufreq: CPPC: Keep the target core awake when reading its cpufreq
    rate


--
2.25.1
 
https://gitee.com/openeuler/kernel/issues/I73EPL 
 
Link:https://gitee.com/openeuler/kernel/pulls/3641

 

Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents d4a92cc8 12f136b2

arch/arm64/kernel/cpufeature.c

+1 −0
Original line number Diff line number Diff line
@@ -1964,6 +1964,7 @@ bool cpu_has_amu_feat(int cpu) 
{

	return cpumask_test_cpu(cpu, &amu_cpus);

}

EXPORT_SYMBOL(cpu_has_amu_feat);



int get_cpu_with_amu_feat(void)

{

drivers/cpufreq/cppc_cpufreq.c

+30 −9
Original line number Diff line number Diff line
@@ -90,6 +90,12 @@ static int cppc_perf_from_fbctrs(struct cppc_cpudata *cpu_data, 
				 struct cppc_perf_fb_ctrs *fb_ctrs_t0,

				 struct cppc_perf_fb_ctrs *fb_ctrs_t1);



struct fb_ctr_pair {

	u32 cpu;

	struct cppc_perf_fb_ctrs fb_ctrs_t0;

	struct cppc_perf_fb_ctrs fb_ctrs_t1;

};



/**

 * cppc_scale_freq_workfn - CPPC arch_freq_scale updater for frequency invariance

 * @work: The work item.
@@ -840,9 +846,24 @@ static int cppc_perf_from_fbctrs(struct cppc_cpudata *cpu_data, 
	return (reference_perf * delta_delivered) / delta_reference;

}



static int cppc_get_perf_ctrs_pair(void *val)

{

	struct fb_ctr_pair *fb_ctrs = val;

	int cpu = fb_ctrs->cpu;

	int ret;



	ret = cppc_get_perf_ctrs(cpu, &fb_ctrs->fb_ctrs_t0);

	if (ret)

		return ret;



	udelay(2); /* 2usec delay between sampling */



	return cppc_get_perf_ctrs(cpu, &fb_ctrs->fb_ctrs_t1);

}



static unsigned int cppc_cpufreq_get_rate(unsigned int cpu)

{

	struct cppc_perf_fb_ctrs fb_ctrs_t0 = {0}, fb_ctrs_t1 = {0};

	struct fb_ctr_pair fb_ctrs = { .cpu = cpu, };

	struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);

	struct cppc_cpudata *cpu_data = policy->driver_data;

	u64 delivered_perf;
@@ -850,18 +871,18 @@ static unsigned int cppc_cpufreq_get_rate(unsigned int cpu) 


	cpufreq_cpu_put(policy);



	ret = cppc_get_perf_ctrs(cpu, &fb_ctrs_t0);

	if (ret)

		return 0;



	udelay(2); /* 2usec delay between sampling */

	if (cpu_has_amu_feat(cpu))

		ret = smp_call_on_cpu(cpu, cppc_get_perf_ctrs_pair,

				      &fb_ctrs, false);

	else

		ret = cppc_get_perf_ctrs_pair(&fb_ctrs);



	ret = cppc_get_perf_ctrs(cpu, &fb_ctrs_t1);

	if (ret)

		return 0;



	delivered_perf = cppc_perf_from_fbctrs(cpu_data, &fb_ctrs_t0,

					       &fb_ctrs_t1);

	delivered_perf = cppc_perf_from_fbctrs(cpu_data,

					      &fb_ctrs.fb_ctrs_t0,

					      &fb_ctrs.fb_ctrs_t1);



	return cppc_cpufreq_perf_to_khz(cpu_data, delivered_perf);

}