Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Revert "cpufreq: intel_pstate: Avoid calculation for max/min" 



Revert commit 4ef45148 (cpufreq: intel_pstate: Avoid calculation for
max/min) as it depends on commit 37afb000 (cpufreq: intel_pstate: Use
ACPI perf configuration) that causes problems to happen and needs to be
reverted.

Conflicts:
	drivers/cpufreq/intel_pstate.c

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent d7e53e35

drivers/cpufreq/intel_pstate.c

+5 −43
Original line number Diff line number Diff line
@@ -163,8 +163,6 @@ struct perf_limits { 
	int max_sysfs_pct;

	int min_policy_pct;

	int min_sysfs_pct;

	int max_perf_ctl;

	int min_perf_ctl;

};



static struct perf_limits performance_limits = {
@@ -191,8 +189,6 @@ static struct perf_limits powersave_limits = { 
	.max_sysfs_pct = 100,

	.min_policy_pct = 0,

	.min_sysfs_pct = 0,

	.max_perf_ctl = 0,

	.min_perf_ctl = 0,

};



#ifdef CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE
@@ -938,24 +934,13 @@ static void intel_pstate_get_min_max(struct cpudata *cpu, int *min, int *max) 
	 * policy, or by cpu specific default values determined through

	 * experimentation.

	 */

	if (limits->max_perf_ctl && limits->max_sysfs_pct >=

						limits->max_policy_pct) {

		*max = limits->max_perf_ctl;

	} else {

		max_perf_adj = fp_toint(mul_fp(int_tofp(max_perf),

					limits->max_perf));

		*max = clamp_t(int, max_perf_adj, cpu->pstate.min_pstate,

			       cpu->pstate.turbo_pstate);

	}

	max_perf_adj = fp_toint(mul_fp(int_tofp(max_perf), limits->max_perf));

	*max = clamp_t(int, max_perf_adj,

			cpu->pstate.min_pstate, cpu->pstate.turbo_pstate);



	if (limits->min_perf_ctl) {

		*min = limits->min_perf_ctl;

	} else {

		min_perf = fp_toint(mul_fp(int_tofp(max_perf),

				    limits->min_perf));

	min_perf = fp_toint(mul_fp(int_tofp(max_perf), limits->min_perf));

	*min = clamp_t(int, min_perf, cpu->pstate.min_pstate, max_perf);

}

}



static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate, bool force)

{
@@ -1229,12 +1214,6 @@ static unsigned int intel_pstate_get(unsigned int cpu_num) 


static int intel_pstate_set_policy(struct cpufreq_policy *policy)

{

#if IS_ENABLED(CONFIG_ACPI)

	struct cpudata *cpu;

	int i;

#endif

	pr_debug("intel_pstate: %s max %u policy->max %u\n", __func__,

		 policy->cpuinfo.max_freq, policy->max);

	if (!policy->cpuinfo.max_freq)

		return -ENODEV;
@@ -1270,23 +1249,6 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy) 
	limits->max_perf = div_fp(int_tofp(limits->max_perf_pct),

				  int_tofp(100));



#if IS_ENABLED(CONFIG_ACPI)

	cpu = all_cpu_data[policy->cpu];

	for (i = 0; i < cpu->acpi_perf_data.state_count; i++) {

		int control;



		control = convert_to_native_pstate_format(cpu, i);

		if (control * cpu->pstate.scaling == policy->max)

			limits->max_perf_ctl = control;

		if (control * cpu->pstate.scaling == policy->min)

			limits->min_perf_ctl = control;

	}



	pr_debug("intel_pstate: max %u policy_max %u perf_ctl [0x%x-0x%x]\n",

		 policy->cpuinfo.max_freq, policy->max, limits->min_perf_ctl,

		 limits->max_perf_ctl);

#endif



	if (hwp_active)

		intel_pstate_hwp_set();