| Message ID | 1457249646-23072-4-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: > The cpu_load algorithm doesn't need to invoke > intel_pstate_calc_busy(), > so move that call from intel_pstate_sample() to > get_target_pstate_use_performance(). > > Signed-off-by: Philippe Longepe <philippe.longepe@linux.intel.com> Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > --- > drivers/cpufreq/intel_pstate.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/cpufreq/intel_pstate.c > b/drivers/cpufreq/intel_pstate.c > index c46d23a..903341f 100644 > --- a/drivers/cpufreq/intel_pstate.c > +++ b/drivers/cpufreq/intel_pstate.c > @@ -912,8 +912,6 @@ static inline void intel_pstate_sample(struct > cpudata *cpu, u64 time) > cpu->sample.mperf -= cpu->prev_mperf; > cpu->sample.tsc -= cpu->prev_tsc; > > - intel_pstate_calc_busy(cpu); > - > cpu->prev_aperf = aperf; > cpu->prev_mperf = mperf; > cpu->prev_tsc = tsc; > @@ -942,7 +940,6 @@ static inline int32_t > get_target_pstate_use_cpu_load(struct cpudata *cpu) > mperf = cpu->sample.mperf + delta_iowait_mperf; > cpu->prev_cummulative_iowait = cummulative_iowait; > > - > /* > * The load can be estimated as the ratio of the mperf > counter > * running at a constant frequency during active periods > @@ -960,6 +957,8 @@ static inline int32_t > get_target_pstate_use_performance(struct cpudata *cpu) > int32_t core_busy, max_pstate, current_pstate, sample_ratio; > u64 duration_ns; > > + intel_pstate_calc_busy(cpu); > + > /* > * core_busy is the ratio of actual performance to max > * max_pstate is the max non turbo pstate available -- 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 c46d23a..903341f 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -912,8 +912,6 @@ static inline void intel_pstate_sample(struct cpudata *cpu, u64 time) cpu->sample.mperf -= cpu->prev_mperf; cpu->sample.tsc -= cpu->prev_tsc; - intel_pstate_calc_busy(cpu); - cpu->prev_aperf = aperf; cpu->prev_mperf = mperf; cpu->prev_tsc = tsc; @@ -942,7 +940,6 @@ static inline int32_t get_target_pstate_use_cpu_load(struct cpudata *cpu) mperf = cpu->sample.mperf + delta_iowait_mperf; cpu->prev_cummulative_iowait = cummulative_iowait; - /* * The load can be estimated as the ratio of the mperf counter * running at a constant frequency during active periods @@ -960,6 +957,8 @@ static inline int32_t get_target_pstate_use_performance(struct cpudata *cpu) int32_t core_busy, max_pstate, current_pstate, sample_ratio; u64 duration_ns; + intel_pstate_calc_busy(cpu); + /* * core_busy is the ratio of actual performance to max * max_pstate is the max non turbo pstate available
The cpu_load algorithm doesn't need to invoke intel_pstate_calc_busy(), so move that call from intel_pstate_sample() to get_target_pstate_use_performance(). Signed-off-by: Philippe Longepe <philippe.longepe@linux.intel.com> --- drivers/cpufreq/intel_pstate.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)