Patch "cpufreq/amd-pstate: Only print supported EPP values for performance governor" has been added to the 6.6-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    cpufreq/amd-pstate: Only print supported EPP values for performance governor

to the 6.6-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-only-print-supported-epp-values-f.patch
and it can be found in the queue-6.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 5e3fe7e05d8caaf53030009a329098baabf6a6f2
Author: Ayush Jain <ayush.jain3@xxxxxxx>
Date:   Fri Nov 3 15:18:15 2023 +0530

    cpufreq/amd-pstate: Only print supported EPP values for performance governor
    
    [ Upstream commit 142c169b31beb364ef39385b4e88735bd51d37fe ]
    
    show_energy_performance_available_preferences() to show only supported
    values which is performance in performance governor policy.
    
    -------Before--------
    $ cat /sys/devices/system/cpu/cpu1/cpufreq/scaling_driver
    amd-pstate-epp
    $ cat /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor
    performance
    $ cat /sys/devices/system/cpu/cpu1/cpufreq/energy_performance_preference
    performance
    $ cat /sys/devices/system/cpu/cpu1/cpufreq/energy_performance_available_preferences
    default performance balance_performance balance_power power
    
    -------After--------
    $ cat /sys/devices/system/cpu/cpu1/cpufreq/scaling_driver
    amd-pstate-epp
    $ cat /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor
    performance
    $ cat /sys/devices/system/cpu/cpu1/cpufreq/energy_performance_preference
    performance
    $ cat /sys/devices/system/cpu/cpu1/cpufreq/energy_performance_available_preferences
    performance
    
    Fixes: ffa5096a7c33 ("cpufreq: amd-pstate: implement Pstate EPP support for the AMD processors")
    Suggested-by: Wyes Karny <wyes.karny@xxxxxxx>
    Signed-off-by: Ayush Jain <ayush.jain3@xxxxxxx>
    Reviewed-by: Wyes Karny <wyes.karny@xxxxxxx>
    Acked-by: Huang Rui <ray.huang@xxxxxxx>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
index 3313d1d2c6ddf..1f6186475715e 100644
--- a/drivers/cpufreq/amd-pstate.c
+++ b/drivers/cpufreq/amd-pstate.c
@@ -882,11 +882,16 @@ static ssize_t show_energy_performance_available_preferences(
 {
 	int i = 0;
 	int offset = 0;
+	struct amd_cpudata *cpudata = policy->driver_data;
+
+	if (cpudata->policy == CPUFREQ_POLICY_PERFORMANCE)
+		return sysfs_emit_at(buf, offset, "%s\n",
+				energy_perf_strings[EPP_INDEX_PERFORMANCE]);
 
 	while (energy_perf_strings[i] != NULL)
 		offset += sysfs_emit_at(buf, offset, "%s ", energy_perf_strings[i++]);
 
-	sysfs_emit_at(buf, offset, "\n");
+	offset += sysfs_emit_at(buf, offset, "\n");
 
 	return offset;
 }