* [PATCH v2 3/5] thermal: streamline get_trend callbacks
2016-05-03 9:33 [PATCH v2 0/5] Thermal: Support for hardware-tracked trip points Caesar Wang
@ 2016-05-03 9:33 ` Caesar Wang
2016-05-23 7:32 ` [PATCH v2 0/5] Thermal: Support for hardware-tracked trip points Caesar Wang
1 sibling, 0 replies; 4+ messages in thread
From: Caesar Wang @ 2016-05-03 9:33 UTC (permalink / raw)
To: edubezval
Cc: Heiko Stuebner, dianders, briannorris, smbarber, linux-rockchip,
cf, huangtao, dmitry.torokhov, Sascha Hauer, Caesar Wang,
Zhang Rui, linux-pm, Keerthy, linux-kernel, linux-omap
From: Sascha Hauer <s.hauer@pengutronix.de>
The .get_trend callback in struct thermal_zone_device_ops has
the prototype:
int (*get_trend) (struct thermal_zone_device *, int,
enum thermal_trend *);
whereas the .get_trend callback in struct thermal_zone_of_device_ops
has:
int (*get_trend)(void *, long *);
Streamline both prototypes and add the trip argument to the OF callback
aswell and use enum thermal_trend * instead of an integer pointer.
While the OF prototype may be the better one, this should be decided at
framework level and not on OF level.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Eduardo Valentin <edubezval@gmail.com>
Cc: linux-pm@vger.kernel.org
---
Changes in v2: None
drivers/thermal/of-thermal.c | 11 +---------
drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 25 +++++++---------------
include/linux/thermal.h | 2 +-
3 files changed, 10 insertions(+), 28 deletions(-)
diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
index 8722e63..13833d9 100644
--- a/drivers/thermal/of-thermal.c
+++ b/drivers/thermal/of-thermal.c
@@ -202,24 +202,15 @@ static int of_thermal_get_trend(struct thermal_zone_device *tz, int trip,
enum thermal_trend *trend)
{
struct __thermal_zone *data = tz->devdata;
- long dev_trend;
int r;
if (!data->ops->get_trend)
return -EINVAL;
- r = data->ops->get_trend(data->sensor_data, &dev_trend);
+ r = data->ops->get_trend(data->sensor_data, trip, trend);
if (r)
return r;
- /* TODO: These intervals might have some thresholds, but in core code */
- if (dev_trend > 0)
- *trend = THERMAL_TREND_RAISING;
- else if (dev_trend < 0)
- *trend = THERMAL_TREND_DROPPING;
- else
- *trend = THERMAL_TREND_STABLE;
-
return 0;
}
diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
index 15c0a9a..4a6757c 100644
--- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
+++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
@@ -239,7 +239,7 @@ static int ti_thermal_get_trip_temp(struct thermal_zone_device *thermal,
return 0;
}
-static int __ti_thermal_get_trend(void *p, long *trend)
+static int __ti_thermal_get_trend(void *p, int trip, enum thermal_trend *trend)
{
struct ti_thermal_data *data = p;
struct ti_bandgap *bgp;
@@ -252,22 +252,6 @@ static int __ti_thermal_get_trend(void *p, long *trend)
if (ret)
return ret;
- *trend = tr;
-
- return 0;
-}
-
-/* Get the temperature trend callback functions for thermal zone */
-static int ti_thermal_get_trend(struct thermal_zone_device *thermal,
- int trip, enum thermal_trend *trend)
-{
- int ret;
- long tr;
-
- ret = __ti_thermal_get_trend(thermal->devdata, &tr);
- if (ret)
- return ret;
-
if (tr > 0)
*trend = THERMAL_TREND_RAISING;
else if (tr < 0)
@@ -278,6 +262,13 @@ static int ti_thermal_get_trend(struct thermal_zone_device *thermal,
return 0;
}
+/* Get the temperature trend callback functions for thermal zone */
+static int ti_thermal_get_trend(struct thermal_zone_device *thermal,
+ int trip, enum thermal_trend *trend)
+{
+ return __ti_thermal_get_trend(thermal->devdata, trip, trend);
+}
+
/* Get critical temperature callback functions for thermal zone */
static int ti_thermal_get_crit_temp(struct thermal_zone_device *thermal,
int *temp)
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 09053eb..37cdd16 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -344,7 +344,7 @@ struct thermal_genl_event {
*/
struct thermal_zone_of_device_ops {
int (*get_temp)(void *, int *);
- int (*get_trend)(void *, long *);
+ int (*get_trend)(void *, int, enum thermal_trend *);
int (*set_trips)(void *, int, int);
int (*set_emul_temp)(void *, int);
int (*set_trip_temp)(void *, int, int);
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2 0/5] Thermal: Support for hardware-tracked trip points
2016-05-03 9:33 [PATCH v2 0/5] Thermal: Support for hardware-tracked trip points Caesar Wang
2016-05-03 9:33 ` [PATCH v2 3/5] thermal: streamline get_trend callbacks Caesar Wang
@ 2016-05-23 7:32 ` Caesar Wang
2016-05-24 3:08 ` Eduardo Valentin
1 sibling, 1 reply; 4+ messages in thread
From: Caesar Wang @ 2016-05-23 7:32 UTC (permalink / raw)
To: edubezval, Zhang Rui
Cc: Caesar Wang, Heiko Stuebner, linux-doc, linux-kernel,
Laxman Dewangan, smbarber, Durgadoss R, Jonathan Corbet,
linux-rockchip, briannorris, Andy Champ, huangtao, linux-pm,
Sascha Hauer, Javi Merino, linux-omap, linux-arm-kernel, Ni Wade,
Keerthy, dmitry.torokhov, dianders, Leo Yan, cf
Hello Eduardo & 'Zhang Rui'
Do we have the chance to merge this series patches for next kernel?
I had picked them up in my github, and tested for a period of time with
rockchip inside kernel.
Let me know if someone have some suggestions or against opinios.
Thanks,
-Caesar
On 2016年05月03日 17:33, Caesar Wang wrote:
> The history patches come from Mikko and Sascha.
> http://thread.gmane.org/gmane.linux.power-management.general/59451
>
> Now, I pick them up to continue upstream.
> Nevermind!
>
> This series history patches:
> v1: https://lkml.org/lkml/2016/4/24/227
>
> This series adds support for hardware trip points. It picks up earlier
> work from Mikko Perttunen. Mikko implemented hardware trip points as part
> of the device tree support. It was suggested back then to move the
> functionality to the thermal core instead of putting more code into the
> device tree support. This series does exactly that.
>
> This series patches rebase the conflicts.
> Note that the hardware-tracked trip points are very well tested currently.
>
> Verified and tested on https://github.com/Caesar-github/rockchip/tree/wip/fixes-thermal-0503
> That's based on linux-kernel 20160502.
> .Linux version 4.6.0-rc6-next-20160502-08922-g860ed34 (wxt@nb)
>
>
> Changes in v2:
> - update the sysfs-api.txt for set_trips
> - add the commit in patch[v2 2/5].
> - Update the commit for patch[v2 4/5].
>
> Caesar Wang (1):
> thermal: rockchip: add the set_trips function
>
> Sascha Hauer (4):
> thermal: Add support for hardware-tracked trip points
> thermal: of: implement .set_trips for device tree thermal zones
> thermal: streamline get_trend callbacks
> thermal: bang-bang governor: act on lower trip boundary
>
> Documentation/thermal/sysfs-api.txt | 7 +++
> drivers/thermal/gov_bang_bang.c | 2 +-
> drivers/thermal/of-thermal.c | 23 +++++-----
> drivers/thermal/rockchip_thermal.c | 39 ++++++++++++++++
> drivers/thermal/thermal_core.c | 52 ++++++++++++++++++++++
> drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 25 ++++-------
> include/linux/thermal.h | 9 +++-
> 7 files changed, 128 insertions(+), 29 deletions(-)
>
^ permalink raw reply [flat|nested] 4+ messages in thread