lkml.org 
[lkml]   [2017]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 028/199] thermal: hwmon: Properly report critical temperature in sysfs
    3.2.87-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Krzysztof Kozlowski <krzk@kernel.org>

    commit f37fabb8643eaf8e3b613333a72f683770c85eca upstream.

    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")
    Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
    Signed-off-by: Zhang Rui <rui.zhang@intel.com>
    [bwh: Backported to 3.2: adjust filename]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/thermal/thermal_sys.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/thermal/thermal_sys.c
    +++ b/drivers/thermal/thermal_sys.c
    @@ -486,7 +486,7 @@ temp_crit_show(struct device *dev, struc
    long temperature;
    int ret;

    - ret = tz->ops->get_trip_temp(tz, 0, &temperature);
    + ret = tz->ops->get_crit_temp(tz, &temperature);
    if (ret)
    return ret;

    \
     
     \ /
      Last update: 2017-03-10 13:23    [W:4.037 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site