diff mbox series

[02/15] cpufreq/amd-pstate: convert mutex use to guard()

Message ID 20241205222847.7889-3-mario.limonciello@amd.com (mailing list archive)
State Superseded, archived
Headers show
Series amd-pstate 6.14 cleanups and improvements | expand

Commit Message

Mario Limonciello Dec. 5, 2024, 10:28 p.m. UTC 
Using scoped guard declaration will unlock mutexes automatically.

Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
 drivers/cpufreq/amd-pstate.c | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

Comments

Gautham R. Shenoy Dec. 6, 2024, 6:15 a.m. UTC | #1 
On Thu, Dec 05, 2024 at 04:28:34PM -0600, Mario Limonciello wrote:
> Using scoped guard declaration will unlock mutexes automatically.
> 
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>


Looks good to me.

Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>

--
Thanks and Regards
gautham.
> ---
>  drivers/cpufreq/amd-pstate.c | 32 ++++++++++++--------------------
>  1 file changed, 12 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
> index 4d1da49d345ec..7eb013585df51 100644
> --- a/drivers/cpufreq/amd-pstate.c
> +++ b/drivers/cpufreq/amd-pstate.c
> @@ -752,12 +752,12 @@ static int amd_pstate_set_boost(struct cpufreq_policy *policy, int state)
>  		pr_err("Boost mode is not supported by this processor or SBIOS\n");
>  		return -EOPNOTSUPP;
>  	}
> -	mutex_lock(&amd_pstate_driver_lock);
> +	guard(mutex)(&amd_pstate_driver_lock);
> +
>  	ret = amd_pstate_cpu_boost_update(policy, state);
>  	WRITE_ONCE(cpudata->boost_state, !ret ? state : false);
>  	policy->boost_enabled = !ret ? state : false;
>  	refresh_frequency_limits(policy);
> -	mutex_unlock(&amd_pstate_driver_lock);
>  
>  	return ret;
>  }
> @@ -848,7 +848,8 @@ static void amd_pstate_update_limits(unsigned int cpu)
>  	if (!amd_pstate_prefcore)
>  		return;
>  
> -	mutex_lock(&amd_pstate_driver_lock);
> +	guard(mutex)(&amd_pstate_driver_lock);
> +
>  	ret = amd_get_highest_perf(cpu, &cur_high);
>  	if (ret)
>  		goto free_cpufreq_put;
> @@ -868,7 +869,6 @@ static void amd_pstate_update_limits(unsigned int cpu)
>  	if (!highest_perf_changed)
>  		cpufreq_update_policy(cpu);
>  
> -	mutex_unlock(&amd_pstate_driver_lock);
>  }
>  
>  /*
> @@ -1201,11 +1201,11 @@ static ssize_t store_energy_performance_preference(
>  	if (ret < 0)
>  		return -EINVAL;
>  
> -	mutex_lock(&amd_pstate_limits_lock);
> +	guard(mutex)(&amd_pstate_limits_lock);
> +
>  	ret = amd_pstate_set_energy_pref_index(cpudata, ret);
> -	mutex_unlock(&amd_pstate_limits_lock);
>  
> -	return ret ?: count;
> +	return ret ? ret : count;
>  }
>  
>  static ssize_t show_energy_performance_preference(
> @@ -1369,13 +1369,10 @@ EXPORT_SYMBOL_GPL(amd_pstate_update_status);
>  static ssize_t status_show(struct device *dev,
>  			   struct device_attribute *attr, char *buf)
>  {
> -	ssize_t ret;
>  
> -	mutex_lock(&amd_pstate_driver_lock);
> -	ret = amd_pstate_show_status(buf);
> -	mutex_unlock(&amd_pstate_driver_lock);
> +	guard(mutex)(&amd_pstate_driver_lock);
>  
> -	return ret;
> +	return amd_pstate_show_status(buf);
>  }
>  
>  static ssize_t status_store(struct device *a, struct device_attribute *b,
> @@ -1384,9 +1381,8 @@ static ssize_t status_store(struct device *a, struct device_attribute *b,
>  	char *p = memchr(buf, '\n', count);
>  	int ret;
>  
> -	mutex_lock(&amd_pstate_driver_lock);
> +	guard(mutex)(&amd_pstate_driver_lock);
>  	ret = amd_pstate_update_status(buf, p ? p - buf : count);
> -	mutex_unlock(&amd_pstate_driver_lock);
>  
>  	return ret < 0 ? ret : count;
>  }
> @@ -1687,7 +1683,7 @@ static int amd_pstate_epp_cpu_offline(struct cpufreq_policy *policy)
>  
>  	min_perf = READ_ONCE(cpudata->lowest_perf);
>  
> -	mutex_lock(&amd_pstate_limits_lock);
> +	guard(mutex)(&amd_pstate_limits_lock);
>  
>  	if (trace_amd_pstate_epp_perf_enabled()) {
>  		trace_amd_pstate_epp_perf(cpudata->cpu, cpudata->highest_perf,
> @@ -1698,8 +1694,6 @@ static int amd_pstate_epp_cpu_offline(struct cpufreq_policy *policy)
>  	amd_pstate_update_perf(cpudata, min_perf, 0, min_perf, false);
>  	amd_pstate_set_epp(cpudata, AMD_CPPC_EPP_BALANCE_POWERSAVE);
>  
> -	mutex_unlock(&amd_pstate_limits_lock);
> -
>  	return 0;
>  }
>  
> @@ -1728,13 +1722,11 @@ static int amd_pstate_epp_resume(struct cpufreq_policy *policy)
>  	struct amd_cpudata *cpudata = policy->driver_data;
>  
>  	if (cpudata->suspended) {
> -		mutex_lock(&amd_pstate_limits_lock);
> +		guard(mutex)(&amd_pstate_limits_lock);
>  
>  		/* enable amd pstate from suspend state*/
>  		amd_pstate_epp_reenable(cpudata);
>  
> -		mutex_unlock(&amd_pstate_limits_lock);
> -
>  		cpudata->suspended = false;
>  	}
>  
> -- 
> 2.43.0
>
diff mbox series

Patch

diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
index 4d1da49d345ec..7eb013585df51 100644
--- a/drivers/cpufreq/amd-pstate.c
+++ b/drivers/cpufreq/amd-pstate.c
@@ -752,12 +752,12 @@  static int amd_pstate_set_boost(struct cpufreq_policy *policy, int state)
 		pr_err("Boost mode is not supported by this processor or SBIOS\n");
 		return -EOPNOTSUPP;
 	}
-	mutex_lock(&amd_pstate_driver_lock);
+	guard(mutex)(&amd_pstate_driver_lock);
+
 	ret = amd_pstate_cpu_boost_update(policy, state);
 	WRITE_ONCE(cpudata->boost_state, !ret ? state : false);
 	policy->boost_enabled = !ret ? state : false;
 	refresh_frequency_limits(policy);
-	mutex_unlock(&amd_pstate_driver_lock);
 
 	return ret;
 }
@@ -848,7 +848,8 @@  static void amd_pstate_update_limits(unsigned int cpu)
 	if (!amd_pstate_prefcore)
 		return;
 
-	mutex_lock(&amd_pstate_driver_lock);
+	guard(mutex)(&amd_pstate_driver_lock);
+
 	ret = amd_get_highest_perf(cpu, &cur_high);
 	if (ret)
 		goto free_cpufreq_put;
@@ -868,7 +869,6 @@  static void amd_pstate_update_limits(unsigned int cpu)
 	if (!highest_perf_changed)
 		cpufreq_update_policy(cpu);
 
-	mutex_unlock(&amd_pstate_driver_lock);
 }
 
 /*
@@ -1201,11 +1201,11 @@  static ssize_t store_energy_performance_preference(
 	if (ret < 0)
 		return -EINVAL;
 
-	mutex_lock(&amd_pstate_limits_lock);
+	guard(mutex)(&amd_pstate_limits_lock);
+
 	ret = amd_pstate_set_energy_pref_index(cpudata, ret);
-	mutex_unlock(&amd_pstate_limits_lock);
 
-	return ret ?: count;
+	return ret ? ret : count;
 }
 
 static ssize_t show_energy_performance_preference(
@@ -1369,13 +1369,10 @@  EXPORT_SYMBOL_GPL(amd_pstate_update_status);
 static ssize_t status_show(struct device *dev,
 			   struct device_attribute *attr, char *buf)
 {
-	ssize_t ret;
 
-	mutex_lock(&amd_pstate_driver_lock);
-	ret = amd_pstate_show_status(buf);
-	mutex_unlock(&amd_pstate_driver_lock);
+	guard(mutex)(&amd_pstate_driver_lock);
 
-	return ret;
+	return amd_pstate_show_status(buf);
 }
 
 static ssize_t status_store(struct device *a, struct device_attribute *b,
@@ -1384,9 +1381,8 @@  static ssize_t status_store(struct device *a, struct device_attribute *b,
 	char *p = memchr(buf, '\n', count);
 	int ret;
 
-	mutex_lock(&amd_pstate_driver_lock);
+	guard(mutex)(&amd_pstate_driver_lock);
 	ret = amd_pstate_update_status(buf, p ? p - buf : count);
-	mutex_unlock(&amd_pstate_driver_lock);
 
 	return ret < 0 ? ret : count;
 }
@@ -1687,7 +1683,7 @@  static int amd_pstate_epp_cpu_offline(struct cpufreq_policy *policy)
 
 	min_perf = READ_ONCE(cpudata->lowest_perf);
 
-	mutex_lock(&amd_pstate_limits_lock);
+	guard(mutex)(&amd_pstate_limits_lock);
 
 	if (trace_amd_pstate_epp_perf_enabled()) {
 		trace_amd_pstate_epp_perf(cpudata->cpu, cpudata->highest_perf,
@@ -1698,8 +1694,6 @@  static int amd_pstate_epp_cpu_offline(struct cpufreq_policy *policy)
 	amd_pstate_update_perf(cpudata, min_perf, 0, min_perf, false);
 	amd_pstate_set_epp(cpudata, AMD_CPPC_EPP_BALANCE_POWERSAVE);
 
-	mutex_unlock(&amd_pstate_limits_lock);
-
 	return 0;
 }
 
@@ -1728,13 +1722,11 @@  static int amd_pstate_epp_resume(struct cpufreq_policy *policy)
 	struct amd_cpudata *cpudata = policy->driver_data;
 
 	if (cpudata->suspended) {
-		mutex_lock(&amd_pstate_limits_lock);
+		guard(mutex)(&amd_pstate_limits_lock);
 
 		/* enable amd pstate from suspend state*/
 		amd_pstate_epp_reenable(cpudata);
 
-		mutex_unlock(&amd_pstate_limits_lock);
-
 		cpudata->suspended = false;
 	}