cpufreq: Always update current frequency before startig governor

rafaeljw · rafaeljw · commit 3bbf8fe3ae08 · 2016-03-22T23:13:36.000+01:00
Make policy-&gt;cur match the current frequency returned by the driver's
-&gt;get() callback before starting the governor in case they went out of
sync in the meantime and drop the piece of code attempting to
resync policy-&gt;cur with the real frequency of the boot CPU from
cpufreq_resume() as it serves no purpose any more (and it's racy and
super-ugly anyway).

Signed-off-by: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;
Acked-by: Viresh Kumar &lt;viresh.kumar@linaro.org&gt;
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
@@ -1612,17 +1612,6 @@ void cpufreq_resume(void)
 				       __func__, policy);
 		}
 	}
-
-	/*
-	 * schedule call cpufreq_update_policy() for first-online CPU, as that
-	 * wouldn't be hotplugged-out on suspend. It will verify that the
-	 * current freq is in sync with what we believe it to be.
-	 */
-	policy = cpufreq_cpu_get_raw(cpumask_first(cpu_online_mask));
-	if (WARN_ON(!policy))
-		return;
-
-	schedule_work(&policy->update);
 }
 
 /**
@@ -1950,6 +1939,9 @@ static int cpufreq_start_governor(struct cpufreq_policy *policy)
 {
 	int ret;
 
+	if (cpufreq_driver->get && !cpufreq_driver->setpolicy)
+		cpufreq_update_current_freq(policy);
+
 	ret = cpufreq_governor(policy, CPUFREQ_GOV_START);
 	return ret ? ret : cpufreq_governor(policy, CPUFREQ_GOV_LIMITS);
 }

Original file line number	Diff line number	Diff line change
`@@ -1612,17 +1612,6 @@ void cpufreq_resume(void)`
`1612`	`1612`	`__func__, policy);`
`1613`	`1613`	`}`
`1614`	`1614`	`}`
`1615`		`-`
`1616`		`- /*`
`1617`		`- * schedule call cpufreq_update_policy() for first-online CPU, as that`
`1618`		`- * wouldn't be hotplugged-out on suspend. It will verify that the`
`1619`		`- * current freq is in sync with what we believe it to be.`
`1620`		`- */`
`1621`		`- policy = cpufreq_cpu_get_raw(cpumask_first(cpu_online_mask));`
`1622`		`- if (WARN_ON(!policy))`
`1623`		`- return;`
`1624`		`-`
`1625`		`- schedule_work(&policy->update);`
`1626`	`1615`	`}`
`1627`	`1616`
`1628`	`1617`	`/**`
`@@ -1950,6 +1939,9 @@ static int cpufreq_start_governor(struct cpufreq_policy *policy)`
`1950`	`1939`	`{`
`1951`	`1940`	`int ret;`
`1952`	`1941`
	`1942`	`+ if (cpufreq_driver->get && !cpufreq_driver->setpolicy)`
	`1943`	`+ cpufreq_update_current_freq(policy);`
	`1944`	`+`
`1953`	`1945`	`ret = cpufreq_governor(policy, CPUFREQ_GOV_START);`
`1954`	`1946`	`return ret ? ret : cpufreq_governor(policy, CPUFREQ_GOV_LIMITS);`
`1955`	`1947`	`}`