thermal: rework core to improve userspace interaction
v2 cover thermal: rework core to improve userspace interaction
Hello Rui, linux-pm
Changelog:
V1 -> V2: Fixes patch 2, and added Srivinas reviewed by on patch 1.
Please consider these three patches in the thermal core to improve the interaction with userspace.
The first is already in its second version. It avoids reconfiguring monitor period. Now the thermal core configures the monitor only after handling all trip points.
The second is about improving emul_temp. The background here is to allow using emul_temp, even if the thermal zone is not fully setup, with a missing .get_temp().
The third is to improve hot trip points handling. Hot trip points are described as notification entry points. However, we do very little on them. This patch adds a uevent to propagate the event to userspace. Today, we rely on thermal zone driver. I believe having the same message coming on every thermal zone makes more sense. However, I did not remove the .notify() callback, and it should behave the same.
Eduardo Valentin (3):
thermal: setup monitor only once after handling trips
thermal: rework core to allow emul_temp to be treated as regular temp
thermal: improve hot trip handling
drivers/thermal/thermal_core.c | 96 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 78 insertions(+), 18 deletions(-)
Signature · 1 line
2.5.0
PATCH v2 1/3 thermal: setup monitor only once after handling trips
Instead of changing the monitoring setup every time after handling each trip, this patch simplifies the monitoring setup by moving the setup call to a place where all trips have been treated already.
---
V2: Added Srinivas reviewed by.
--- drivers/thermal/thermal_core.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/thermal/thermal_core.c +6 -5
@@ -457,11 +457,6 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip)handle_critical_trips (tz, trip, type); elsehandle_non_critical_trips (tz ,trip ,type ); -/* -* Alright, we handled this trip successfully. -* So, start monitoring again. -*/ -monitor_thermal_zone (tz); }/**
@@ -547,6 +542,12 @@ void thermal_zone_device_update(struct thermal_zone_device *tz)for (count =0 ; count < tz->trips; count++)handle_thermal_trip (tz, count); + +/* +* Alright, we handled these trips successfully. +* So, start monitoring again. +*/ +monitor_thermal_zone (tz); }EXPORT_SYMBOL_GPL (thermal_zone_device_update);
Signature · 1 line
2.5.0
PATCH v2 2/3 thermal: rework core to allow emul_temp to be treated as regular temp
In reply to Eduardo ValentinChange the way we handle emul_temp. This is to allow emul_temp to be used as input to exercise thermal core properly. Now, even if .get_temp is not available, the emul_temp can be used to emulate temperature.
---
V1-> V2: fixed real_temp initial value.
--- drivers/thermal/thermal_core.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-)
drivers/thermal/thermal_core.c +20 -13
@@ -472,18 +472,25 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip)int thermal_zone_get_temp (struct thermal_zone_device *tz,int *temp) {int ret = -EINVAL ; -int count; -int crit_temp =INT_MAX ; -enum thermal_trip_type type; +int crit_temp =INT_MAX , real_temp =INT_MIN ; -if (!tz ||IS_ERR (tz) || !tz->ops->get_temp) - goto exit; +if (!tz ||IS_ERR (tz)) +return ret;mutex_lock (&tz->lock); - ret = tz->ops->get_temp (tz, temp); +/* Allow emulation if .get_temp is still not available */ +if (tz->ops->get_temp) { + ret = tz->ops->get_temp (tz, temp); +if (!ret) + real_temp = *temp; + }if (IS_ENABLED (CONFIG_THERMAL_EMULATION ) && tz->emul_temperature) { +enum thermal_trip_type type; +int count; + + ret =0 ;for (count =0 ; count < tz->trips; count++) { ret = tz->ops->get_trip_type (tz, count, &type);if (!ret && type ==THERMAL_TRIP_CRITICAL ) {
@@ -498,17 +505,17 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp)* is below the critical temperature so that the emulation code * cannot hide critical conditions. */ -if (!ret && *temp < crit_temp) +if (!ret && real_temp < crit_temp) *temp = tz->emul_temperature; }mutex_unlock (&tz->lock); -exit: +return ret; }EXPORT_SYMBOL_GPL (thermal_zone_get_temp); -static void update_temperature (struct thermal_zone_device *tz) +static int update_temperature (struct thermal_zone_device *tz) {int temp, ret;
@@ -518,7 +525,7 @@ static void update_temperature(struct thermal_zone_device *tz)dev_warn (&tz->device,"failed to read out thermal zone (%d)\n" , ret); -return ; +return ret; }mutex_lock (&tz->lock);
@@ -529,17 +536,17 @@ static void update_temperature(struct thermal_zone_device *tz)trace_thermal_temperature (tz);dev_dbg (&tz->device,"last_temperature=%d, current_temperature=%d\n" , tz->last_temperature, tz->temperature); + +return 0 ; }void thermal_zone_device_update (struct thermal_zone_device *tz) {int count; -if (!tz->ops->get_temp) +if (update_temperature (tz))return ; -update_temperature (tz); -for (count =0 ; count < tz->trips; count++)handle_thermal_trip (tz, count);
Signature · 1 line
2.5.0
Re: [PATCHv2 2/3] thermal: rework core to allow emul_temp to be treated as regular temp
Quoted 9 lines · Eduardo Valentin
Change the way we handle
emul_temp. This is to allowemul_tempto be used as input to exercise thermal core properly. Now, even if .get_temp is not available, theemul_tempcan be used to emulate temperature.Cc Zhang Rui <[email protected]>Signed-off-by Eduardo Valentin <[email protected]>
Quoted 105 lines
---
V1-> V2: fixedreal_tempinitial value.
---
drivers/thermal/thermal_core.c | 33 ++++++++++++++++++++----------
---1 file changed, 20 insertions(+), 13 deletions(-)drivers/thermal/thermal_core.c +1
-3@@ -472,18 +472,25 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip) int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp) { int ret = -EINVAL; -int count; -int crit_temp =INT_MAX ; -enum thermal_trip_type type; +int crit_temp =INT_MAX , real_temp =INT_MIN ;drivers/thermal/thermal_core.c +2
-2-if (!tz ||IS_ERR (tz) || !tz->ops->get_temp) - goto exit; +if (!tz ||IS_ERR (tz)) +return ret;
mutex_lock(&tz->lock);drivers/thermal/thermal_core.c +6
-1- ret = tz->ops->get_temp (tz, temp); +/* Allow emulation if .get_temp is still not available */ +if (tz->ops->get_temp) { + ret = tz->ops->get_temp (tz, temp); +if (!ret) + real_temp = *temp; + }
if (IS_ENABLED(CONFIG_THERMAL_EMULATION)&& tz-Quoted 1 line
emul_temperature) {drivers/thermal/thermal_core.c +4
-0+enum thermal_trip_type type; +int count; + + ret =0 ;for (count = 0; count <
tz->trips; count++) { ret =tz->ops->get_trip_type(tz, count, &type);
if (!ret && type ==THERMAL_TRIP_CRITICAL) {drivers/thermal/thermal_core.c +0
-0@@ -498,17 +505,17 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp) * is below the critical temperature so that theemulation code
* cannot hide critical conditions. */drivers/thermal/thermal_core.c +1
-1-if (!ret && *temp < crit_temp) +if (!ret && real_temp < crit_temp)*temp =
tz->emul_temperature; }
mutex_unlock(&tz->lock);drivers/thermal/thermal_core.c +1
-1-exit: +return ret;
}
EXPORT_SYMBOL_GPL(thermal_zone_get_temp);drivers/thermal/thermal_core.c +1
-1-static void update_temperature (struct thermal_zone_device *tz) +static int update_temperature (struct thermal_zone_device *tz){
int temp, ret;drivers/thermal/thermal_core.c +0
-0@@ -518,7 +525,7 @@ static void update_temperature(struct thermal_zone_device *tz) dev_warn(&tz->device,"failed to read out thermal zone (%d)\n",
ret);drivers/thermal/thermal_core.c +1
-1-return ; +return ret;}
mutex_lock(&tz->lock);drivers/thermal/thermal_core.c +0
-0@@ -529,17 +536,17 @@ static void update_temperature(struct thermal_zone_device *tz) trace_thermal_temperature(tz); dev_dbg(&tz->device, "last_temperature=%d, current_temperature=%d\n",
tz->last_temperature, tz-Quoted 1 line
temperature);
drivers/thermal/thermal_core.c +2
-0+ +return 0 ;}
voidthermal_zone_device_update(struct thermal_zone_device *tz){
int count;drivers/thermal/thermal_core.c +1
-1-if (!tz->ops->get_temp) +if (update_temperature (tz))return;
drivers/thermal/thermal_core.c +0
-2-update_temperature (tz); -for (count = 0; count <
tz->trips; count++)handle_thermal_trip(tz, count);
PATCH v2 3/3 thermal: improve hot trip handling
In reply to Eduardo ValentinThe idea is to add the choice to be notified only when temperature crosses trip points. The trip points affected are the non-passive trip points.
It will check last temperature and current temperature against the trip point temperature and its hysteresis.
In case the check shows temperature has changed enought indicating a trip point crossing, a uevent will be sent to userspace.
The uevent contains the thermal zone type, the current temperature, the last temperature and the trip point in which the current temperature now resides.
The behavior of ops->notify() callback remains the same.
---V1->V2: none
--- drivers/thermal/thermal_core.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)
drivers/thermal/thermal_core.c +52 -0
@@ -423,6 +423,56 @@ static void handle_non_critical_trips(struct thermal_zone_device *tz, def_governor->throttle (tz, trip); } +static void thermal_tripped_notify (struct thermal_zone_device *tz, +int trip,enum thermal_trip_type trip_type, +int trip_temp) +{ +char tuv_name[THERMAL_NAME_LENGTH +15 ], tuv_temp[25 ], + tuv_ltemp[25 ], tuv_trip[25 ], tuv_type[25 ]; +char *msg[6 ] = { tuv_name, tuv_temp, tuv_ltemp, tuv_trip, tuv_type, +NULL }; +int upper_trip_hyst, upper_trip_temp, trip_hyst =0 ; +int ret =0 ; + +snprintf (tuv_name,sizeof (tuv_name),"THERMAL_ZONE=%s" , tz->type); +snprintf (tuv_temp,sizeof (tuv_temp),"TEMP=%d" , tz->temperature); +snprintf (tuv_ltemp,sizeof (tuv_ltemp),"LAST_TEMP=%d" , + tz->last_temperature); +snprintf (tuv_trip,sizeof (tuv_trip),"TRIP=%d" , trip); +snprintf (tuv_type,sizeof (tuv_type),"TRIP_TYPE=%d" , trip_type); + +mutex_lock (&tz->lock); + +/* crossing up */ +if (tz->last_temperature < trip_temp && trip_temp < tz->temperature) +kobject_uevent_env (&tz->device.kobj,KOBJ_CHANGE , msg); + +if (tz->ops->get_trip_hyst) + tz->ops->get_trip_hyst (tz, trip, &trip_hyst); + +/* crossing down, check for hyst */ + trip_temp -= trip_hyst; +if (tz->last_temperature > trip_temp && trip_temp > tz->temperature) { +snprintf (tuv_trip,sizeof (tuv_trip),"TRIP=%d" , trip -1 ); +kobject_uevent_env (&tz->device.kobj,KOBJ_CHANGE , msg); + } + + ret = tz->ops->get_trip_temp (tz, trip +1 , &upper_trip_temp); +if (ret) + goto unlock; + +if (tz->ops->get_trip_hyst) + tz->ops->get_trip_hyst (tz, trip +1 , &upper_trip_hyst); + + upper_trip_temp -= upper_trip_hyst; +if (tz->last_temperature > upper_trip_temp && + upper_trip_temp > tz->temperature) +kobject_uevent_env (&tz->device.kobj,KOBJ_CHANGE , msg); + +unlock: +mutex_unlock (&tz->lock); +} +static void handle_critical_trips (struct thermal_zone_device *tz,int trip,enum thermal_trip_type trip_type) {
@@ -430,6 +480,8 @@ static void handle_critical_trips(struct thermal_zone_device *tz, tz->ops->get_trip_temp (tz, trip, &trip_temp); +thermal_tripped_notify (tz, trip, trip_type, trip_temp); +/* If we have not crossed the trip_temp, we do not care. */ if (trip_temp <=0 || tz->temperature < trip_temp)return ;
Signature · 1 line
2.5.0
Re: [PATCHv2 3/3] thermal: improve hot trip handling
Hi Eduardo,
Quoted 58 lines · Eduardo Valentin
The idea is to add the choice to be notified only when temperature crosses trip points. The trip points affected are the non-passive trip points.
It will check last temperature and current temperature against the trip point temperature and its hysteresis.
In case the check shows temperature has changed enought indicating a trip point crossing, a uevent will be sent to userspace.The uevent contains the thermal zone type, the current temperature, the last temperature and the trip point in which the current temperature now resides.
The behavior of
ops->notify()callback remains the same.Cc Zhang Rui <[email protected]>Signed-off-by Eduardo Valentin <[email protected]>---
V1->V2: none--- drivers/thermal/thermal_core.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)drivers/thermal/thermal_core.c +25
-0@@ -423,6 +423,56 @@ static void handle_non_critical_trips(struct thermal_zone_device *tz, def_governor->throttle (tz, trip); } +static void thermal_tripped_notify (struct thermal_zone_device *tz, +int trip,enum thermal_trip_type trip_type, +int trip_temp) +{ +char tuv_name[THERMAL_NAME_LENGTH +15 ], tuv_temp[25 ], + tuv_ltemp[25 ], tuv_trip[25 ], tuv_type[25 ]; +char *msg[6 ] = { tuv_name, tuv_temp, tuv_ltemp, tuv_trip, tuv_type, +NULL }; +int upper_trip_hyst, upper_trip_temp, trip_hyst =0 ; +int ret =0 ; + +snprintf (tuv_name,sizeof (tuv_name),"THERMAL_ZONE=%s" , tz->type); +snprintf (tuv_temp,sizeof (tuv_temp),"TEMP=%d" , tz->temperature); +snprintf (tuv_ltemp,sizeof (tuv_ltemp),"LAST_TEMP=%d" , + tz->last_temperature); +snprintf (tuv_trip,sizeof (tuv_trip),"TRIP=%d" , trip); +snprintf (tuv_type,sizeof (tuv_type),"TRIP_TYPE=%d" , trip_type); + +mutex_lock (&tz->lock); + +/* crossing up */ +if (tz->last_temperature < trip_temp && trip_temp < tz->temperature) +kobject_uevent_env (&tz->device.kobj,KOBJ_CHANGE , msg); + +if (tz->ops->get_trip_hyst)
drivers/thermal/thermal_core.c static void handle_non_critical_trips(struct thermal_zone_device *tz, · line 460
Quoted 10 lines
drivers/thermal/thermal_core.c +10
-0+ tz->ops->get_trip_hyst (tz, trip, &trip_hyst); + +/* crossing down, check for hyst */ + trip_temp -= trip_hyst; +if (tz->last_temperature > trip_temp && trip_temp > tz->temperature) { +snprintf (tuv_trip,sizeof (tuv_trip),"TRIP=%d" , trip -1 ); +kobject_uevent_env (&tz->device.kobj,KOBJ_CHANGE , msg); + } + + ret = tz->ops->get_trip_temp (tz, trip +1 , &upper_trip_temp);
"trip + 1" may be equal to thermal_zone_device.trips and thus out-of-range, in which case rcar_thermal_get_trip_temp() will print an error message:
rcar_thermal e61f0000.thermal: rcar driver trip error
Is the "+ 1" (also below) intentional?
If yes, I think the related error messages in rcar_thermal.c should be reduced to debug messages.
drivers/thermal/thermal_core.c static void handle_non_critical_trips(struct thermal_zone_device *tz, · line 465
Quoted 5 lines
drivers/thermal/thermal_core.c +5
-0+if (ret) + goto unlock; + +if (tz->ops->get_trip_hyst) + tz->ops->get_trip_hyst (tz, trip +1 , &upper_trip_hyst);
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Re: [PATCHv2 3/3] thermal: improve hot trip handling
Hi Eduardo and Rui,
Quoted 4 lines · Geert Uytterhoeven <geert <at> linux-m68k.org> writes:
Hi Eduardo,
On Thu, Dec 17, 2015 at 8:13 PM, Eduardo Valentin <edubezval <at>
Quoted 4 lines · gmail.com> wrote:
Quoted 4 lines
The idea is to add the choice to be notified only when temperature crosses trip points. The trip points affected are the non-passive trip points.
This is good, how about notifying for non critical trip points as well? This will allow userspace to do workload throttling based on passive thermal trips.
Quoted 7 lines
Quoted 7 lines
It will check last temperature and current temperature against the trip point temperature and its hysteresis.
In case the check shows temperature has changed enought indicating a trip point crossing, a uevent will be sent to userspace.The uevent contains the thermal zone type, the current temperature, the last temperature and the trip point in which the current
temperature
Quoted 1 line
Quoted 1 line
now resides.
How about adding sysfs_notify on some of the existing attributes like trip_point_*_type instead? Since notifying passive trip points using uevents feels expensive we could maybe use sysfs_notify, which would satisfy the requirements for all type of trip points.
Quoted 11 lines
Quoted 11 lines
The behavior of
ops->notify()callback remains the same.Cc Zhang Rui <rui.zhang <at> intel.com>Cc linux-pm <at> vger.kernel.orgCc linux-kernel <at> vger.kernel.orgSigned-off-by Eduardo Valentin <edubezval <at> gmail.com>---
V1->V2: none--- drivers/thermal/thermal_core.c | 52
++++++++++++++++++++++++++++++++++++++++++
Quoted 3 lines
Review
Quoted 3 lines
1 file changed, 52 insertions(+)(quoted diff) +0
-0
b/drivers/thermal/thermal_core.c
Quoted 4 lines
drivers/thermal/thermal_core.c
Quoted 4 lines
index a229c84..e0f1f4e 100644
drivers/thermal/thermal_core.c +0
-0<at> <at> -423,6 +423,56 <at> <at> static void
handle_non_critical_trips(struct thermal_zone_device *tz,
Quoted 5 lines
drivers/thermal/thermal_core.c
Quoted 5 lines
def_governor->throttle(tz, trip);}
drivers/thermal/thermal_core.c +2
-0+static void thermal_tripped_notify (struct thermal_zone_device *tz, + int trip, enum thermal_trip_type
trip_type,
Quoted 5 lines
drivers/thermal/thermal_core.c static void handle_non_critical_trips(struct thermal_zone_device *tz,
Quoted 5 lines
drivers/thermal/thermal_core.c +5
-0+ int trip_temp) +{ +char tuv_name[THERMAL_NAME_LENGTH +15 ], tuv_temp[25 ], + tuv_ltemp[25 ], tuv_trip[25 ], tuv_type[25 ]; +char *msg[6 ] = { tuv_name, tuv_temp, tuv_ltemp, tuv_trip,
tuv_type,
Quoted 5 lines
drivers/thermal/thermal_core.c static void handle_non_critical_trips(struct thermal_zone_device *tz,
Quoted 5 lines
drivers/thermal/thermal_core.c +5
-0+ NULL }; +int upper_trip_hyst, upper_trip_temp, trip_hyst =0 ; +int ret =0 ; + + snprintf(tuv_name, sizeof(tuv_name), "THERMAL_ZONE=%s", tz-
Quoted 7 lines
type);
Quoted 1 line
+ snprintf(tuv_temp,
sizeof(tuv_temp), "TEMP=%d", tz-temperature);
Quoted 4 lines
drivers/thermal/thermal_core.c +4
-0+snprintf (tuv_ltemp,sizeof (tuv_ltemp),"LAST_TEMP=%d" , + tz->last_temperature); +snprintf (tuv_trip,sizeof (tuv_trip),"TRIP=%d" , trip); + snprintf(tuv_type, sizeof(tuv_type), "TRIP_TYPE=%d",
trip_type);
Quoted 6 lines
drivers/thermal/thermal_core.c static void handle_non_critical_trips(struct thermal_zone_device *tz,
Quoted 5 lines
drivers/thermal/thermal_core.c +5
-0+ +mutex_lock (&tz->lock); + +/* crossing up */ + if (tz->last_temperature < trip_temp && trip_temp < tz-temperature)
Quoted 10 lines
drivers/thermal/thermal_core.c static void handle_non_critical_trips(struct thermal_zone_device *tz,
Quoted 8 lines
drivers/thermal/thermal_core.c +8
-0+kobject_uevent_env (&tz->device.kobj,KOBJ_CHANGE , msg); + +if (tz->ops->get_trip_hyst) + tz->ops->get_trip_hyst (tz, trip, &trip_hyst); + +/* crossing down, check for hyst */ + trip_temp -= trip_hyst; + if (tz->last_temperature > trip_temp && trip_temp > tz-temperature) {
Quoted 1 line
+ snprintf(tuv_trip,
sizeof(tuv_trip), "TRIP=%d", trip -
1);
Quoted 6 lines
drivers/thermal/thermal_core.c static void handle_non_critical_trips(struct thermal_zone_device *tz, · line 460
Quoted 4 lines
drivers/thermal/thermal_core.c +4
-0+kobject_uevent_env (&tz->device.kobj,KOBJ_CHANGE , msg); + } + + ret = tz->ops->get_trip_temp (tz, trip +1 , &upper_trip_temp);"trip + 1" may be equal to thermal_zone_device.trips and thus out-of-
range,
Quoted 6 lines
in which case
rcar_thermal_get_trip_temp()will print an error message:
rcar_thermale61f0000.thermal: rcar driver trip errorIs the "+ 1" (also below) intentional?
If yes, I think the related error messages inrcar_thermal.cshould be
reduced
Quoted 8 lines
to debug messages.
drivers/thermal/thermal_core.c static void handle_non_critical_trips(struct thermal_zone_device *tz, · line 465
Quoted 5 lines
drivers/thermal/thermal_core.c +5
-0+if (ret) + goto unlock; + +if (tz->ops->get_trip_hyst) + tz->ops->get_trip_hyst (tz, trip +1 , &upper_trip_hyst);
Quoted 6 lines
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert <at>
linux-m68k.org
Quoted 2 lines
In personal conversations with technical people, I call myself a hacker.
But
Quoted 1 line
when I'm talking to journalists I just say "programmer" or something like
that.
Quoted 7 lines
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo <at> vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Alternate Proposal: Initiate a sysfs_notify on cooling_dev*/cur_state from thermal_cdev_update and a sysfs_notify on thermal_zone*/temp from thermal_zone_device_update whenever there is new state or whenever temperature crosses a trip point.
A userspace app implementing workload throttling would be waiting for these notifications using the poll() method. It could have chosen any combination thermal zone and cooling device cur state to wait on. Upon receiving a notification, it would initiate actions like lowering the frame rate of a camera.
Please let us know your thoughts on the subject.
Thanks,
Srikar
Re: [PATCHv2 3/3] thermal: improve hot trip handling
In reply to Eduardo ValentinQuoted 9 lines · Eduardo Valentin
The idea is to add the choice to be notified only when temperature crosses trip points. The trip points affected are the non-passive trip points.
It will check last temperature and current temperature against the trip point temperature and its hysteresis.
In case the check shows temperature has changed enought indicating a trip point crossing, a uevent will be sent to userspace.
Quoted 7 lines
The uevent contains the thermal zone type, the current temperature, the last temperature and the trip point in which the current temperature
now resides.The behavior of
ops->notify()callback remains the same.
IMO we need to handle also passive/active trips. I have some comments here
https://patchwork.kernel.org/patch/8583171/
Thanks,
Srinivas
Quoted 98 lines
Cc Zhang Rui <[email protected]>Signed-off-by Eduardo Valentin <[email protected]>---
V1->V2: none
---
drivers/thermal/thermal_core.c | 52
++++++++++++++++++++++++++++++++++++++++++1 file changed, 52 insertions(+)drivers/thermal/thermal_core.c +0
-0@@ -423,6 +423,56 @@ static void handle_non_critical_trips(structthermal_zone_device *tz, def_governor->throttle(tz, trip); }drivers/thermal/thermal_core.c +2
-0+static void thermal_tripped_notify (struct thermal_zone_device *tz, + int trip, enum thermal_trip_type
trip_type,drivers/thermal/thermal_core.c +5
-0+ int trip_temp) +{ +char tuv_name[THERMAL_NAME_LENGTH +15 ], tuv_temp[25 ], + tuv_ltemp[25 ], tuv_trip[25 ], tuv_type[25 ]; +char *msg[6 ] = { tuv_name, tuv_temp, tuv_ltemp, tuv_trip,
tuv_type,drivers/thermal/thermal_core.c +5
-0+ NULL }; +int upper_trip_hyst, upper_trip_temp, trip_hyst =0 ; +int ret =0 ; + + snprintf(tuv_name, sizeof(tuv_name), "THERMAL_ZONE=%s", tz-Quoted 1 line
type);
drivers/thermal/thermal_core.c +1
-0+ snprintf(tuv_temp, sizeof(tuv_temp), "TEMP=%d", tz-Quoted 1 line
temperature);
drivers/thermal/thermal_core.c +4
-0+snprintf (tuv_ltemp,sizeof (tuv_ltemp),"LAST_TEMP=%d" , + tz->last_temperature); +snprintf (tuv_trip,sizeof (tuv_trip),"TRIP=%d" , trip); + snprintf(tuv_type, sizeof(tuv_type), "TRIP_TYPE=%d",
trip_type);drivers/thermal/thermal_core.c +5
-0+ +mutex_lock (&tz->lock); + +/* crossing up */ + if (tz->last_temperature < trip_temp && trip_temp < tz-Quoted 1 line
temperature)
drivers/thermal/thermal_core.c +1
-0+ kobject_uevent_env(&tz->device.kobj, KOBJ_CHANGE,msg);
drivers/thermal/thermal_core.c +7
-0+ +if (tz->ops->get_trip_hyst) + tz->ops->get_trip_hyst (tz, trip, &trip_hyst); + +/* crossing down, check for hyst */ + trip_temp -= trip_hyst; + if (tz->last_temperature > trip_temp && trip_temp > tz-Quoted 1 line
temperature) {
drivers/thermal/thermal_core.c +2
-1+ snprintf(tuv_trip, sizeof(tuv_trip), "TRIP=%d", trip - 1); + kobject_uevent_env(&tz->device.kobj, KOBJ_CHANGE,msg);
drivers/thermal/thermal_core.c +3
-0+ } + + ret = tz->ops->get_trip_temp(tz, trip + 1,
&upper_trip_temp);drivers/thermal/thermal_core.c +5
-0+if (ret) + goto unlock; + +if (tz->ops->get_trip_hyst) + tz->ops->get_trip_hyst(tz, trip + 1,
&upper_trip_hyst);drivers/thermal/thermal_core.c +5
-0+ + upper_trip_temp -= upper_trip_hyst; +if (tz->last_temperature > upper_trip_temp && + upper_trip_temp > tz->temperature) + kobject_uevent_env(&tz->device.kobj, KOBJ_CHANGE,msg);
drivers/thermal/thermal_core.c +5
-0+ +unlock: +mutex_unlock (&tz->lock); +} +static void
handle_critical_trips(struct thermal_zone_device *tz, int trip, enum thermal_trip_type trip_type)
{drivers/thermal/thermal_core.c +0
-0@@ -430,6 +480,8 @@ static void handle_critical_trips(struct thermal_zone_device *tz,
tz->ops->get_trip_temp(tz, trip, &trip_temp);drivers/thermal/thermal_core.c +2
-0+thermal_tripped_notify (tz, trip, trip_type, trip_temp); +/* If we have not crossed the
trip_temp, we do not care. */ if (trip_temp<= 0 ||tz->temperature<trip_temp) return;