Re: [PATCH RESEND] thermal/drivers/netlink: Add the temperature when crossing a trip point

[Daniel Lezcano]

On 05/10/2021 17:20, Rafael J. Wysocki wrote:
> On Sat, Oct 2, 2021 at 12:33 AM Daniel Lezcano
> <daniel.lezcano@xxxxxxxxxx> wrote:
>>
>> The slope of the temperature increase or decrease can be high and when
>> the temperature crosses the trip point, there could be a significant
>> difference between the trip temperature and the measured temperatures.
>>
>> That forces the userspace to read the temperature back right after
>> receiving a trip violation notification.
>>
>> In order to be efficient, give the temperature which resulted in the
>> trip violation.
>>
>> Signed-off-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
>> Acked-by: Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxxxxxxxx>
> 
> This looks fine to me too.
> 
>> ---
>>  drivers/thermal/thermal_core.c    |  6 ++++--
>>  drivers/thermal/thermal_netlink.c | 11 ++++++-----
>>  drivers/thermal/thermal_netlink.h |  8 ++++----
>>  3 files changed, 14 insertions(+), 11 deletions(-)
>>
>> diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
>> index 51374f4e1cca..9e243d9f929e 100644
>> --- a/drivers/thermal/thermal_core.c
>> +++ b/drivers/thermal/thermal_core.c
>> @@ -375,10 +375,12 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip)
>>         if (tz->last_temperature != THERMAL_TEMP_INVALID) {
>>                 if (tz->last_temperature < trip_temp &&
>>                     tz->temperature >= trip_temp)
>> -                       thermal_notify_tz_trip_up(tz->id, trip);
>> +                       thermal_notify_tz_trip_up(tz->id, trip,
>> +                                                 tz->temperature);
>>                 if (tz->last_temperature >= trip_temp &&
>>                     tz->temperature < (trip_temp - hyst))
>> -                       thermal_notify_tz_trip_down(tz->id, trip);
>> +                       thermal_notify_tz_trip_down(tz->id, trip,
>> +                                                   tz->temperature);
> 
> While at it, I'm not sure if all of the additional line breaks due to
> the line length limit are really necessary.  The code would be easier
> to follow without them IMV.

Ok let me write another patch to wrap those into a single function and
reduce the indentation.

>>         }
>>
>>         if (type == THERMAL_TRIP_CRITICAL || type == THERMAL_TRIP_HOT)
>> diff --git a/drivers/thermal/thermal_netlink.c b/drivers/thermal/thermal_netlink.c
>> index 1234dbe95895..a16dd4d5d710 100644
>> --- a/drivers/thermal/thermal_netlink.c
>> +++ b/drivers/thermal/thermal_netlink.c
>> @@ -121,7 +121,8 @@ static int thermal_genl_event_tz(struct param *p)
>>  static int thermal_genl_event_tz_trip_up(struct param *p)
>>  {
>>         if (nla_put_u32(p->msg, THERMAL_GENL_ATTR_TZ_ID, p->tz_id) ||
>> -           nla_put_u32(p->msg, THERMAL_GENL_ATTR_TZ_TRIP_ID, p->trip_id))
>> +           nla_put_u32(p->msg, THERMAL_GENL_ATTR_TZ_TRIP_ID, p->trip_id) ||
>> +           nla_put_u32(p->msg, THERMAL_GENL_ATTR_TZ_TEMP, p->temp))
>>                 return -EMSGSIZE;
>>
>>         return 0;
>> @@ -285,16 +286,16 @@ int thermal_notify_tz_disable(int tz_id)
>>         return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_DISABLE, &p);
>>  }
>>
>> -int thermal_notify_tz_trip_down(int tz_id, int trip_id)
>> +int thermal_notify_tz_trip_down(int tz_id, int trip_id, int temp)
>>  {
>> -       struct param p = { .tz_id = tz_id, .trip_id = trip_id };
>> +       struct param p = { .tz_id = tz_id, .trip_id = trip_id, .temp = temp };
>>
>>         return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_TRIP_DOWN, &p);
>>  }
>>
>> -int thermal_notify_tz_trip_up(int tz_id, int trip_id)
>> +int thermal_notify_tz_trip_up(int tz_id, int trip_id, int temp)
>>  {
>> -       struct param p = { .tz_id = tz_id, .trip_id = trip_id };
>> +       struct param p = { .tz_id = tz_id, .trip_id = trip_id, .temp = temp };
>>
>>         return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_TRIP_UP, &p);
>>  }
>> diff --git a/drivers/thermal/thermal_netlink.h b/drivers/thermal/thermal_netlink.h
>> index 828d1dddfa98..e554f76291f4 100644
>> --- a/drivers/thermal/thermal_netlink.h
>> +++ b/drivers/thermal/thermal_netlink.h
>> @@ -11,8 +11,8 @@ int thermal_notify_tz_create(int tz_id, const char *name);
>>  int thermal_notify_tz_delete(int tz_id);
>>  int thermal_notify_tz_enable(int tz_id);
>>  int thermal_notify_tz_disable(int tz_id);
>> -int thermal_notify_tz_trip_down(int tz_id, int id);
>> -int thermal_notify_tz_trip_up(int tz_id, int id);
>> +int thermal_notify_tz_trip_down(int tz_id, int id, int temp);
>> +int thermal_notify_tz_trip_up(int tz_id, int id, int temp);
>>  int thermal_notify_tz_trip_delete(int tz_id, int id);
>>  int thermal_notify_tz_trip_add(int tz_id, int id, int type,
>>                                int temp, int hyst);
>> @@ -49,12 +49,12 @@ static inline int thermal_notify_tz_disable(int tz_id)
>>         return 0;
>>  }
>>
>> -static inline int thermal_notify_tz_trip_down(int tz_id, int id)
>> +static inline int thermal_notify_tz_trip_down(int tz_id, int id, int temp)
>>  {
>>         return 0;
>>  }
>>
>> -static inline int thermal_notify_tz_trip_up(int tz_id, int id)
>> +static inline int thermal_notify_tz_trip_up(int tz_id, int id, int temp)
>>  {
>>         return 0;
>>  }
>> --
>> 2.25.1
>>


-- 
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog