From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Len Brown <lenb@kernel.org>
Cc: x86@kernel.org, srinivas.pandruvada@linux.intel.com,
hpa@linux.intel.com, peterz@infradead.org, rafael@kernel.org,
linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
Len Brown <len.brown@intel.com>
Subject: Re: [PATCH 3/5] intel_pstate: remove intel_pstate.get()
Date: Sat, 17 Jun 2017 01:53:32 +0200 [thread overview]
Message-ID: <1968308.WZqDeDH7Bi@aspire.rjw.lan> (raw)
In-Reply-To: <2e0f8c13884240d7189087d19bb8274573638aaf.1496889051.git.len.brown@intel.com>
On Wednesday, June 07, 2017 07:39:14 PM Len Brown wrote:
> From: Len Brown <len.brown@intel.com>
>
> The x86 cpufreq core now uses aperfmperf_khz_on_cpu()
> to supply /sys/.../cpufreq/scaling_cur_freq
> on all x86 systems supporting APERF/MPERF.
>
> That includes 100% of systems supported by intel_pstate,
> and so intel_pstate.get() is now a NOP -- remove it.
>
> Invoke aperfmperf_khz_on_cpu() directly,
> if legacy-mode p-state tracing is enabled.
>
> Signed-off-by: Len Brown <len.brown@intel.com>
> ---
> drivers/cpufreq/intel_pstate.c | 16 +---------------
> 1 file changed, 1 insertion(+), 15 deletions(-)
>
> diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
> index b7de5bd..5d67780 100644
> --- a/drivers/cpufreq/intel_pstate.c
> +++ b/drivers/cpufreq/intel_pstate.c
> @@ -1597,12 +1597,6 @@ static inline bool intel_pstate_sample(struct cpudata *cpu, u64 time)
> return false;
> }
>
> -static inline int32_t get_avg_frequency(struct cpudata *cpu)
> -{
> - return mul_ext_fp(cpu->sample.core_avg_perf,
> - cpu->pstate.max_pstate_physical * cpu->pstate.scaling);
> -}
> -
> static inline int32_t get_avg_pstate(struct cpudata *cpu)
> {
> return mul_ext_fp(cpu->pstate.max_pstate_physical,
> @@ -1728,7 +1722,7 @@ static void intel_pstate_adjust_pstate(struct cpudata *cpu, int target_pstate)
> sample->mperf,
> sample->aperf,
> sample->tsc,
> - get_avg_frequency(cpu),
> + aperfmperf_khz_on_cpu(cpu->cpu),
> fp_toint(cpu->iowait_boost * 100));
> }
>
> @@ -1922,13 +1916,6 @@ static int intel_pstate_init_cpu(unsigned int cpunum)
> return 0;
> }
>
> -static unsigned int intel_pstate_get(unsigned int cpu_num)
> -{
> - struct cpudata *cpu = all_cpu_data[cpu_num];
> -
> - return cpu ? get_avg_frequency(cpu) : 0;
> -}
> -
> static void intel_pstate_set_update_util_hook(unsigned int cpu_num)
> {
> struct cpudata *cpu = all_cpu_data[cpu_num];
> @@ -2157,7 +2144,6 @@ static struct cpufreq_driver intel_pstate = {
> .setpolicy = intel_pstate_set_policy,
> .suspend = intel_pstate_hwp_save_state,
> .resume = intel_pstate_resume,
> - .get = intel_pstate_get,
> .init = intel_pstate_cpu_init,
> .exit = intel_pstate_cpu_exit,
> .stop_cpu = intel_pstate_stop_cpu,
>
This change will cause cpufreq_quick_get() to work differently and it is
called by KVM among other things. Will that still work?
Thanks,
Rafael
next prev parent reply other threads:[~2017-06-17 0:00 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-08 2:39 [PATCH 0/5] x86, cpufreq: consolidate APERF/MPERF calculation Len Brown
2017-06-08 2:39 ` [PATCH 1/5] x86: do not use cpufreq_quick_get() for /proc/cpuinfo "cpu MHz" Len Brown
2017-06-08 2:39 ` [PATCH 2/5] x86: use common aperfmperf_khz_on_cpu() to calculate KHz using APERF/MPERF Len Brown
2017-06-17 0:30 ` Rafael J. Wysocki
2017-06-17 1:49 ` Len Brown
2017-06-19 12:28 ` Rafael J. Wysocki
2017-06-19 14:18 ` Rafael J. Wysocki
2017-06-08 2:39 ` [PATCH 3/5] intel_pstate: remove intel_pstate.get() Len Brown
2017-06-16 23:53 ` Rafael J. Wysocki [this message]
2017-06-17 0:35 ` Len Brown
2017-06-17 0:37 ` Rafael J. Wysocki
2017-06-17 1:10 ` Len Brown
2017-06-17 1:21 ` Rafael J. Wysocki
2017-06-17 1:40 ` Rafael J. Wysocki
2017-06-17 2:06 ` Len Brown
2017-06-17 0:22 ` Rafael J. Wysocki
2017-06-08 2:39 ` [PATCH 4/5] intel_pstate: skip scheduler hook when in "performance" mode Len Brown
2017-06-17 0:04 ` Rafael J. Wysocki
2017-06-17 0:52 ` Len Brown
2017-06-17 1:06 ` Rafael J. Wysocki
2017-06-17 1:31 ` Len Brown
2017-06-17 1:35 ` Len Brown
2017-06-08 2:39 ` [PATCH 5/5] intel_pstate: delete scheduler hook in HWP mode Len Brown
2017-06-17 0:09 ` Rafael J. Wysocki
2017-06-17 1:27 ` Len Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1968308.WZqDeDH7Bi@aspire.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=hpa@linux.intel.com \
--cc=len.brown@intel.com \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=rafael@kernel.org \
--cc=srinivas.pandruvada@linux.intel.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®