Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1548030 > unrolled thread
| Started by | Krzysztof Kozlowski <krzk@kernel.org> |
|---|---|
| First post | 2016-12-28 18:40 +0100 |
| Last post | 2016-12-29 12:50 +0100 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
[RESEND] thermal: hwmon: Properly report critical temperature in sysfs Krzysztof Kozlowski <krzk@kernel.org> - 2016-12-28 18:40 +0100
Re: [RESEND] thermal: hwmon: Properly report critical temperature in sysfs Krzysztof Kozlowski <krzk@kernel.org> - 2016-12-29 12:50 +0100
Re: [RESEND] thermal: hwmon: Properly report critical temperature in sysfs Zhang Rui <rui.zhang@intel.com> - 2016-12-29 12:50 +0100
| From | Krzysztof Kozlowski <krzk@kernel.org> |
|---|---|
| Date | 2016-12-28 18:40 +0100 |
| Subject | [RESEND] thermal: hwmon: Properly report critical temperature in sysfs |
| Message-ID | <sTqmJ-2Xg-1@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | Krzysztof Kozlowski <krzk@kernel.org> |
|---|---|
| Date | 2016-12-29 12:50 +0100 |
| Message-ID | <sTHnA-63D-3@gated-at.bofh.it> |
| In reply to | #1548030 |
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
[toc] | [prev] | [next] | [standalone]
| From | Zhang Rui <rui.zhang@intel.com> |
|---|---|
| Date | 2016-12-29 12:50 +0100 |
| Subject | Re: [RESEND] thermal: hwmon: Properly report critical temperature in sysfs |
| Message-ID | <sTHnA-63D-5@gated-at.bofh.it> |
| In reply to | #1548030 |
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;
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web