diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2024-02-28 12:18:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-02-28 12:18:31 -0800 |
| commit | 022d0c6e03171afef24a80f1dc8bb4edb7b64417 (patch) | |
| tree | c18c1711a044f1d2938ff997f5b2d582182c16ce | |
| parent | Merge tag 'spi-fix-v6.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi (diff) | |
| parent | cpufreq: intel_pstate: fix pstate limits enforcement for adjust_perf call back (diff) | |
| download | linux-rng-022d0c6e03171afef24a80f1dc8bb4edb7b64417.tar.xz linux-rng-022d0c6e03171afef24a80f1dc8bb4edb7b64417.zip | |
Merge tag 'pm-6.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fix from Rafael Wysocki:
"Fix a latent bug in the intel-pstate cpufreq driver that has been
exposed by the recent schedutil governor changes (Doug Smythies)"
* tag 'pm-6.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
cpufreq: intel_pstate: fix pstate limits enforcement for adjust_perf call back
| -rw-r--r-- | drivers/cpufreq/intel_pstate.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index ca94e60e705a..79619227ea51 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -2987,6 +2987,9 @@ static void intel_cpufreq_adjust_perf(unsigned int cpunum, if (min_pstate < cpu->min_perf_ratio) min_pstate = cpu->min_perf_ratio; + if (min_pstate > cpu->max_perf_ratio) + min_pstate = cpu->max_perf_ratio; + max_pstate = min(cap_pstate, cpu->max_perf_ratio); if (max_pstate < min_pstate) max_pstate = min_pstate; |