From patchwork Mon Feb 17 09:25:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 24750 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f200.google.com (mail-ob0-f200.google.com [209.85.214.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 95FF6202B2 for ; Mon, 17 Feb 2014 09:25:52 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id wo20sf57977019obc.11 for ; Mon, 17 Feb 2014 01:25:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=hEpKfh04YRE/v2O6PfQ2aftHg6kWkO/AV0XJr0vtkhE=; b=VC8CoHz+c5XFy606wqXQMhA5oegms/n2ngWbITEaNxdBWNMI1PCh/Ez5opZdEljajM VG8gcl1pDwtqVSkHJwziYT9aFM3KR1nEQfK00fVyqpV7xib39ZmqBozL3kpIAXAqljcv RAmTMVMvB3qw/f+iv57m7pdfyuFF2BsSu6ymL5GTINPNHVMJZ+nx+xDSmGa2enBP480f fKGgErO2kvAaMFcuoZjH8pFH21i9kW2jFFPlfBGWQzxRbRto3t65eqh9Q0XSN4/XxPNk 74AUjc6GcVcXNlnR7xUWxSAws6J6Ec9pf0s3dIjb2iEQlkhPh29/802SrHpc5Elxux77 FA7g== X-Gm-Message-State: ALoCoQncKxPSArrCYKG5x69iwUqINtd1HR5uuEs7LDinfvhT8w/76L1cWpU1Y+CvVxJFsy7HQ0uV X-Received: by 10.182.116.39 with SMTP id jt7mr9541201obb.33.1392629151682; Mon, 17 Feb 2014 01:25:51 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.102.244 with SMTP id w107ls856950qge.26.gmail; Mon, 17 Feb 2014 01:25:51 -0800 (PST) X-Received: by 10.221.22.71 with SMTP id qv7mr660353vcb.34.1392629151552; Mon, 17 Feb 2014 01:25:51 -0800 (PST) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id h13si4336877vct.143.2014.02.17.01.25.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Feb 2014 01:25:51 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id id10so11687598vcb.27 for ; Mon, 17 Feb 2014 01:25:51 -0800 (PST) X-Received: by 10.220.139.198 with SMTP id f6mr16330vcu.47.1392629151458; Mon, 17 Feb 2014 01:25:51 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp123632vcz; Mon, 17 Feb 2014 01:25:50 -0800 (PST) X-Received: by 10.68.37.42 with SMTP id v10mr25170147pbj.127.1392629150391; Mon, 17 Feb 2014 01:25:50 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r3si14122215pbh.280.2014.02.17.01.25.49; Mon, 17 Feb 2014 01:25:49 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752355AbaBQJZg (ORCPT + 27 others); Mon, 17 Feb 2014 04:25:36 -0500 Received: from mail-we0-f171.google.com ([74.125.82.171]:33764 "EHLO mail-we0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751829AbaBQJZa (ORCPT ); Mon, 17 Feb 2014 04:25:30 -0500 Received: by mail-we0-f171.google.com with SMTP id u56so10531342wes.30 for ; Mon, 17 Feb 2014 01:25:28 -0800 (PST) X-Received: by 10.180.189.10 with SMTP id ge10mr11954002wic.47.1392629128909; Mon, 17 Feb 2014 01:25:28 -0800 (PST) Received: from localhost ([213.122.173.131]) by mx.google.com with ESMTPSA id ha1sm35231869wjc.23.2014.02.17.01.25.24 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 17 Feb 2014 01:25:27 -0800 (PST) From: Viresh Kumar To: rjw@rjwysocki.net Cc: linaro-kernel@lists.linaro.org, cpufreq@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, nm@ti.com, swarren@wwwdotorg.org, kgene.kim@samsung.com, jinchoi@broadcom.com, tianyu.lan@intel.com, sebastian.capella@linaro.org, jhbird.choi@samsung.com, Viresh Kumar Subject: [PATCH V6 1/7] cpufreq: suspend governors on system suspend/hibernate Date: Mon, 17 Feb 2014 14:55:07 +0530 Message-Id: <25e47f456d94292786a5fec6d5e646e630ecfa94.1392629003.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 1.7.12.rc2.18.g61b472e In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: viresh.kumar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch adds cpufreq suspend/resume calls to dpm_{suspend|resume}_noirq() for handling suspend/resume of cpufreq governors. Lan Tianyu (Intel) & Jinhyuk Choi (Broadcom) found an issue where tunables configuration for clusters/sockets with non-boot CPUs was getting lost after suspend/resume, as we were notifying governors with CPUFREQ_GOV_POLICY_EXIT on removal of the last cpu for that policy and so deallocating memory for tunables. This is fixed by this patch as we don't allow any operation on governors after device suspend and before device resume now. Reported-and-tested-by: Lan Tianyu Reported-by: Jinhyuk Choi Signed-off-by: Viresh Kumar --- drivers/base/power/main.c | 3 +++ drivers/cpufreq/cpufreq.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++ include/linux/cpufreq.h | 8 ++++++ 3 files changed, 74 insertions(+) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index deb4e02..da49882 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -581,6 +582,7 @@ static void dpm_resume_noirq(pm_message_t state) dpm_show_time(starttime, state, "noirq"); resume_device_irqs(); cpuidle_resume(); + cpufreq_resume(); } /** @@ -1061,6 +1063,7 @@ static int dpm_suspend_noirq(pm_message_t state) ktime_t starttime = ktime_get(); int error = 0; + cpufreq_suspend(); cpuidle_pause(); suspend_device_irqs(); mutex_lock(&dpm_list_mtx); diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index cb003a6..4ca2297 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -47,6 +48,9 @@ static LIST_HEAD(cpufreq_policy_list); static DEFINE_PER_CPU(char[CPUFREQ_NAME_LEN], cpufreq_cpu_governor); #endif +/* Flag to suspend/resume CPUFreq governors */ +static bool cpufreq_suspended; + static inline bool has_target(void) { return cpufreq_driver->target_index || cpufreq_driver->target; @@ -1576,6 +1580,61 @@ static struct subsys_interface cpufreq_interface = { }; /** + * cpufreq_suspend() - Suspend CPUFreq governors + * + * Called during system wide Suspend/Hibernate cycles for suspending governors + * as some platforms can't change frequency after this point in suspend cycle. + * Because some of the devices (like: i2c, regulators, etc) they use for + * changing frequency are suspended quickly after this point. + */ +void cpufreq_suspend(void) +{ + struct cpufreq_policy *policy; + + if (!cpufreq_driver) + return; + + if (!has_target()) + return; + + pr_debug("%s: Suspending Governors\n", __func__); + + list_for_each_entry(policy, &cpufreq_policy_list, policy_list) + if (__cpufreq_governor(policy, CPUFREQ_GOV_STOP)) + pr_err("%s: Failed to stop governor for policy: %p\n", + __func__, policy); + + cpufreq_suspended = true; +} + +/** + * cpufreq_resume() - Resume CPUFreq governors + * + * Called during system wide Suspend/Hibernate cycle for resuming governors that + * are suspended with cpufreq_suspend(). + */ +void cpufreq_resume(void) +{ + struct cpufreq_policy *policy; + + if (!cpufreq_driver) + return; + + 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_governor(policy, CPUFREQ_GOV_START) + || __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS)) + pr_err("%s: Failed to start governor for policy: %p\n", + __func__, policy); +} + +/** * cpufreq_bp_suspend - Prepare the boot CPU for system suspend. * * This function is only executed for the boot processor. The other CPUs @@ -1868,6 +1927,10 @@ static int __cpufreq_governor(struct cpufreq_policy *policy, struct cpufreq_governor *gov = NULL; #endif + /* Don't start any governor operations if we are entering suspend */ + if (cpufreq_suspended) + return 0; + if (policy->governor->max_transition_latency && policy->cpuinfo.transition_latency > policy->governor->max_transition_latency) { diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 4d89e0e..94ed907 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -296,6 +296,14 @@ cpufreq_verify_within_cpu_limits(struct cpufreq_policy *policy) policy->cpuinfo.max_freq); } +#ifdef CONFIG_CPU_FREQ +void cpufreq_suspend(void); +void cpufreq_resume(void); +#else +static inline void cpufreq_suspend(void) {} +static inline void cpufreq_resume(void) {} +#endif + /********************************************************************* * CPUFREQ NOTIFIER INTERFACE * *********************************************************************/