From patchwork Sat Dec 5 00:08:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: srinivas pandruvada X-Patchwork-Id: 7773451 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9FBB9BEEE5 for ; Sat, 5 Dec 2015 00:09:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BA33F20489 for ; Sat, 5 Dec 2015 00:09:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F9A9205D8 for ; Sat, 5 Dec 2015 00:09:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752876AbbLEAJv (ORCPT ); Fri, 4 Dec 2015 19:09:51 -0500 Received: from mga11.intel.com ([192.55.52.93]:41632 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752413AbbLEAJs (ORCPT ); Fri, 4 Dec 2015 19:09:48 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP; 04 Dec 2015 16:09:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,382,1444719600"; d="scan'208";a="834636128" Received: from spandruv-desk3.jf.intel.com ([10.7.199.153]) by orsmga001.jf.intel.com with ESMTP; 04 Dec 2015 16:09:47 -0800 From: Srinivas Pandruvada To: rjw@rjwysocki.net, len.brown@intel.com, viresh.kumar@linaro.org Cc: linux-pm@vger.kernel.org, Srinivas Pandruvada Subject: [PATCH 1/4] cpufreq: Add configurable generic policies Date: Fri, 4 Dec 2015 16:08:35 -0800 Message-Id: <1449274118-15575-2-git-send-email-srinivas.pandruvada@linux.intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1449274118-15575-1-git-send-email-srinivas.pandruvada@linux.intel.com> References: <1449274118-15575-1-git-send-email-srinivas.pandruvada@linux.intel.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP For drivers using cpufreq_driver->setpolicy callback, by default two policies are available (performance and powersave). The client drivers can't change them, even if there is no support for a policy. This change adds a new callback get_available_policies() which provides, a mask of supported policies. If there is no callback then only two polices are supported "performance powersave" matching current implementation. Signed-off-by: Srinivas Pandruvada --- drivers/cpufreq/cpufreq.c | 14 +++++++++++++- include/linux/cpufreq.h | 3 +++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 8412ce5..6fc6e39d 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -688,7 +688,10 @@ static ssize_t show_scaling_available_governors(struct cpufreq_policy *policy, struct cpufreq_governor *t; if (!has_target()) { - i += sprintf(buf, "performance powersave"); + if (policy->available_policies & CPUFREQ_POLICY_PERFORMANCE) + i += sprintf(buf, "performance "); + if (policy->available_policies & CPUFREQ_POLICY_POWERSAVE) + i += sprintf(&buf[i], "powersave "); goto out; } @@ -963,9 +966,18 @@ static int cpufreq_init_policy(struct cpufreq_policy *policy) { struct cpufreq_governor *gov = NULL; struct cpufreq_policy new_policy; + u8 mask; memcpy(&new_policy, policy, sizeof(*policy)); + if (cpufreq_driver->get_available_policies) { + if (!cpufreq_driver->get_available_policies(&mask)) + policy->available_policies = mask; + } + if (!policy->available_policies) + policy->available_policies = CPUFREQ_POLICY_PERFORMANCE | + CPUFREQ_POLICY_POWERSAVE; + /* Update governor of new_policy to the governor used before hotplug */ gov = find_governor(policy->last_governor); if (gov) diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 177c768..8259c3c 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -76,6 +76,7 @@ struct cpufreq_policy { unsigned int restore_freq; /* = policy->cur before transition */ unsigned int suspend_freq; /* freq to set during suspend */ + u8 available_policies; unsigned int policy; /* see above */ unsigned int last_policy; /* policy before unplug */ struct cpufreq_governor *governor; /* see below */ @@ -229,6 +230,8 @@ struct cpufreq_driver { int (*init)(struct cpufreq_policy *policy); int (*verify)(struct cpufreq_policy *policy); + /* Get available generic policies */ + int (*get_available_policies)(u8 *mask); /* define one out of two */ int (*setpolicy)(struct cpufreq_policy *policy);