| Message ID | 1457249646-23072-5-git-send-email-philippe.longepe@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Rafael Wysocki |
| Headers | show |
On Sun, 2016-03-06 at 08:34 +0100, Philippe Longepe wrote: > Use a helper function to compute the average pstate and call it only > where it is needed (only when tracing or in intel_pstate_get). > > Signed-off-by: Philippe Longepe <philippe.longepe@linux.intel.com> Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > --- > drivers/cpufreq/intel_pstate.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/cpufreq/intel_pstate.c > b/drivers/cpufreq/intel_pstate.c > index 903341f..6e07366 100644 > --- a/drivers/cpufreq/intel_pstate.c > +++ b/drivers/cpufreq/intel_pstate.c > @@ -878,12 +878,6 @@ static inline void intel_pstate_calc_busy(struct > cpudata *cpu) > core_pct = int_tofp(sample->aperf) * int_tofp(100); > core_pct = div64_u64(core_pct, int_tofp(sample->mperf)); > > - sample->freq = fp_toint( > - mul_fp(int_tofp( > - cpu->pstate.max_pstate_physical * > - cpu->pstate.scaling / 100), > - core_pct)); > - > sample->core_pct_busy = (int32_t)core_pct; > } > > @@ -917,6 +911,12 @@ static inline void intel_pstate_sample(struct > cpudata *cpu, u64 time) > cpu->prev_tsc = tsc; > } > > +static inline int32_t get_avg_frequency(struct cpudata *cpu) > +{ > + return div64_u64(cpu->pstate.max_pstate_physical * cpu- > >sample.aperf * > + cpu->pstate.scaling, cpu->sample.mperf); > +} > + > static inline int32_t get_target_pstate_use_cpu_load(struct cpudata > *cpu) > { > struct sample *sample = &cpu->sample; > @@ -1012,7 +1012,7 @@ static inline void > intel_pstate_adjust_busy_pstate(struct cpudata *cpu) > sample->mperf, > sample->aperf, > sample->tsc, > - sample->freq); > + get_avg_frequency(cpu)); > } > > static void intel_pstate_update_util(struct update_util_data *data, > u64 time, > @@ -1101,7 +1101,7 @@ static unsigned int intel_pstate_get(unsigned > int cpu_num) > if (!cpu) > return 0; > sample = &cpu->sample; > - return sample->freq; > + return get_avg_frequency(cpu); > } > > static int intel_pstate_set_policy(struct cpufreq_policy *policy) -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 903341f..6e07366 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -878,12 +878,6 @@ static inline void intel_pstate_calc_busy(struct cpudata *cpu) core_pct = int_tofp(sample->aperf) * int_tofp(100); core_pct = div64_u64(core_pct, int_tofp(sample->mperf)); - sample->freq = fp_toint( - mul_fp(int_tofp( - cpu->pstate.max_pstate_physical * - cpu->pstate.scaling / 100), - core_pct)); - sample->core_pct_busy = (int32_t)core_pct; } @@ -917,6 +911,12 @@ static inline void intel_pstate_sample(struct cpudata *cpu, u64 time) cpu->prev_tsc = tsc; } +static inline int32_t get_avg_frequency(struct cpudata *cpu) +{ + return div64_u64(cpu->pstate.max_pstate_physical * cpu->sample.aperf * + cpu->pstate.scaling, cpu->sample.mperf); +} + static inline int32_t get_target_pstate_use_cpu_load(struct cpudata *cpu) { struct sample *sample = &cpu->sample; @@ -1012,7 +1012,7 @@ static inline void intel_pstate_adjust_busy_pstate(struct cpudata *cpu) sample->mperf, sample->aperf, sample->tsc, - sample->freq); + get_avg_frequency(cpu)); } static void intel_pstate_update_util(struct update_util_data *data, u64 time, @@ -1101,7 +1101,7 @@ static unsigned int intel_pstate_get(unsigned int cpu_num) if (!cpu) return 0; sample = &cpu->sample; - return sample->freq; + return get_avg_frequency(cpu); } static int intel_pstate_set_policy(struct cpufreq_policy *policy)
Use a helper function to compute the average pstate and call it only where it is needed (only when tracing or in intel_pstate_get). Signed-off-by: Philippe Longepe <philippe.longepe@linux.intel.com> --- drivers/cpufreq/intel_pstate.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)