Skip to content

Commit

Permalink
cpufreq: fix cpufreq suspend/resume for intel_pstate
Browse files Browse the repository at this point in the history
Cpufreq core introduces cpufreq_suspended flag to let cpufreq sysfs nodes
across S2RAM/S2DISK. But the flag is only set in the cpufreq_suspend()
for cpufreq drivers which have target or target_index callback. This
skips intel_pstate driver. This patch is to set the flag before checking
target or target_index callback.

Fixes: 2f0aea9 (cpufreq: suspend governors on system suspend/hibernate)
Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
Cc: 3.15+ <stable@vger.kernel.org> # 3.15+
[rjw: Subject]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Lan Tianyu authored and Rafael J. Wysocki committed Sep 22, 2014
1 parent 0f33be0 commit 8e30444
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/cpufreq/cpufreq.c
Original file line number Diff line number Diff line change
Expand Up @@ -1656,6 +1656,8 @@ void cpufreq_suspend(void)
if (!cpufreq_driver)
return;

cpufreq_suspended = true;

if (!has_target())
return;

Expand All @@ -1670,8 +1672,6 @@ void cpufreq_suspend(void)
pr_err("%s: Failed to suspend driver: %p\n", __func__,
policy);
}

cpufreq_suspended = true;
}

/**
Expand All @@ -1687,13 +1687,13 @@ void cpufreq_resume(void)
if (!cpufreq_driver)
return;

cpufreq_suspended = false;

if (!has_target())
return;

pr_debug("%s: Resuming Governors\n", __func__);

cpufreq_suspended = false;

list_for_each_entry(policy, &cpufreq_policy_list, policy_list) {
if (cpufreq_driver->resume && cpufreq_driver->resume(policy))
pr_err("%s: Failed to resume driver: %p\n", __func__,
Expand Down

0 comments on commit 8e30444

Please sign in to comment.