openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'pm-cpufreq-fixes' 

* pm-cpufreq-fixes:
  cpufreq: Abort cpufreq_update_current_freq() for cpufreq_suspended set
  intel_pstate: Avoid getting stuck in high P-states when idle
This commit is contained in:
Rafael J. Wysocki 2016-04-21 20:57:46 +02:00
parent c3b46c7326 c9d9c929e6
commit 395da1259a
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/cpufreq/cpufreq.c
View File

@ -1491,6 +1491,9 @@ static unsigned int cpufreq_update_current_freq(struct cpufreq_policy *policy)
{ {
unsigned int new_freq; unsigned int new_freq;
if (cpufreq_suspended)
return 0;
new_freq = cpufreq_driver->get(policy->cpu); new_freq = cpufreq_driver->get(policy->cpu);
if (!new_freq) if (!new_freq)
return 0; return 0;

4
drivers/cpufreq/intel_pstate.c
View File

@ -1130,6 +1130,10 @@ static inline int32_t get_target_pstate_use_performance(struct cpudata *cpu)
sample_ratio = div_fp(int_tofp(pid_params.sample_rate_ns), sample_ratio = div_fp(int_tofp(pid_params.sample_rate_ns),
int_tofp(duration_ns)); int_tofp(duration_ns));
core_busy = mul_fp(core_busy, sample_ratio); core_busy = mul_fp(core_busy, sample_ratio);
} else {
sample_ratio = div_fp(100 * cpu->sample.mperf, cpu->sample.tsc);
if (sample_ratio < int_tofp(1))
core_busy = 0;
} }
cpu->sample.busy_scaled = core_busy; cpu->sample.busy_scaled = core_busy;