Skip to content

Commit

Permalink
cpufreq: intel_pstate: Introduce pid_in_use()
Browse files Browse the repository at this point in the history
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@intel.com>
  • Loading branch information
Rafael J. Wysocki committed Mar 28, 2017
1 parent 2f49afc commit 8ca6ce3
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions drivers/cpufreq/intel_pstate.c
Original file line number Diff line number Diff line change
Expand Up @@ -1893,6 +1893,8 @@ static const struct x86_cpu_id intel_pstate_cpu_ee_disable_ids[] = {
{}
};

static bool pid_in_use(void);

static int intel_pstate_init_cpu(unsigned int cpunum)
{
struct cpudata *cpu;
Expand Down Expand Up @@ -1923,7 +1925,7 @@ static int intel_pstate_init_cpu(unsigned int cpunum)
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);
}

Expand Down Expand Up @@ -2269,6 +2271,12 @@ static struct cpufreq_driver intel_cpufreq = {

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;
Expand Down Expand Up @@ -2303,8 +2311,7 @@ static int intel_pstate_register_driver(struct cpufreq_driver *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;
Expand All @@ -2315,8 +2322,7 @@ static int intel_pstate_unregister_driver(void)
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);
Expand Down

0 comments on commit 8ca6ce3

Please sign in to comment.