mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 10:31:46 +09:00
cpufreq: Limit resolving a frequency to policy min/max
[ Upstream commit d394abcb12bb1a6f309c1221fdb8e73594ecf1b4 ]
Resolving a frequency to an efficient one should not transgress
policy->max (which can be set for thermal reason) and policy->min.
Currently, there is possibility where scaling_cur_freq can exceed
scaling_max_freq when scaling_max_freq is an inefficient frequency.
Add a check to ensure that resolving a frequency will respect
policy->min/max.
Cc: All applicable <stable@vger.kernel.org>
Fixes: 1f39fa0dcc ("cpufreq: Introducing CPUFREQ_RELATION_E")
Signed-off-by: Shivnandan Kumar <quic_kshivnan@quicinc.com>
[ rjw: Whitespace adjustment, changelog edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
9477cfeb30
commit
56452891e2
@@ -1023,6 +1023,18 @@ static inline int cpufreq_table_find_index_c(struct cpufreq_policy *policy,
|
|||||||
efficiencies);
|
efficiencies);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline bool cpufreq_is_in_limits(struct cpufreq_policy *policy, int idx)
|
||||||
|
{
|
||||||
|
unsigned int freq;
|
||||||
|
|
||||||
|
if (idx < 0)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
freq = policy->freq_table[idx].frequency;
|
||||||
|
|
||||||
|
return freq == clamp_val(freq, policy->min, policy->max);
|
||||||
|
}
|
||||||
|
|
||||||
static inline int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
|
static inline int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
|
||||||
unsigned int target_freq,
|
unsigned int target_freq,
|
||||||
unsigned int relation)
|
unsigned int relation)
|
||||||
@@ -1056,7 +1068,8 @@ retry:
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (idx < 0 && efficiencies) {
|
/* Limit frequency index to honor policy->min/max */
|
||||||
|
if (!cpufreq_is_in_limits(policy, idx) && efficiencies) {
|
||||||
efficiencies = false;
|
efficiencies = false;
|
||||||
goto retry;
|
goto retry;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user