124 lines
3.6 KiB
Diff
124 lines
3.6 KiB
Diff
From 57fdcf14dcd80808fc46edea6d31bb2a699c0fd1 Mon Sep 17 00:00:00 2001
|
|
From: Mario Limonciello <mario.limonciello@amd.com>
|
|
Date: Thu, 5 Dec 2024 16:28:34 -0600
|
|
Subject: cpufreq/amd-pstate: convert mutex use to guard()
|
|
|
|
Using scoped guard declaration will unlock mutexes automatically.
|
|
|
|
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
|
|
Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
|
|
---
|
|
drivers/cpufreq/amd-pstate.c | 32 ++++++++++++--------------------
|
|
1 file changed, 12 insertions(+), 20 deletions(-)
|
|
|
|
--- a/drivers/cpufreq/amd-pstate.c
|
|
+++ b/drivers/cpufreq/amd-pstate.c
|
|
@@ -782,12 +782,12 @@ static int amd_pstate_set_boost(struct c
|
|
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;
|
|
}
|
|
@@ -878,7 +878,8 @@ static void amd_pstate_update_limits(uns
|
|
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;
|
|
@@ -898,7 +899,6 @@ free_cpufreq_put:
|
|
if (!highest_perf_changed)
|
|
cpufreq_update_policy(cpu);
|
|
|
|
- mutex_unlock(&amd_pstate_driver_lock);
|
|
}
|
|
|
|
/*
|
|
@@ -1231,11 +1231,11 @@ static ssize_t store_energy_performance_
|
|
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(
|
|
@@ -1399,13 +1399,10 @@ EXPORT_SYMBOL_GPL(amd_pstate_update_stat
|
|
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,
|
|
@@ -1414,9 +1411,8 @@ static ssize_t status_store(struct devic
|
|
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;
|
|
}
|
|
@@ -1717,7 +1713,7 @@ static int amd_pstate_epp_cpu_offline(st
|
|
|
|
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,
|
|
@@ -1728,8 +1724,6 @@ static int amd_pstate_epp_cpu_offline(st
|
|
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;
|
|
}
|
|
|
|
@@ -1758,13 +1752,11 @@ static int amd_pstate_epp_resume(struct
|
|
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;
|
|
}
|
|
|