* [RESEND] thermal: hwmon: Properly report critical temperature in sysfs
@ 2016-12-28 17:35 Krzysztof Kozlowski
2016-12-29 11:43 ` Zhang Rui
0 siblings, 1 reply; 3+ messages in thread
From: Krzysztof Kozlowski @ 2016-12-28 17:35 UTC (permalink / raw)
To: Zhang Rui, Eduardo Valentin, linux-pm, linux-kernel
Cc: Krzysztof Kozlowski, stable
In the critical sysfs entry the thermal hwmon was returning wrong
temperature to the user-space. It was reporting the temperature of the
first trip point instead of the temperature of critical trip point.
For example:
/sys/class/hwmon/hwmon0/temp1_crit:50000
/sys/class/thermal/thermal_zone0/trip_point_0_temp:50000
/sys/class/thermal/thermal_zone0/trip_point_0_type:active
/sys/class/thermal/thermal_zone0/trip_point_3_temp:120000
/sys/class/thermal/thermal_zone0/trip_point_3_type:critical
Since commit e68b16abd91d ("thermal: add hwmon sysfs I/F") the driver
have been registering a sysfs entry if get_crit_temp() callback was
provided. However when accessed, it was calling get_trip_temp() instead
of the get_crit_temp().
Fixes: e68b16abd91d ("thermal: add hwmon sysfs I/F")
Cc: <stable@vger.kernel.org>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
---
drivers/thermal/thermal_hwmon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c
index c41c7742903a..2dcd4194d103 100644
--- a/drivers/thermal/thermal_hwmon.c
+++ b/drivers/thermal/thermal_hwmon.c
@@ -98,7 +98,7 @@ temp_crit_show(struct device *dev, struct device_attribute *attr, char *buf)
int temperature;
int ret;
- ret = tz->ops->get_trip_temp(tz, 0, &temperature);
+ ret = tz->ops->get_crit_temp(tz, &temperature);
if (ret)
return ret;
--
2.9.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [RESEND] thermal: hwmon: Properly report critical temperature in sysfs
2016-12-28 17:35 [RESEND] thermal: hwmon: Properly report critical temperature in sysfs Krzysztof Kozlowski
@ 2016-12-29 11:43 ` Zhang Rui
2016-12-29 11:45 ` Krzysztof Kozlowski
0 siblings, 1 reply; 3+ messages in thread
From: Zhang Rui @ 2016-12-29 11:43 UTC (permalink / raw)
To: Krzysztof Kozlowski, Eduardo Valentin, linux-pm, linux-kernel; +Cc: stable
On Wed, 2016-12-28 at 19:35 +0200, Krzysztof Kozlowski wrote:
> In the critical sysfs entry the thermal hwmon was returning wrong
> temperature to the user-space. It was reporting the temperature of
> the
> first trip point instead of the temperature of critical trip point.
>
> For example:
> /sys/class/hwmon/hwmon0/temp1_crit:50000
> /sys/class/thermal/thermal_zone0/trip_point_0_temp:50000
> /sys/class/thermal/thermal_zone0/trip_point_0_type:active
> /sys/class/thermal/thermal_zone0/trip_point_3_temp:120000
> /sys/class/thermal/thermal_zone0/trip_point_3_type:critical
>
> Since commit e68b16abd91d ("thermal: add hwmon sysfs I/F") the driver
> have been registering a sysfs entry if get_crit_temp() callback was
> provided. However when accessed, it was calling get_trip_temp()
> instead
> of the get_crit_temp().
>
> Fixes: e68b16abd91d ("thermal: add hwmon sysfs I/F")
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
The patch is already in upstream kernel.
thanks,
rui
> ---
> drivers/thermal/thermal_hwmon.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/thermal/thermal_hwmon.c
> b/drivers/thermal/thermal_hwmon.c
> index c41c7742903a..2dcd4194d103 100644
> --- a/drivers/thermal/thermal_hwmon.c
> +++ b/drivers/thermal/thermal_hwmon.c
> @@ -98,7 +98,7 @@ temp_crit_show(struct device *dev, struct
> device_attribute *attr, char *buf)
> int temperature;
> int ret;
>
> - ret = tz->ops->get_trip_temp(tz, 0, &temperature);
> + ret = tz->ops->get_crit_temp(tz, &temperature);
> if (ret)
> return ret;
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [RESEND] thermal: hwmon: Properly report critical temperature in sysfs
2016-12-29 11:43 ` Zhang Rui
@ 2016-12-29 11:45 ` Krzysztof Kozlowski
0 siblings, 0 replies; 3+ messages in thread
From: Krzysztof Kozlowski @ 2016-12-29 11:45 UTC (permalink / raw)
To: Zhang Rui; +Cc: Eduardo Valentin, linux-pm, linux-kernel, stable
On Thu, Dec 29, 2016 at 1:43 PM, Zhang Rui <rui.zhang@intel.com> wrote:
> On Wed, 2016-12-28 at 19:35 +0200, Krzysztof Kozlowski wrote:
>> In the critical sysfs entry the thermal hwmon was returning wrong
>> temperature to the user-space. It was reporting the temperature of
>> the
>> first trip point instead of the temperature of critical trip point.
>>
>> For example:
>> /sys/class/hwmon/hwmon0/temp1_crit:50000
>> /sys/class/thermal/thermal_zone0/trip_point_0_temp:50000
>> /sys/class/thermal/thermal_zone0/trip_point_0_type:active
>> /sys/class/thermal/thermal_zone0/trip_point_3_temp:120000
>> /sys/class/thermal/thermal_zone0/trip_point_3_type:critical
>>
>> Since commit e68b16abd91d ("thermal: add hwmon sysfs I/F") the driver
>> have been registering a sysfs entry if get_crit_temp() callback was
>> provided. However when accessed, it was calling get_trip_temp()
>> instead
>> of the get_crit_temp().
>>
>> Fixes: e68b16abd91d ("thermal: add hwmon sysfs I/F")
>> Cc: <stable@vger.kernel.org>
>> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
>
> The patch is already in upstream kernel.
>
> thanks,
> rui
Ahh, indeed.
Thanks!
Krzysztof
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-12-29 11:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-28 17:35 [RESEND] thermal: hwmon: Properly report critical temperature in sysfs Krzysztof Kozlowski
2016-12-29 11:43 ` Zhang Rui
2016-12-29 11:45 ` Krzysztof Kozlowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).