cpufreq: update 'cpufreq_suspended' after stopping governors
authorViresh Kumar <viresh.kumar@linaro.org>
Tue, 30 Sep 2014 04:03:17 +0000 (09:33 +0530)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 30 Sep 2014 19:02:34 +0000 (21:02 +0200)
Commit 8e30444e1530 ("cpufreq: fix cpufreq suspend/resume for intel_pstate")
introduced a bug where the governors wouldn't be stopped anymore for
->target{_index}() drivers during suspend. This happens because
'cpufreq_suspended' is updated before stopping the governors during suspend
and due to this __cpufreq_governor() would return early due to this check:

/* Don't start any governor operations if we are entering suspend */
if (cpufreq_suspended)
return 0;

Fixes: 8e30444e1530 ("cpufreq: fix cpufreq suspend/resume for intel_pstate")
Cc: 3.15+ <stable@vger.kernel.org> # 3.15+: 8e30444e1530 "cpufreq: fix cpufreq suspend/resume for intel_pstate"
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/cpufreq/cpufreq.c

index 6e93e7f..61190f6 100644 (file)
@@ -1658,10 +1658,8 @@ void cpufreq_suspend(void)
        if (!cpufreq_driver)
                return;
 
-       cpufreq_suspended = true;
-
        if (!has_target())
-               return;
+               goto suspend;
 
        pr_debug("%s: Suspending Governors\n", __func__);
 
@@ -1674,6 +1672,9 @@ void cpufreq_suspend(void)
                        pr_err("%s: Failed to suspend driver: %p\n", __func__,
                                policy);
        }
+
+suspend:
+       cpufreq_suspended = true;
 }
 
 /**