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

Commit 23d32899 authored by Srivatsa S. Bhat's avatar Srivatsa S. Bhat Committed by Rafael J. Wysocki
Browse files

cpufreq: Fix misplaced call to cpufreq_update_policy() 



The call to cpufreq_update_policy() is placed in the CPU hotplug callback
of cpufreq_stats, which has a higher priority than the CPU hotplug callback
of cpufreq-core. As a result, during CPU_ONLINE/CPU_ONLINE_FROZEN, we end up
calling cpufreq_update_policy() *before* calling cpufreq_add_dev() !
And for uninitialized CPUs, it just returns silently, not doing anything.

To add to that, cpufreq_stats is not even the right place to call
cpufreq_update_policy() to begin with. The cpufreq core ought to handle
this in its own callback, from an elegance/relevance perspective.

So move the invocation of cpufreq_update_policy() to cpufreq_cpu_callback,
and place it *after* cpufreq_add_dev().

Signed-off-by: default avatarSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent c095ba72

drivers/cpufreq/cpufreq.c

+1 −0
Original line number Diff line number Diff line
@@ -1945,6 +1945,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb, 
		case CPU_ONLINE:

		case CPU_ONLINE_FROZEN:

			cpufreq_add_dev(dev, NULL);

			cpufreq_update_policy(cpu);

			break;

		case CPU_DOWN_PREPARE:

		case CPU_DOWN_PREPARE_FROZEN:

drivers/cpufreq/cpufreq_stats.c

+0 −6
Original line number Diff line number Diff line
@@ -348,10 +348,6 @@ static int cpufreq_stat_cpu_callback(struct notifier_block *nfb, 
	unsigned int cpu = (unsigned long)hcpu;



	switch (action) {

	case CPU_ONLINE:

	case CPU_ONLINE_FROZEN:

		cpufreq_update_policy(cpu);

		break;

	case CPU_DOWN_PREPARE:

	case CPU_DOWN_PREPARE_FROZEN:

		cpufreq_stats_free_sysfs(cpu);
@@ -390,8 +386,6 @@ static int __init cpufreq_stats_init(void) 
		return ret;



	register_hotcpu_notifier(&cpufreq_stat_cpu_notifier);

	for_each_online_cpu(cpu)

		cpufreq_update_policy(cpu);



	ret = cpufreq_register_notifier(&notifier_trans_block,

				CPUFREQ_TRANSITION_NOTIFIER);