summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYe Zhang <ye.zhang@rock-chips.com>2024-03-21 18:21:00 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-04-03 15:28:56 +0200
commitbe4f3af178cb9804ba8d174bce3c9732842dcdf8 (patch)
tree179360b09c83966320e2919a7904dbec24925cb6
parentcc80b5d7fbef8fed43cae6dcc11685488b80e801 (diff)
downloadlinux-stable-be4f3af178cb9804ba8d174bce3c9732842dcdf8.tar.gz
linux-stable-be4f3af178cb9804ba8d174bce3c9732842dcdf8.tar.bz2
linux-stable-be4f3af178cb9804ba8d174bce3c9732842dcdf8.zip
thermal: devfreq_cooling: Fix perf state when calculate dfc res_util
commit a26de34b3c77ae3a969654d94be49e433c947e3b upstream. The issue occurs when the devfreq cooling device uses the EM power model and the get_real_power() callback is provided by the driver. The EM power table is sorted ascending,can't index the table by cooling device state,so convert cooling state to performance state by dfc->max_state - dfc->capped_state. Fixes: 615510fe13bd ("thermal: devfreq_cooling: remove old power model and use EM") Cc: 5.11+ <stable@vger.kernel.org> # 5.11+ Signed-off-by: Ye Zhang <ye.zhang@rock-chips.com> Reviewed-by: Dhruva Gole <d-gole@ti.com> Reviewed-by: Lukasz Luba <lukasz.luba@arm.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/thermal/devfreq_cooling.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/devfreq_cooling.c b/drivers/thermal/devfreq_cooling.c
index 262e62ab6cf2..90b828bcca24 100644
--- a/drivers/thermal/devfreq_cooling.c
+++ b/drivers/thermal/devfreq_cooling.c
@@ -201,7 +201,7 @@ static int devfreq_cooling_get_requested_power(struct thermal_cooling_device *cd
res = dfc->power_ops->get_real_power(df, power, freq, voltage);
if (!res) {
- state = dfc->capped_state;
+ state = dfc->max_state - dfc->capped_state;
/* Convert EM power into milli-Watts first */
dfc->res_util = dfc->em_pd->table[state].power;