Commit c57b25bd authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

cpufreq: intel_pstate: Reuse refresh_frequency_limits() 



The implementation of intel_pstate_update_max_freq() is quite similar to
refresh_frequency_limits(), lets reuse it.

Finding minimum of policy->user_policy.max and policy->cpuinfo.max_freq
in intel_pstate_update_max_freq() is redundant as cpufreq_set_policy()
will call the ->verify() callback of intel-pstate driver, which will do
this comparison anyway and so dropping it from
intel_pstate_update_max_freq() doesn't harm.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 67d874c3

drivers/cpufreq/cpufreq.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1116,7 +1116,7 @@ static int cpufreq_add_policy_cpu(struct cpufreq_policy *policy, unsigned int cp 
	return ret;

	return ret;

}

}





static void refresh_frequency_limits(struct cpufreq_policy *policy)

void refresh_frequency_limits(struct cpufreq_policy *policy)

{

{

	struct cpufreq_policy new_policy;

	struct cpufreq_policy new_policy;
@@ -1129,6 +1129,7 @@ static void refresh_frequency_limits(struct cpufreq_policy *policy) 
		cpufreq_set_policy(policy, &new_policy);

		cpufreq_set_policy(policy, &new_policy);

	}

	}

}

}

EXPORT_SYMBOL(refresh_frequency_limits);





static void handle_update(struct work_struct *work)

static void handle_update(struct work_struct *work)

{

{

drivers/cpufreq/intel_pstate.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -898,7 +898,6 @@ static void intel_pstate_update_policies(void) 
static void intel_pstate_update_max_freq(unsigned int cpu)

static void intel_pstate_update_max_freq(unsigned int cpu)

{

{

	struct cpufreq_policy *policy = cpufreq_cpu_acquire(cpu);

	struct cpufreq_policy *policy = cpufreq_cpu_acquire(cpu);

	struct cpufreq_policy new_policy;

	struct cpudata *cpudata;

	struct cpudata *cpudata;





	if (!policy)

	if (!policy)
@@ -908,11 +907,7 @@ static void intel_pstate_update_max_freq(unsigned int cpu) 
	policy->cpuinfo.max_freq = global.turbo_disabled_mf ?

	policy->cpuinfo.max_freq = global.turbo_disabled_mf ?

			cpudata->pstate.max_freq : cpudata->pstate.turbo_freq;

			cpudata->pstate.max_freq : cpudata->pstate.turbo_freq;





	memcpy(&new_policy, policy, sizeof(*policy));

	refresh_frequency_limits(policy);

	new_policy.max = min(policy->user_policy.max, policy->cpuinfo.max_freq);

	new_policy.min = min(policy->user_policy.min, new_policy.max);



	cpufreq_set_policy(policy, &new_policy);





	cpufreq_cpu_release(policy);

	cpufreq_cpu_release(policy);

}

}

include/linux/cpufreq.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -207,6 +207,7 @@ void cpufreq_cpu_release(struct cpufreq_policy *policy); 
int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu);

int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu);

int cpufreq_set_policy(struct cpufreq_policy *policy,

int cpufreq_set_policy(struct cpufreq_policy *policy,

		       struct cpufreq_policy *new_policy);

		       struct cpufreq_policy *new_policy);

void refresh_frequency_limits(struct cpufreq_policy *policy);

void cpufreq_update_policy(unsigned int cpu);

void cpufreq_update_policy(unsigned int cpu);

void cpufreq_update_limits(unsigned int cpu);

void cpufreq_update_limits(unsigned int cpu);

bool have_governor_per_policy(void);

bool have_governor_per_policy(void);

CRA Git | Maintained and supported by SUSTech CRA and CCSE