From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754585AbcDGB0w (ORCPT ); Wed, 6 Apr 2016 21:26:52 -0400 Received: from cloudserver094114.home.net.pl ([79.96.170.134]:52721 "HELO cloudserver094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751649AbcDGB0u (ORCPT ); Wed, 6 Apr 2016 21:26:50 -0400 From: "Rafael J. Wysocki" To: Linux PM list Cc: Linux Kernel Mailing List , Viresh Kumar , Srinivas Pandruvada Subject: [PATCH] cpufreq: Skip all governor-related actions for cpufreq_suspended set Date: Thu, 07 Apr 2016 03:29:14 +0200 Message-ID: <2044559.GVlD7a2JcO@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/4.5.0-rc1+; KDE/4.11.5; x86_64; ; ) 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 From: Rafael J. Wysocki Since governor operations are generally skipped if cpufreq_suspended is set, do nothing at all in cpufreq_start_governor() and cpufreq_exit_governor() in that case. In particular, this prevents fast frequency switching from being disabled after a suspend-to-RAM cycle on all CPUs except for the boot one. Fixes: b7898fda5bc7 (cpufreq: Support for fast frequency switching) Signed-off-by: Rafael J. Wysocki --- drivers/cpufreq/cpufreq.c | 6 ++++++ 1 file changed, 6 insertions(+) Index: linux-pm/drivers/cpufreq/cpufreq.c =================================================================== --- linux-pm.orig/drivers/cpufreq/cpufreq.c +++ linux-pm/drivers/cpufreq/cpufreq.c @@ -2053,6 +2053,9 @@ static int cpufreq_start_governor(struct { int ret; + if (cpufreq_suspended) + return 0; + if (cpufreq_driver->get && !cpufreq_driver->setpolicy) cpufreq_update_current_freq(policy); @@ -2062,6 +2065,9 @@ static int cpufreq_start_governor(struct static int cpufreq_exit_governor(struct cpufreq_policy *policy) { + if (cpufreq_suspended) + return 0; + cpufreq_disable_fast_switch(policy); return cpufreq_governor(policy, CPUFREQ_GOV_POLICY_EXIT); }