* [PATCH 5/5] drivers/cpufreq: Convert some slow-path static_cpu_has() callers to boot_cpu_has() [not found] <20190330112022.28888-1-bp@alien8.de> @ 2019-03-30 11:20 ` Borislav Petkov 2019-04-01 9:31 ` Rafael J. Wysocki 0 siblings, 1 reply; 5+ messages in thread From: Borislav Petkov @ 2019-03-30 11:20 UTC (permalink / raw) To: LKML Cc: Nadav Amit, Andy Lutomirski, Peter Zijlstra, Len Brown, linux-pm, Rafael J. Wysocki, Srinivas Pandruvada, Viresh Kumar From: Borislav Petkov <bp@suse.de> Using static_cpu_has() is pointless on those paths, convert them to the boot_cpu_has() variant. No functional changes. Signed-off-by: Borislav Petkov <bp@suse.de> Cc: Len Brown <lenb@kernel.org> Cc: linux-pm@vger.kernel.org Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Cc: Viresh Kumar <viresh.kumar@linaro.org> --- drivers/cpufreq/amd_freq_sensitivity.c | 2 +- drivers/cpufreq/intel_pstate.c | 18 +++++++++--------- drivers/cpufreq/powernow-k8.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/cpufreq/amd_freq_sensitivity.c b/drivers/cpufreq/amd_freq_sensitivity.c index 4ac7c3cf34be..6927a8c0e748 100644 --- a/drivers/cpufreq/amd_freq_sensitivity.c +++ b/drivers/cpufreq/amd_freq_sensitivity.c @@ -124,7 +124,7 @@ static int __init amd_freq_sensitivity_init(void) PCI_DEVICE_ID_AMD_KERNCZ_SMBUS, NULL); if (!pcidev) { - if (!static_cpu_has(X86_FEATURE_PROC_FEEDBACK)) + if (!boot_cpu_has(X86_FEATURE_PROC_FEEDBACK)) return -ENODEV; } diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index e22f0dbaebb1..ea62e3f02d56 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -522,7 +522,7 @@ static s16 intel_pstate_get_epb(struct cpudata *cpu_data) u64 epb; int ret; - if (!static_cpu_has(X86_FEATURE_EPB)) + if (!boot_cpu_has(X86_FEATURE_EPB)) return -ENXIO; ret = rdmsrl_on_cpu(cpu_data->cpu, MSR_IA32_ENERGY_PERF_BIAS, &epb); @@ -536,7 +536,7 @@ static s16 intel_pstate_get_epp(struct cpudata *cpu_data, u64 hwp_req_data) { s16 epp; - if (static_cpu_has(X86_FEATURE_HWP_EPP)) { + if (boot_cpu_has(X86_FEATURE_HWP_EPP)) { /* * When hwp_req_data is 0, means that caller didn't read * MSR_HWP_REQUEST, so need to read and get EPP. @@ -561,7 +561,7 @@ static int intel_pstate_set_epb(int cpu, s16 pref) u64 epb; int ret; - if (!static_cpu_has(X86_FEATURE_EPB)) + if (!boot_cpu_has(X86_FEATURE_EPB)) return -ENXIO; ret = rdmsrl_on_cpu(cpu, MSR_IA32_ENERGY_PERF_BIAS, &epb); @@ -609,7 +609,7 @@ static int intel_pstate_get_energy_pref_index(struct cpudata *cpu_data) if (epp < 0) return epp; - if (static_cpu_has(X86_FEATURE_HWP_EPP)) { + if (boot_cpu_has(X86_FEATURE_HWP_EPP)) { if (epp == HWP_EPP_PERFORMANCE) return 1; if (epp <= HWP_EPP_BALANCE_PERFORMANCE) @@ -618,7 +618,7 @@ static int intel_pstate_get_energy_pref_index(struct cpudata *cpu_data) return 3; else return 4; - } else if (static_cpu_has(X86_FEATURE_EPB)) { + } else if (boot_cpu_has(X86_FEATURE_EPB)) { /* * Range: * 0x00-0x03 : Performance @@ -646,7 +646,7 @@ static int intel_pstate_set_energy_pref_index(struct cpudata *cpu_data, mutex_lock(&intel_pstate_limits_lock); - if (static_cpu_has(X86_FEATURE_HWP_EPP)) { + if (boot_cpu_has(X86_FEATURE_HWP_EPP)) { u64 value; ret = rdmsrl_on_cpu(cpu_data->cpu, MSR_HWP_REQUEST, &value); @@ -821,7 +821,7 @@ static void intel_pstate_hwp_set(unsigned int cpu) epp = cpu_data->epp_powersave; } update_epp: - if (static_cpu_has(X86_FEATURE_HWP_EPP)) { + if (boot_cpu_has(X86_FEATURE_HWP_EPP)) { value &= ~GENMASK_ULL(31, 24); value |= (u64)epp << 24; } else { @@ -846,7 +846,7 @@ static void intel_pstate_hwp_force_min_perf(int cpu) value |= HWP_MIN_PERF(min_perf); /* Set EPP/EPB to min */ - if (static_cpu_has(X86_FEATURE_HWP_EPP)) + if (boot_cpu_has(X86_FEATURE_HWP_EPP)) value |= HWP_ENERGY_PERF_PREFERENCE(HWP_EPP_POWERSAVE); else intel_pstate_set_epb(cpu, HWP_EPP_BALANCE_POWERSAVE); @@ -1194,7 +1194,7 @@ static void __init intel_pstate_sysfs_expose_params(void) static void intel_pstate_hwp_enable(struct cpudata *cpudata) { /* First disable HWP notification interrupt as we don't process them */ - if (static_cpu_has(X86_FEATURE_HWP_NOTIFY)) + if (boot_cpu_has(X86_FEATURE_HWP_NOTIFY)) wrmsrl_on_cpu(cpudata->cpu, MSR_HWP_INTERRUPT, 0x00); wrmsrl_on_cpu(cpudata->cpu, MSR_PM_ENABLE, 0x1); diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c index fb77b39a4ce3..3c12e03fa343 100644 --- a/drivers/cpufreq/powernow-k8.c +++ b/drivers/cpufreq/powernow-k8.c @@ -1178,7 +1178,7 @@ static int powernowk8_init(void) unsigned int i, supported_cpus = 0; int ret; - if (static_cpu_has(X86_FEATURE_HW_PSTATE)) { + if (boot_cpu_has(X86_FEATURE_HW_PSTATE)) { __request_acpi_cpufreq(); return -ENODEV; } -- 2.21.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 5/5] drivers/cpufreq: Convert some slow-path static_cpu_has() callers to boot_cpu_has() 2019-03-30 11:20 ` [PATCH 5/5] drivers/cpufreq: Convert some slow-path static_cpu_has() callers to boot_cpu_has() Borislav Petkov @ 2019-04-01 9:31 ` Rafael J. Wysocki 2019-04-01 9:32 ` Rafael J. Wysocki 0 siblings, 1 reply; 5+ messages in thread From: Rafael J. Wysocki @ 2019-04-01 9:31 UTC (permalink / raw) To: Borislav Petkov Cc: LKML, Nadav Amit, Andy Lutomirski, Peter Zijlstra, Len Brown, Linux PM, Rafael J. Wysocki, Srinivas Pandruvada, Viresh Kumar On Sat, Mar 30, 2019 at 12:20 PM Borislav Petkov <bp@alien8.de> wrote: > > From: Borislav Petkov <bp@suse.de> > > Using static_cpu_has() is pointless on those paths, convert them to the > boot_cpu_has() variant. > > No functional changes. > > Signed-off-by: Borislav Petkov <bp@suse.de> > Cc: Len Brown <lenb@kernel.org> > Cc: linux-pm@vger.kernel.org > Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> > Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > Cc: Viresh Kumar <viresh.kumar@linaro.org> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > drivers/cpufreq/amd_freq_sensitivity.c | 2 +- > drivers/cpufreq/intel_pstate.c | 18 +++++++++--------- > drivers/cpufreq/powernow-k8.c | 2 +- > 3 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/drivers/cpufreq/amd_freq_sensitivity.c b/drivers/cpufreq/amd_freq_sensitivity.c > index 4ac7c3cf34be..6927a8c0e748 100644 > --- a/drivers/cpufreq/amd_freq_sensitivity.c > +++ b/drivers/cpufreq/amd_freq_sensitivity.c > @@ -124,7 +124,7 @@ static int __init amd_freq_sensitivity_init(void) > PCI_DEVICE_ID_AMD_KERNCZ_SMBUS, NULL); > > if (!pcidev) { > - if (!static_cpu_has(X86_FEATURE_PROC_FEEDBACK)) > + if (!boot_cpu_has(X86_FEATURE_PROC_FEEDBACK)) > return -ENODEV; > } > > diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c > index e22f0dbaebb1..ea62e3f02d56 100644 > --- a/drivers/cpufreq/intel_pstate.c > +++ b/drivers/cpufreq/intel_pstate.c > @@ -522,7 +522,7 @@ static s16 intel_pstate_get_epb(struct cpudata *cpu_data) > u64 epb; > int ret; > > - if (!static_cpu_has(X86_FEATURE_EPB)) > + if (!boot_cpu_has(X86_FEATURE_EPB)) > return -ENXIO; > > ret = rdmsrl_on_cpu(cpu_data->cpu, MSR_IA32_ENERGY_PERF_BIAS, &epb); > @@ -536,7 +536,7 @@ static s16 intel_pstate_get_epp(struct cpudata *cpu_data, u64 hwp_req_data) > { > s16 epp; > > - if (static_cpu_has(X86_FEATURE_HWP_EPP)) { > + if (boot_cpu_has(X86_FEATURE_HWP_EPP)) { > /* > * When hwp_req_data is 0, means that caller didn't read > * MSR_HWP_REQUEST, so need to read and get EPP. > @@ -561,7 +561,7 @@ static int intel_pstate_set_epb(int cpu, s16 pref) > u64 epb; > int ret; > > - if (!static_cpu_has(X86_FEATURE_EPB)) > + if (!boot_cpu_has(X86_FEATURE_EPB)) > return -ENXIO; > > ret = rdmsrl_on_cpu(cpu, MSR_IA32_ENERGY_PERF_BIAS, &epb); > @@ -609,7 +609,7 @@ static int intel_pstate_get_energy_pref_index(struct cpudata *cpu_data) > if (epp < 0) > return epp; > > - if (static_cpu_has(X86_FEATURE_HWP_EPP)) { > + if (boot_cpu_has(X86_FEATURE_HWP_EPP)) { > if (epp == HWP_EPP_PERFORMANCE) > return 1; > if (epp <= HWP_EPP_BALANCE_PERFORMANCE) > @@ -618,7 +618,7 @@ static int intel_pstate_get_energy_pref_index(struct cpudata *cpu_data) > return 3; > else > return 4; > - } else if (static_cpu_has(X86_FEATURE_EPB)) { > + } else if (boot_cpu_has(X86_FEATURE_EPB)) { > /* > * Range: > * 0x00-0x03 : Performance > @@ -646,7 +646,7 @@ static int intel_pstate_set_energy_pref_index(struct cpudata *cpu_data, > > mutex_lock(&intel_pstate_limits_lock); > > - if (static_cpu_has(X86_FEATURE_HWP_EPP)) { > + if (boot_cpu_has(X86_FEATURE_HWP_EPP)) { > u64 value; > > ret = rdmsrl_on_cpu(cpu_data->cpu, MSR_HWP_REQUEST, &value); > @@ -821,7 +821,7 @@ static void intel_pstate_hwp_set(unsigned int cpu) > epp = cpu_data->epp_powersave; > } > update_epp: > - if (static_cpu_has(X86_FEATURE_HWP_EPP)) { > + if (boot_cpu_has(X86_FEATURE_HWP_EPP)) { > value &= ~GENMASK_ULL(31, 24); > value |= (u64)epp << 24; > } else { > @@ -846,7 +846,7 @@ static void intel_pstate_hwp_force_min_perf(int cpu) > value |= HWP_MIN_PERF(min_perf); > > /* Set EPP/EPB to min */ > - if (static_cpu_has(X86_FEATURE_HWP_EPP)) > + if (boot_cpu_has(X86_FEATURE_HWP_EPP)) > value |= HWP_ENERGY_PERF_PREFERENCE(HWP_EPP_POWERSAVE); > else > intel_pstate_set_epb(cpu, HWP_EPP_BALANCE_POWERSAVE); > @@ -1194,7 +1194,7 @@ static void __init intel_pstate_sysfs_expose_params(void) > static void intel_pstate_hwp_enable(struct cpudata *cpudata) > { > /* First disable HWP notification interrupt as we don't process them */ > - if (static_cpu_has(X86_FEATURE_HWP_NOTIFY)) > + if (boot_cpu_has(X86_FEATURE_HWP_NOTIFY)) > wrmsrl_on_cpu(cpudata->cpu, MSR_HWP_INTERRUPT, 0x00); > > wrmsrl_on_cpu(cpudata->cpu, MSR_PM_ENABLE, 0x1); > diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c > index fb77b39a4ce3..3c12e03fa343 100644 > --- a/drivers/cpufreq/powernow-k8.c > +++ b/drivers/cpufreq/powernow-k8.c > @@ -1178,7 +1178,7 @@ static int powernowk8_init(void) > unsigned int i, supported_cpus = 0; > int ret; > > - if (static_cpu_has(X86_FEATURE_HW_PSTATE)) { > + if (boot_cpu_has(X86_FEATURE_HW_PSTATE)) { > __request_acpi_cpufreq(); > return -ENODEV; > } > -- > 2.21.0 > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 5/5] drivers/cpufreq: Convert some slow-path static_cpu_has() callers to boot_cpu_has() 2019-04-01 9:31 ` Rafael J. Wysocki @ 2019-04-01 9:32 ` Rafael J. Wysocki 2019-04-01 12:48 ` Borislav Petkov 0 siblings, 1 reply; 5+ messages in thread From: Rafael J. Wysocki @ 2019-04-01 9:32 UTC (permalink / raw) To: Borislav Petkov Cc: LKML, Nadav Amit, Andy Lutomirski, Peter Zijlstra, Len Brown, Linux PM, Rafael J. Wysocki, Srinivas Pandruvada, Viresh Kumar On Mon, Apr 1, 2019 at 11:31 AM Rafael J. Wysocki <rafael@kernel.org> wrote: > > On Sat, Mar 30, 2019 at 12:20 PM Borislav Petkov <bp@alien8.de> wrote: > > > > From: Borislav Petkov <bp@suse.de> > > > > Using static_cpu_has() is pointless on those paths, convert them to the > > boot_cpu_has() variant. > > > > No functional changes. > > > > Signed-off-by: Borislav Petkov <bp@suse.de> > > Cc: Len Brown <lenb@kernel.org> > > Cc: linux-pm@vger.kernel.org > > Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> > > Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > > Cc: Viresh Kumar <viresh.kumar@linaro.org> > > Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Or I can queue it up if you prefer. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 5/5] drivers/cpufreq: Convert some slow-path static_cpu_has() callers to boot_cpu_has() 2019-04-01 9:32 ` Rafael J. Wysocki @ 2019-04-01 12:48 ` Borislav Petkov 2019-04-01 21:34 ` Rafael J. Wysocki 0 siblings, 1 reply; 5+ messages in thread From: Borislav Petkov @ 2019-04-01 12:48 UTC (permalink / raw) To: Rafael J. Wysocki Cc: LKML, Nadav Amit, Andy Lutomirski, Peter Zijlstra, Len Brown, Linux PM, Rafael J. Wysocki, Srinivas Pandruvada, Viresh Kumar On Mon, Apr 01, 2019 at 11:32:59AM +0200, Rafael J. Wysocki wrote: > Or I can queue it up if you prefer. Doesn't matter to me - it doesn't have any dependencies to previous patches so however you like. Thx. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 5/5] drivers/cpufreq: Convert some slow-path static_cpu_has() callers to boot_cpu_has() 2019-04-01 12:48 ` Borislav Petkov @ 2019-04-01 21:34 ` Rafael J. Wysocki 0 siblings, 0 replies; 5+ messages in thread From: Rafael J. Wysocki @ 2019-04-01 21:34 UTC (permalink / raw) To: Borislav Petkov Cc: Rafael J. Wysocki, LKML, Nadav Amit, Andy Lutomirski, Peter Zijlstra, Len Brown, Linux PM, Rafael J. Wysocki, Srinivas Pandruvada, Viresh Kumar On Mon, Apr 1, 2019 at 2:48 PM Borislav Petkov <bp@alien8.de> wrote: > > On Mon, Apr 01, 2019 at 11:32:59AM +0200, Rafael J. Wysocki wrote: > > Or I can queue it up if you prefer. > > Doesn't matter to me - it doesn't have any dependencies to previous > patches so however you like. OK, I'll take it. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-04-01 21:34 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20190330112022.28888-1-bp@alien8.de>
2019-03-30 11:20 ` [PATCH 5/5] drivers/cpufreq: Convert some slow-path static_cpu_has() callers to boot_cpu_has() Borislav Petkov
2019-04-01 9:31 ` Rafael J. Wysocki
2019-04-01 9:32 ` Rafael J. Wysocki
2019-04-01 12:48 ` Borislav Petkov
2019-04-01 21:34 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox