2024-03-21 10:22:05

by Ye Zhang

Subject: [PATCH v2] thermal: devfreq_cooling: Fix perf state when calculate dfc res_util

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+ <[email protected]> # 5.11+
Signed-off-by: Ye Zhang <[email protected]>
---
v1 -> v2:
- Update the commit message.

drivers/thermal/devfreq_cooling.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/thermal/devfreq_cooling.c b/drivers/thermal/devfreq_cooling.c
index 50dec24e967a..8fd7cf1932cd 100644
--- a/drivers/thermal/devfreq_cooling.c
+++ b/drivers/thermal/devfreq_cooling.c
@@ -214,7 +214,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 */
rcu_read_lock();
--
2.34.1

2024-03-22 08:01:41

by Dhruva Gole

Subject: Re: [PATCH v2] thermal: devfreq_cooling: Fix perf state when calculate dfc res_util

Hi,

On Mar 21, 2024 at 18:21:00 +0800, Ye Zhang wrote:
> 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.

Thanks for the updated explanation!

>
> Fixes: 615510fe13bd ("thermal: devfreq_cooling: remove old power model and use EM")
> Cc: 5.11+ <[email protected]> # 5.11+
> Signed-off-by: Ye Zhang <[email protected]>
> ---
> v1 -> v2:
> - Update the commit message.
>
> drivers/thermal/devfreq_cooling.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/thermal/devfreq_cooling.c b/drivers/thermal/devfreq_cooling.c
> index 50dec24e967a..8fd7cf1932cd 100644
> --- a/drivers/thermal/devfreq_cooling.c
> +++ b/drivers/thermal/devfreq_cooling.c
> @@ -214,7 +214,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;

Reviewed-by: Dhruva Gole <[email protected]>


--
Best regards,
Dhruva

2024-03-22 08:51:05

by Lukasz Luba

Subject: Re: [PATCH v2] thermal: devfreq_cooling: Fix perf state when calculate dfc res_util

On 3/21/24 10:21, Ye Zhang wrote:
> 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+ <[email protected]> # 5.11+
> Signed-off-by: Ye Zhang <[email protected]>
> ---
> v1 -> v2:
> - Update the commit message.
>
> drivers/thermal/devfreq_cooling.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/thermal/devfreq_cooling.c b/drivers/thermal/devfreq_cooling.c
> index 50dec24e967a..8fd7cf1932cd 100644
> --- a/drivers/thermal/devfreq_cooling.c
> +++ b/drivers/thermal/devfreq_cooling.c
> @@ -214,7 +214,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 */
> rcu_read_lock();

Thanks, LGTM

Reviewed-by: Lukasz Luba <[email protected]>

2024-03-27 15:39:27

by Rafael J. Wysocki

Subject: Re: [PATCH v2] thermal: devfreq_cooling: Fix perf state when calculate dfc res_util

On Fri, Mar 22, 2024 at 9:50 AM Lukasz Luba <[email protected]> wrote:
>
>
>
> On 3/21/24 10:21, Ye Zhang wrote:
> > 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+ <[email protected]> # 5.11+
> > Signed-off-by: Ye Zhang <[email protected]>
> > ---
> > v1 -> v2:
> > - Update the commit message.
> >
> > drivers/thermal/devfreq_cooling.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/thermal/devfreq_cooling.c b/drivers/thermal/devfreq_cooling.c
> > index 50dec24e967a..8fd7cf1932cd 100644
> > --- a/drivers/thermal/devfreq_cooling.c
> > +++ b/drivers/thermal/devfreq_cooling.c
> > @@ -214,7 +214,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 */
> > rcu_read_lock();
>
> Thanks, LGTM
>
> Reviewed-by: Lukasz Luba <[email protected]>

Applied as 6.9-rc material, thanks!