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

Commit 3bbf8fe3 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

cpufreq: Always update current frequency before startig governor 



Make policy->cur match the current frequency returned by the driver's
->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->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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 999f5729

drivers/cpufreq/cpufreq.c

+3 −11
Original line number Diff line number Diff line
@@ -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);

}