Re: [PATCH] cpufreq: Preserve global boost state on failed updates
From: Pengjie Zhang
Date: Wed Nov 04 2026 - 23:50:38 EST
On 11/5/2026 12:16 AM, Christian Loehle wrote:
cpufreq_boost_trigger_state() restores the opposite of the requestedReviewed-by: Pengjie Zhang <zhangpengjie2@xxxxxxxxxx>
state when updating policy boost state fails. For example, a failed
write of 0 when global boost is already disabled enables the global
flag without enabling any policies.
Save the original global boost state using a mutex and restore it on
failure.
Fixes: 121baab7b88e ("cpufreq: Force sync policy boost with global boost on sysfs update")
Fixes: 6f19efc0a1ca ("cpufreq: Add boost frequency support in core")
Signed-off-by: Christian Loehle <christian.loehle@xxxxxxx>
---
On a platform without boost_supported the unfixed behaviour is:
# cat /sys/devices/system/cpu/cpufreq/boost
0
# echo 1 > /sys/devices/system/cpu/cpufreq/boost
echo: write error: invalid argument
# cat /sys/devices/system/cpu/cpufreq/boost
0
# echo 0 > /sys/devices/system/cpu/cpufreq/boost
echo: write error: invalid argument
# cat /sys/devices/system/cpu/cpufreq/boost
1
drivers/cpufreq/cpufreq.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 54dde8419bdc..d95c849f79c5 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -2810,18 +2810,24 @@ int cpufreq_boost_set_sw(struct cpufreq_policy *policy, int state)
}
EXPORT_SYMBOL_GPL(cpufreq_boost_set_sw);
+static DEFINE_MUTEX(cpufreq_boost_mutex);
+
static int cpufreq_boost_trigger_state(int state)
{
struct cpufreq_policy *policy;
unsigned long flags;
+ bool boost_enabled;
int ret = -EOPNOTSUPP;
+ guard(mutex)(&cpufreq_boost_mutex);
+
/*
* Don't compare 'cpufreq_driver->boost_enabled' with 'state' here to
* make sure all policies are in sync with global boost flag.
*/
write_lock_irqsave(&cpufreq_driver_lock, flags);
+ boost_enabled = cpufreq_driver->boost_enabled;
cpufreq_driver->boost_enabled = state;
write_unlock_irqrestore(&cpufreq_driver_lock, flags);
@@ -2841,7 +2847,7 @@ static int cpufreq_boost_trigger_state(int state)
return 0;
write_lock_irqsave(&cpufreq_driver_lock, flags);
- cpufreq_driver->boost_enabled = !state;
+ cpufreq_driver->boost_enabled = boost_enabled;
write_unlock_irqrestore(&cpufreq_driver_lock, flags);
pr_err("%s: Cannot %s BOOST\n",