]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Revert "cpufreq: amd-pstate: Fix the inconsistency in max frequency units"
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 2 Jul 2024 09:14:23 +0000 (11:14 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 5 Jul 2024 07:34:05 +0000 (09:34 +0200)
This reverts commit 8f893e52b9e030a25ea62e31271bf930b01f2f07 which is
commit e4731baaf29438508197d3a8a6d4f5a8c51663f8 upstream.

It causes a regression in kernels older than 6.9.y, so drop it from
here.

Link: https://lore.kernel.org/r/18882bfe-4ca5-495c-ace5-b9bcab796ae5@amd.com
Reported-by: Lars Wendler <wendler.lars@web.de>
Cc: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
Cc: Mario Limonciello <mario.limonciello@amd.com>
Cc: Gautham R. Shenoy <gautham.shenoy@amd.com>
Cc: Peter Jung <ptr1337@cachyos.org>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/cpufreq/amd-pstate.c

index a5f4c255edadf59c4c05b1d232cc855232d11fb7..3efc2aef31ce488e6d5708e384953a1c3a15fd86 100644 (file)
@@ -675,7 +675,7 @@ static int amd_pstate_set_boost(struct cpufreq_policy *policy, int state)
        if (state)
                policy->cpuinfo.max_freq = cpudata->max_freq;
        else
-               policy->cpuinfo.max_freq = cpudata->nominal_freq * 1000;
+               policy->cpuinfo.max_freq = cpudata->nominal_freq;
 
        policy->max = policy->cpuinfo.max_freq;