[PATCH v1] cpufreq: intel_pstate: Eliminate some code duplication

[PATCH v1] cpufreq: intel_pstate: Eliminate some code duplication

[Rafael J. Wysocki]

From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

To eliminate some code duplication from the intel_pstate driver,
move the core_get_val() function body to a new function called
get_perf_ctl_val() and make both core_get_val() and atom_get_val()
invoke it to carry out the same computation.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
 drivers/cpufreq/intel_pstate.c |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -2119,6 +2119,18 @@ static void intel_pstate_hwp_enable(stru
 	intel_pstate_update_epp_defaults(cpudata);
 }
 
+static u64 get_perf_ctl_val(int pstate)
+{
+	u64 val;
+
+	val = (u64)pstate << 8;
+	if (READ_ONCE(global.no_turbo) && !READ_ONCE(global.turbo_disabled) &&
+	    cpu_feature_enabled(X86_FEATURE_IDA))
+		val |= (u64)1 << 32;
+
+	return val;
+}
+
 static int atom_get_min_pstate(int not_used)
 {
 	u64 value;
@@ -2145,15 +2157,10 @@ static int atom_get_turbo_pstate(int not
 
 static u64 atom_get_val(struct cpudata *cpudata, int pstate)
 {
-	u64 val;
+	u64 val = get_perf_ctl_val(pstate);
 	int32_t vid_fp;
 	u32 vid;
 
-	val = (u64)pstate << 8;
-	if (READ_ONCE(global.no_turbo) && !READ_ONCE(global.turbo_disabled) &&
-	    cpu_feature_enabled(X86_FEATURE_IDA))
-		val |= (u64)1 << 32;
-
 	vid_fp = cpudata->vid.min + mul_fp(
 		int_tofp(pstate - cpudata->pstate.min_pstate),
 		cpudata->vid.ratio);
@@ -2313,14 +2320,7 @@ static int core_get_turbo_pstate(int cpu
 
 static u64 core_get_val(struct cpudata *cpudata, int pstate)
 {
-	u64 val;
-
-	val = (u64)pstate << 8;
-	if (READ_ONCE(global.no_turbo) && !READ_ONCE(global.turbo_disabled) &&
-	    cpu_feature_enabled(X86_FEATURE_IDA))
-		val |= (u64)1 << 32;
-
-	return val;
+	return get_perf_ctl_val(pstate);
 }
 
 static int knl_get_aperf_mperf_shift(void)

Re: [PATCH v1] cpufreq: intel_pstate: Eliminate some code duplication

[srinivas pandruvada]

On Fri, 2025-11-14 at 19:48 +0100, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> To eliminate some code duplication from the intel_pstate driver,
> move the core_get_val() function body to a new function called
> get_perf_ctl_val() and make both core_get_val() and atom_get_val()
> invoke it to carry out the same computation.
> 
> No intentional functional impact.
> 
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>

> ---
>  drivers/cpufreq/intel_pstate.c |   28 ++++++++++++++--------------
>  1 file changed, 14 insertions(+), 14 deletions(-)
> 
> --- a/drivers/cpufreq/intel_pstate.c
> +++ b/drivers/cpufreq/intel_pstate.c
> @@ -2119,6 +2119,18 @@ static void intel_pstate_hwp_enable(stru
>  	intel_pstate_update_epp_defaults(cpudata);
>  }
>  
> +static u64 get_perf_ctl_val(int pstate)
> +{
> +	u64 val;
> +
> +	val = (u64)pstate << 8;
> +	if (READ_ONCE(global.no_turbo) &&
> !READ_ONCE(global.turbo_disabled) &&
> +	    cpu_feature_enabled(X86_FEATURE_IDA))
> +		val |= (u64)1 << 32;
> +
> +	return val;
> +}
> +
>  static int atom_get_min_pstate(int not_used)
>  {
>  	u64 value;
> @@ -2145,15 +2157,10 @@ static int atom_get_turbo_pstate(int not
>  
>  static u64 atom_get_val(struct cpudata *cpudata, int pstate)
>  {
> -	u64 val;
> +	u64 val = get_perf_ctl_val(pstate);
>  	int32_t vid_fp;
>  	u32 vid;
>  
> -	val = (u64)pstate << 8;
> -	if (READ_ONCE(global.no_turbo) &&
> !READ_ONCE(global.turbo_disabled) &&
> -	    cpu_feature_enabled(X86_FEATURE_IDA))
> -		val |= (u64)1 << 32;
> -
>  	vid_fp = cpudata->vid.min + mul_fp(
>  		int_tofp(pstate - cpudata->pstate.min_pstate),
>  		cpudata->vid.ratio);
> @@ -2313,14 +2320,7 @@ static int core_get_turbo_pstate(int cpu
>  
>  static u64 core_get_val(struct cpudata *cpudata, int pstate)
>  {
> -	u64 val;
> -
> -	val = (u64)pstate << 8;
> -	if (READ_ONCE(global.no_turbo) &&
> !READ_ONCE(global.turbo_disabled) &&
> -	    cpu_feature_enabled(X86_FEATURE_IDA))
> -		val |= (u64)1 << 32;
> -
> -	return val;
> +	return get_perf_ctl_val(pstate);
>  }
>  
>  static int knl_get_aperf_mperf_shift(void)
> 
> 
>