From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752627AbcL2Lnz (ORCPT ); Thu, 29 Dec 2016 06:43:55 -0500 Received: from mga03.intel.com ([134.134.136.65]:30285 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751199AbcL2Lnx (ORCPT ); Thu, 29 Dec 2016 06:43:53 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,426,1477983600"; d="scan'208";a="48265314" Message-ID: <1483011829.2342.0.camel@intel.com> Subject: Re: [RESEND] thermal: hwmon: Properly report critical temperature in sysfs From: Zhang Rui To: Krzysztof Kozlowski , Eduardo Valentin , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org Date: Thu, 29 Dec 2016 19:43:49 +0800 In-Reply-To: <20161228173528.4419-1-krzk@kernel.org> References: <20161228173528.4419-1-krzk@kernel.org> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.18.5.2-0ubuntu3 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: > Signed-off-by: Krzysztof Kozlowski 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; >