cpufreq: governor: Check transition latecy at init time only

It is not necessary to check the governor's max_transition_latency
attribute every time cpufreq_governor() runs, so check it only if
the event argument is CPUFREQ_GOV_POLICY_INIT.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
This commit is contained in:
Rafael J. Wysocki 2016-05-14 01:00:28 +02:00
parent d6ff44d647
commit 9e8c0a899b

View File

@ -2011,23 +2011,24 @@ static int cpufreq_governor(struct cpufreq_policy *policy, unsigned int event)
if (!policy->governor) if (!policy->governor)
return -EINVAL; return -EINVAL;
if (policy->governor->max_transition_latency && if (event == CPUFREQ_GOV_POLICY_INIT) {
policy->cpuinfo.transition_latency > if (policy->governor->max_transition_latency &&
policy->governor->max_transition_latency) { policy->cpuinfo.transition_latency >
struct cpufreq_governor *gov = cpufreq_fallback_governor(); policy->governor->max_transition_latency) {
struct cpufreq_governor *gov = cpufreq_fallback_governor();
if (gov) { if (gov) {
pr_warn("%s governor failed, too long transition latency of HW, fallback to %s governor\n", pr_warn("%s governor failed, too long transition latency of HW, fallback to %s governor\n",
policy->governor->name, gov->name); policy->governor->name, gov->name);
policy->governor = gov; policy->governor = gov;
} else { } else {
return -EINVAL; return -EINVAL;
}
} }
}
if (event == CPUFREQ_GOV_POLICY_INIT)
if (!try_module_get(policy->governor->owner)) if (!try_module_get(policy->governor->owner))
return -EINVAL; return -EINVAL;
}
pr_debug("%s: for CPU %u, event %u\n", __func__, policy->cpu, event); pr_debug("%s: for CPU %u, event %u\n", __func__, policy->cpu, event);