From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754189AbaIVNr7 (ORCPT ); Mon, 22 Sep 2014 09:47:59 -0400 Received: from v094114.home.net.pl ([79.96.170.134]:57167 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753528AbaIVNr4 (ORCPT ); Mon, 22 Sep 2014 09:47:56 -0400 From: "Rafael J. Wysocki" To: Lan Tianyu , viresh.kumar@linaro.org, "'Dirk Brandewie'" Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, "'Dirk Brandewie'" Subject: Re: [PATCH 1/1] Cpufreq: Keep cpufreq sysfs nodes across S2RAM/S2DISK when using intel_pstate driver. Date: Mon, 22 Sep 2014 16:07:42 +0200 Message-ID: <8879768.rKXiR3iWPo@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/3.16.0-rc5+; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1411023787-11458-1-git-send-email-tianyu.lan@intel.com> References: <1411023787-11458-1-git-send-email-tianyu.lan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thursday, September 18, 2014 03:03:07 PM Lan Tianyu wrote: > 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. > > Signed-off-by: Lan Tianyu Viresh, Dirk, this looks like a fix that should go into 3.17, so I'm queuing it up accordingly. Please let me know if that's not correct. > --- > drivers/cpufreq/cpufreq.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c > index d9fdedd..eb9bb78 100644 > --- a/drivers/cpufreq/cpufreq.c > +++ b/drivers/cpufreq/cpufreq.c > @@ -1656,6 +1656,8 @@ void cpufreq_suspend(void) > if (!cpufreq_driver) > return; > > + cpufreq_suspended = true; > + > if (!has_target()) > return; > > @@ -1670,8 +1672,6 @@ void cpufreq_suspend(void) > pr_err("%s: Failed to suspend driver: %p\n", __func__, > policy); > } > - > - cpufreq_suspended = true; > } > > /** > @@ -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__, > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.