cpufreq: intel_pstate: Drop redundant intel_pstate_get_hwp_cap() call

[ Upstream commit 458b03f81afbb27143c45d47c2d8f418b2ba2407 ]

It is not necessary to call intel_pstate_get_hwp_cap() from
intel_pstate_update_perf_limits(), because it gets called from
intel_pstate_verify_cpu_policy() which is either invoked directly
right before intel_pstate_update_perf_limits(), in
intel_cpufreq_verify_policy() in the passive mode, or called
from driver callbacks in a sequence that causes it to be followed
by an immediate intel_pstate_update_perf_limits().

Namely, in the active mode intel_cpufreq_verify_policy() is called
by intel_pstate_verify_policy() which is the ->verify() callback
routine of intel_pstate and gets called by the cpufreq core right
before intel_pstate_set_policy(), which is the driver's ->setoplicy()
callback routine, where intel_pstate_update_perf_limits() is called.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Stable-dep-of: 192cdb1c907f ("cpufreq: intel_pstate: Refine computation of P-state for given frequency")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 736cb2cfcbb082226c8d3eee2c4fa5fe8b4340bd..f2a94afb6eecba5259f2c6ae7a1f887a8be36047 100644 (file)
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -2332,18 +2332,14 @@ static void intel_pstate_update_perf_limits(struct cpudata *cpu,
         * HWP needs some special consideration, because HWP_REQUEST uses
         * abstract values to represent performance rather than pure ratios.
         */
-       if (hwp_active) {
-               intel_pstate_get_hwp_cap(cpu);
-
-               if (cpu->pstate.scaling != perf_ctl_scaling) {
-                       int scaling = cpu->pstate.scaling;
-                       int freq;
-
-                       freq = max_policy_perf * perf_ctl_scaling;
-                       max_policy_perf = DIV_ROUND_UP(freq, scaling);
-                       freq = min_policy_perf * perf_ctl_scaling;
-                       min_policy_perf = DIV_ROUND_UP(freq, scaling);
-               }
+       if (hwp_active && cpu->pstate.scaling != perf_ctl_scaling) {
+               int scaling = cpu->pstate.scaling;
+               int freq;
+
+               freq = max_policy_perf * perf_ctl_scaling;
+               max_policy_perf = DIV_ROUND_UP(freq, scaling);
+               freq = min_policy_perf * perf_ctl_scaling;
+               min_policy_perf = DIV_ROUND_UP(freq, scaling);
        }
 
        pr_debug("cpu:%d min_policy_perf:%d max_policy_perf:%d\n",