]> 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:32:00 +0000 (09:32 +0200)
This reverts commit 82590ce3a0d0f26d06b0a70886ca2d444e64acbf 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 9f147e9eafb6346d169cc77be77f4a21416c7f01..90dcf26f0973188a7691ace00f295482294ff307 100644 (file)
@@ -424,7 +424,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;