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

Merge branches 'intel_pstate-fix' and 'cpufreq-x86-fix' 

* intel_pstate-fix:
  cpufreq: intel_pstate: report correct CPU frequencies during trace

* cpufreq-x86-fix:
  cpufreq: x86: Disable interrupts during MSRs reading
This commit is contained in:
Rafael J. Wysocki 2017-08-17 21:00:30 +02:00
parent ef954844c7 c587c79f90 8e2f3bce05
commit 8179962b84
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/kernel/cpu/aperfmperf.c
View File

@ -40,13 +40,16 @@ static void aperfmperf_snapshot_khz(void *dummy)
struct aperfmperf_sample *s = this_cpu_ptr(&samples); struct aperfmperf_sample *s = this_cpu_ptr(&samples);
ktime_t now = ktime_get(); ktime_t now = ktime_get();
s64 time_delta = ktime_ms_delta(now, s->time); s64 time_delta = ktime_ms_delta(now, s->time);
unsigned long flags;
/* Don't bother re-computing within the cache threshold time. */ /* Don't bother re-computing within the cache threshold time. */
if (time_delta < APERFMPERF_CACHE_THRESHOLD_MS) if (time_delta < APERFMPERF_CACHE_THRESHOLD_MS)
return; return;
local_irq_save(flags);
rdmsrl(MSR_IA32_APERF, aperf); rdmsrl(MSR_IA32_APERF, aperf);
rdmsrl(MSR_IA32_MPERF, mperf); rdmsrl(MSR_IA32_MPERF, mperf);
local_irq_restore(flags);
aperf_delta = aperf - s->aperf; aperf_delta = aperf - s->aperf;
mperf_delta = mperf - s->mperf; mperf_delta = mperf - s->mperf;

3
drivers/cpufreq/intel_pstate.c
View File

@ -1613,8 +1613,7 @@ static inline bool intel_pstate_sample(struct cpudata *cpu, u64 time)
static inline int32_t get_avg_frequency(struct cpudata *cpu) static inline int32_t get_avg_frequency(struct cpudata *cpu)
{ {
return mul_ext_fp(cpu->sample.core_avg_perf, return mul_ext_fp(cpu->sample.core_avg_perf, cpu_khz);
cpu->pstate.max_pstate_physical * cpu->pstate.scaling);
} }
static inline int32_t get_avg_pstate(struct cpudata *cpu) static inline int32_t get_avg_pstate(struct cpudata *cpu)