diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-28 10:33:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-28 10:33:06 -0500 |
| commit | 4e8f2fc1a55d543717efb70e170b09e773d0542b (patch) | |
| tree | 30df1d7fc9dfa24fe2916711a17656682c3f7ec9 /drivers/cpufreq/intel_pstate.c | |
| parent | 158f323b9868b59967ad96957c4ca388161be321 (diff) | |
| parent | 1b1bc42c1692e9b62756323c675a44cb1a1f9dbd (diff) | |
| download | op-kernel-dev-4e8f2fc1a55d543717efb70e170b09e773d0542b.zip op-kernel-dev-4e8f2fc1a55d543717efb70e170b09e773d0542b.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two trivial overlapping changes conflicts in MPLS and mlx5.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/cpufreq/intel_pstate.c')
| -rw-r--r-- | drivers/cpufreq/intel_pstate.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index f91c257..a54d65a 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -2005,7 +2005,8 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy) limits = &performance_limits; perf_limits = limits; } - if (policy->max >= policy->cpuinfo.max_freq) { + if (policy->max >= policy->cpuinfo.max_freq && + !limits->no_turbo) { pr_debug("set performance\n"); intel_pstate_set_performance_limits(perf_limits); goto out; @@ -2047,6 +2048,17 @@ static int intel_pstate_verify_policy(struct cpufreq_policy *policy) policy->policy != CPUFREQ_POLICY_PERFORMANCE) return -EINVAL; + /* When per-CPU limits are used, sysfs limits are not used */ + if (!per_cpu_limits) { + unsigned int max_freq, min_freq; + + max_freq = policy->cpuinfo.max_freq * + limits->max_sysfs_pct / 100; + min_freq = policy->cpuinfo.max_freq * + limits->min_sysfs_pct / 100; + cpufreq_verify_within_limits(policy, min_freq, max_freq); + } + return 0; } |
