[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4743907.FnUvY4AAjW@aspire.rjw.lan>
Date: Tue, 28 Mar 2017 00:20:13 +0200
From: "Rafael J. Wysocki" <rjw@...ysocki.net>
To: Linux PM <linux-pm@...r.kernel.org>
Cc: LKML <linux-kernel@...r.kernel.org>,
Srinivas Pandruvada <srinivas.pandruvada@...ux.intel.com>,
Doug Smythies <dsmythies@...us.net>
Subject: [PATCH 14/16] cpufreq: intel_pstate: Introduce pid_in_use()
From: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
Add a new function pid_in_use() to return the information on whether
or not the PID-based P-state selection algorithm is in use.
That allows a couple of complicated conditions in the code to be
reduced to simple checks against the new function's return value.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
---
drivers/cpufreq/intel_pstate.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
Index: linux-pm/drivers/cpufreq/intel_pstate.c
===================================================================
--- linux-pm.orig/drivers/cpufreq/intel_pstate.c
+++ linux-pm/drivers/cpufreq/intel_pstate.c
@@ -1893,6 +1893,8 @@ static const struct x86_cpu_id intel_pst
{}
};
+static bool pid_in_use(void);
+
static int intel_pstate_init_cpu(unsigned int cpunum)
{
struct cpudata *cpu;
@@ -1923,7 +1925,7 @@ static int intel_pstate_init_cpu(unsigne
intel_pstate_disable_ee(cpunum);
intel_pstate_hwp_enable(cpu);
- } else if (pstate_funcs.update_util == intel_pstate_update_util_pid) {
+ } else if (pid_in_use()) {
intel_pstate_pid_reset(cpu);
}
@@ -2269,6 +2271,12 @@ static struct cpufreq_driver intel_cpufr
static struct cpufreq_driver *default_driver = &intel_pstate;
+static bool pid_in_use(void)
+{
+ return intel_pstate_driver == &intel_pstate &&
+ pstate_funcs.update_util == intel_pstate_update_util_pid;
+}
+
static void intel_pstate_driver_cleanup(void)
{
unsigned int cpu;
@@ -2303,8 +2311,7 @@ static int intel_pstate_register_driver(
global.min_perf_pct = min_perf_pct_min();
- if (intel_pstate_driver == &intel_pstate && !hwp_active &&
- pstate_funcs.update_util == intel_pstate_update_util_pid)
+ if (pid_in_use())
intel_pstate_debug_expose_params();
return 0;
@@ -2315,8 +2322,7 @@ static int intel_pstate_unregister_drive
if (hwp_active)
return -EBUSY;
- if (intel_pstate_driver == &intel_pstate &&
- pstate_funcs.update_util == intel_pstate_update_util_pid)
+ if (pid_in_use())
intel_pstate_debug_hide_params();
cpufreq_unregister_driver(intel_pstate_driver);
Powered by blists - more mailing lists