This is a note to let you know that I've just added the patch titled
cpufreq/amd-pstate: Fix the return value of amd_pstate_fast_switch()
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
cpufreq-amd-pstate-fix-the-return-value-of-amd_pstate_fast_switch.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From bb87be267b8ee9b40917fb5bf51be5ddb33c37c2 Mon Sep 17 00:00:00 2001
From: "Gautham R. Shenoy" <gautham.shenoy@xxxxxxx>
Date: Mon, 27 Nov 2023 16:41:21 +0530
Subject: cpufreq/amd-pstate: Fix the return value of amd_pstate_fast_switch()
From: Gautham R. Shenoy <gautham.shenoy@xxxxxxx>
commit bb87be267b8ee9b40917fb5bf51be5ddb33c37c2 upstream.
cpufreq_driver->fast_switch() callback expects a frequency as a return
value. amd_pstate_fast_switch() was returning the return value of
amd_pstate_update_freq(), which only indicates a success or failure.
Fix this by making amd_pstate_fast_switch() return the target_freq
when the call to amd_pstate_update_freq() is successful, and return
the current frequency from policy->cur when the call to
amd_pstate_update_freq() is unsuccessful.
Fixes: 4badf2eb1e98 ("cpufreq: amd-pstate: Add ->fast_switch() callback")
Acked-by: Huang Rui <ray.huang@xxxxxxx>
Reviewed-by: Wyes Karny <wyes.karny@xxxxxxx>
Reviewed-by: Perry Yuan <perry.yuan@xxxxxxx>
Cc: 6.4+ <stable@xxxxxxxxxxxxxxx> # v6.4+
Signed-off-by: Gautham R. Shenoy <gautham.shenoy@xxxxxxx>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/cpufreq/amd-pstate.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/drivers/cpufreq/amd-pstate.c
+++ b/drivers/cpufreq/amd-pstate.c
@@ -296,7 +296,9 @@ static int amd_pstate_target(struct cpuf
static unsigned int amd_pstate_fast_switch(struct cpufreq_policy *policy,
unsigned int target_freq)
{
- return amd_pstate_update_freq(policy, target_freq, true);
+ if (!amd_pstate_update_freq(policy, target_freq, true))
+ return target_freq;
+ return policy->cur;
}
static void amd_pstate_adjust_perf(unsigned int cpu,
Patches currently in stable-queue which might be from gautham.shenoy@xxxxxxx are
queue-6.1/cpufreq-amd-pstate-fix-the-return-value-of-amd_pstate_fast_switch.patch
