nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

cpufreq: intel_pstate: Avoid calculation for max/min

Browse source 
When requested from cpufreq to set policy, look into _pss and get
control values, instead of using max/min perf calculations. These
calculation misses next control state in boundary conditions.

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Acked-by: Kristen Carlson Accardi <kristen@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Srinivas Pandruvada 2015-10-14 16:12:03 -07:00 committed by Rafael J. Wysocki
parent 053f56def5
commit 4ef4514870
1 changed files with 45 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

50
drivers/cpufreq/intel_pstate.c
View file

@ -163,6 +163,8 @@ struct perf_limits {
int max_sysfs_pct; int max_sysfs_pct;
int min_policy_pct; int min_policy_pct;
int min_sysfs_pct; int min_sysfs_pct;
int max_perf_ctl;
int min_perf_ctl;
}; };
static struct perf_limits limits = { static struct perf_limits limits = {
@ -176,6 +178,8 @@ static struct perf_limits limits = {
.max_sysfs_pct = 100, .max_sysfs_pct = 100,
.min_policy_pct = 0, .min_policy_pct = 0,
.min_sysfs_pct = 0, .min_sysfs_pct = 0,
.max_perf_ctl = 0,
.min_perf_ctl = 0,
}; };
#if IS_ENABLED(CONFIG_ACPI) #if IS_ENABLED(CONFIG_ACPI)
@ -909,12 +913,23 @@ static void intel_pstate_get_min_max(struct cpudata *cpu, int *min, int *max)
* policy, or by cpu specific default values determined through * policy, or by cpu specific default values determined through
* experimentation. * experimentation.
*/ */
max_perf_adj = fp_toint(mul_fp(int_tofp(max_perf), limits.max_perf)); if (limits.max_perf_ctl && limits.max_sysfs_pct >=
*max = clamp_t(int, max_perf_adj, limits.max_policy_pct) {
cpu->pstate.min_pstate, cpu->pstate.turbo_pstate); *max = limits.max_perf_ctl;
} else {
max_perf_adj = fp_toint(mul_fp(int_tofp(max_perf),
limits.max_perf));
*max = clamp_t(int, max_perf_adj, cpu->pstate.min_pstate,
cpu->pstate.turbo_pstate);
}
min_perf = fp_toint(mul_fp(int_tofp(max_perf), limits.min_perf)); if (limits.min_perf_ctl) {
*min = clamp_t(int, min_perf, cpu->pstate.min_pstate, max_perf); *min = limits.min_perf_ctl;
} else {
min_perf = fp_toint(mul_fp(int_tofp(max_perf),
limits.min_perf));
*min = clamp_t(int, min_perf, cpu->pstate.min_pstate, max_perf);
}
} }
static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate, bool force) static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate, bool force)
@ -1184,6 +1199,12 @@ static unsigned int intel_pstate_get(unsigned int cpu_num)
static int intel_pstate_set_policy(struct cpufreq_policy *policy) static int intel_pstate_set_policy(struct cpufreq_policy *policy)
{ {
#if IS_ENABLED(CONFIG_ACPI)
struct cpudata *cpu;
int i;
#endif
pr_debug("intel_pstate: %s max %u policy->max %u\n", __func__,
policy->cpuinfo.max_freq, policy->max);
if (!policy->cpuinfo.max_freq) if (!policy->cpuinfo.max_freq)
return -ENODEV; return -ENODEV;
@ -1196,6 +1217,8 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy)
limits.max_perf_pct = 100; limits.max_perf_pct = 100;
limits.max_perf = int_tofp(1); limits.max_perf = int_tofp(1);
limits.no_turbo = 0; limits.no_turbo = 0;
limits.max_perf_ctl = 0;
limits.min_perf_ctl = 0;
return 0; return 0;
} }
@ -1216,6 +1239,23 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy)
limits.min_perf = div_fp(int_tofp(limits.min_perf_pct), int_tofp(100)); limits.min_perf = div_fp(int_tofp(limits.min_perf_pct), int_tofp(100));
limits.max_perf = div_fp(int_tofp(limits.max_perf_pct), int_tofp(100)); limits.max_perf = div_fp(int_tofp(limits.max_perf_pct), int_tofp(100));
#if IS_ENABLED(CONFIG_ACPI)
cpu = all_cpu_data[policy->cpu];
for (i = 0; i < cpu->acpi_perf_data.state_count; i++) {
int control;
control = convert_to_native_pstate_format(cpu, i);
if (control * cpu->pstate.scaling == policy->max)
limits.max_perf_ctl = control;
if (control * cpu->pstate.scaling == policy->min)
limits.min_perf_ctl = control;
}
pr_debug("intel_pstate: max %u policy_max %u perf_ctl [0x%x-0x%x]\n",
policy->cpuinfo.max_freq, policy->max, limits.min_perf_ctl,
limits.max_perf_ctl);
#endif
if (hwp_active) if (hwp_active)
intel_pstate_hwp_set(); intel_pstate_hwp_set();