From patchwork Thu Nov 20 16:21:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 5349431 X-Patchwork-Delegate: eduardo.valentin@ti.com Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 435C9C11AC for ; Thu, 20 Nov 2014 16:22:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 54F492010E for ; Thu, 20 Nov 2014 16:22:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6040E201B9 for ; Thu, 20 Nov 2014 16:22:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754913AbaKTQWC (ORCPT ); Thu, 20 Nov 2014 11:22:02 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:31910 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757656AbaKTQWA (ORCPT ); Thu, 20 Nov 2014 11:22:00 -0500 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NFC00069ISNDVC0@mailout4.samsung.com>; Fri, 21 Nov 2014 01:21:59 +0900 (KST) X-AuditID: cbfee61b-f79d76d0000024d6-85-546e1526e20c Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 61.C6.09430.7251E645; Fri, 21 Nov 2014 01:21:59 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NFC00JRUIRUIV90@mmp1.samsung.com>; Fri, 21 Nov 2014 01:21:58 +0900 (KST) From: Lukasz Majewski To: Eduardo Valentin , Zhang Rui Cc: Linux PM list , Thierry Reding , Bartlomiej Zolnierkiewicz , Lukasz Majewski , Mikko Perttunen , Stephen Warren , Abhilash Kesavan , Abhilash Kesavan , Guenter Roeck , linux-kernel@vger.kernel.org, Caesar Wang , Lukasz Majewski Subject: [PATCH v2 3/4] thermal: of: Extend of-thermal to export table of trip points Date: Thu, 20 Nov 2014 17:21:27 +0100 Message-id: <1416500488-7232-4-git-send-email-l.majewski@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1416500488-7232-1-git-send-email-l.majewski@samsung.com> References: <1412872737-624-1-git-send-email-l.majewski@samsung.com> <1416500488-7232-1-git-send-email-l.majewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrGLMWRmVeSWpSXmKPExsVy+t9jAV110bwQgy972C0er1nMZLFxxnpW iy+f+9gs5l+5xmqx5q+SxZtH3BZvHm5mtLi8aw6bxefeI4wWTxaeYbJ4cHUam8WTh0Clrw62 sVj83DWPxYHPY+esu+wei/e8ZPJYN+0ts0dv8zs2j7+z9rN47PzewO7Rt2UVo8fnTXIeG+eG BnBGcdmkpOZklqUW6dslcGU8+q9fsEC+Yu+U9cwNjMcluxg5OCQETCS2z1LvYuQEMsUkLtxb z9bFyMUhJLCIUWLz+q3sIAkhgS4miQcPQ0FsNgE9ic93nzKB2CIC3hKv901nBGlgFmhnkbh+ aDcjSEJYIFxi4s+HTCALWARUJebPCwQJ8wq4SnTvPc4EsUxRovvZBDYQm1PATWLjsmYWiMUN jBIT7rQwTmDkXcDIsIpRNLUguaA4KT3XSK84Mbe4NC9dLzk/dxMjOHSfSe9gXNVgcYhRgINR iYc3wSI3RIg1say4MvcQowQHs5IIrxx7XogQb0piZVVqUX58UWlOavEhRmkOFiVx3hs3gaoF 0hNLUrNTUwtSi2CyTBycUg2MOveeHQ3e3Den64r7I+7T5zzLo8U8O6J+iZ86t9OhOWdRgnhJ 66YLXaEsG5fpfquWfLtJ6kadi1DgRwHO6TOKFDP3HWWfHLt+6hlGvzSuZxda+yf6FKi9XvK1 xcdvmkzes9e/2mrl9805I8amZxi+ITSALUFvhWkXZ23nvWfvLU2577obd35UYinOSDTUYi4q TgQAwWtbu1kCAAA= Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch extends the of-thermal.c to export copy of trip points for a given thermal zone. Thermal drivers should use of_thermal_get_trip_points() method to get pointer to table of thermal trip points. Signed-off-by: Lukasz Majewski --- Changes for v2: - New patch - as suggested by Eduardo Valentin --- drivers/thermal/of-thermal.c | 33 +++++++++++++++++++++++++++++++++ drivers/thermal/thermal_core.h | 7 +++++++ include/linux/thermal.h | 14 ++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c index 336af7f..33921c5 100644 --- a/drivers/thermal/of-thermal.c +++ b/drivers/thermal/of-thermal.c @@ -89,6 +89,7 @@ struct __thermal_zone { /* trip data */ int ntrips; struct __thermal_trip *trips; + struct thermal_trip *gtrips; /* cooling binding data */ int num_tbps; @@ -152,6 +153,27 @@ bool of_thermal_is_trip_en(struct thermal_zone_device *tz, int trip) return true; } +/** + * of_thermal_get_trip_points - function to get access to a globally exported + * trip points + * + * @tz: pointer to a thermal zone + * + * This function provides a pointer to the copy of trip points table + * + * Return: pointer to trip points table, NULL otherwise + */ +const struct thermal_trip * const +of_thermal_get_trip_points(struct thermal_zone_device *tz) +{ + struct __thermal_zone *data = tz->devdata; + + if (!data) + return NULL; + + return data->gtrips; +} + static int of_thermal_get_trend(struct thermal_zone_device *tz, int trip, enum thermal_trend *trend) { @@ -767,6 +789,16 @@ thermal_of_build_thermal_zone(struct device_node *np) goto free_tbps; } + tz->gtrips = kcalloc(tz->ntrips, sizeof(*tz->gtrips), GFP_KERNEL); + if (!tz->gtrips) { + ret = -ENOMEM; + goto free_tbps; + } + + for (i = 0; i < tz->ntrips; i++) + memcpy(&(tz->gtrips[i]), &(tz->trips[i].temperature), + sizeof(*tz->gtrips)); + finish: of_node_put(child); tz->mode = THERMAL_DEVICE_DISABLED; @@ -793,6 +825,7 @@ static inline void of_thermal_free_zone(struct __thermal_zone *tz) { int i; + kfree(tz->gtrips); for (i = 0; i < tz->num_tbps; i++) of_node_put(tz->tbps[i].cooling_device); kfree(tz->tbps); diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h index 466208c..a9580ca 100644 --- a/drivers/thermal/thermal_core.h +++ b/drivers/thermal/thermal_core.h @@ -91,6 +91,8 @@ int of_parse_thermal_zones(void); void of_thermal_destroy_zones(void); int of_thermal_get_ntrips(struct thermal_zone_device *); bool of_thermal_is_trip_en(struct thermal_zone_device *, int); +const struct thermal_trip * const +of_thermal_get_trip_points(struct thermal_zone_device *); #else static inline int of_parse_thermal_zones(void) { return 0; } static inline void of_thermal_destroy_zones(void) { } @@ -102,6 +104,11 @@ static inline bool of_thermal_is_trip_en(struct thermal_zone_device *, int) { return 0; } +static inline const struct thermal_trip * const +of_thermal_get_trip_points(struct thermal_zone_device *) +{ + return NULL; +} #endif #endif /* __THERMAL_CORE_H__ */ diff --git a/include/linux/thermal.h b/include/linux/thermal.h index 5bc28a7..88d7249 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -303,6 +303,20 @@ struct thermal_zone_of_device_ops { int (*get_trend)(void *, long *); }; +/** + * struct thermal_trip - Structure representing themal trip points exported from + * of-thermal + * + * @temperature: trip point temperature + * @hysteresis: trip point hysteresis + * @type: trip point type + */ +struct thermal_trip { + unsigned long int temperature; + unsigned long int hysteresis; + enum thermal_trip_type type; +}; + /* Function declarations */ #ifdef CONFIG_THERMAL_OF struct thermal_zone_device *