[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAJZ5v0j7QahmFU=eVG=4iBCmN4wk58GgyfUchr9wcc0Fh0Rwag@mail.gmail.com>
Date: Tue, 28 Nov 2023 15:09:17 +0100
From: "Rafael J. Wysocki" <rafael@...nel.org>
To: "Gautham R. Shenoy" <gautham.shenoy@....com>
Cc: Wyes Karny <wyes.karny@....com>, Huang Rui <ray.huang@....com>,
Mario Limonciello <mario.limonciello@....com>,
Perry Yuan <Perry.Yuan@....com>,
"Rafael J . Wysocki" <rafael@...nel.org>,
Viresh Kumar <viresh.kumar@...aro.org>,
linux-pm@...r.kernel.org, linux-kernel@...r.kernel.org,
stable@...r.kernel.org
Subject: Re: [PATCH v2] cpufreq/amd-pstate: Fix the return value of amd_pstate_fast_switch()
On Mon, Nov 27, 2023 at 12:11 PM Gautham R. Shenoy
<gautham.shenoy@....com> wrote:
>
> 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@....com>
> Reviewed-by: Wyes Karny <wyes.karny@....com>
> Reviewed-by: Perry Yuan <perry.yuan@....com>
> Cc: stable@...r.kernel.org # v6.4+
> Signed-off-by: Gautham R. Shenoy <gautham.shenoy@....com>
> ---
> drivers/cpufreq/amd-pstate.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
> index 9a1e194d5cf8..300f81d36291 100644
> --- a/drivers/cpufreq/amd-pstate.c
> +++ b/drivers/cpufreq/amd-pstate.c
> @@ -518,7 +518,9 @@ static int amd_pstate_target(struct cpufreq_policy *policy,
> 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,
> --
Applied as 6.7-rc material, thanks!
BTW, if you are aware of any pending AMD P-state fixes for 6.7, please
let me know.
Powered by blists - more mailing lists