From patchwork Tue Feb 5 10:46:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: durgadoss.r@intel.com X-Patchwork-Id: 2097411 X-Patchwork-Delegate: rui.zhang@intel.com Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 20E8A3FC23 for ; Tue, 5 Feb 2013 10:53:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754948Ab3BEKxE (ORCPT ); Tue, 5 Feb 2013 05:53:04 -0500 Received: from mga14.intel.com ([143.182.124.37]:12496 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754635Ab3BEKwM (ORCPT ); Tue, 5 Feb 2013 05:52:12 -0500 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 05 Feb 2013 02:52:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,602,1355126400"; d="scan'208";a="252768375" Received: from dr3-desktop.iind.intel.com ([10.223.107.127]) by azsmga001.ch.intel.com with ESMTP; 05 Feb 2013 02:52:09 -0800 From: Durgadoss R To: rui.zhang@intel.com, linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, eduardo.valentin@ti.com, hongbo.zhang@linaro.org, wni@nvidia.com, Durgadoss R Subject: [PATCH 5/8] Thermal: Create Thermal map sysfs attributes for a zone Date: Tue, 5 Feb 2013 16:16:20 +0530 Message-Id: <1360061183-14137-6-git-send-email-durgadoss.r@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1360061183-14137-1-git-send-email-durgadoss.r@intel.com> References: <1360061183-14137-1-git-send-email-durgadoss.r@intel.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org This patch creates a thermal map sysfs node under /sys/class/thermal/zoneX/. This contains entries named mapY_trip_type, mapY_sensor_name, mapY_cdev_name, mapY_trip_mask, mapY_weights. Signed-off-by: Durgadoss R --- drivers/thermal/thermal_sys.c | 221 ++++++++++++++++++++++++++++++++++++++++- include/linux/thermal.h | 25 +++++ 2 files changed, 244 insertions(+), 2 deletions(-) diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c index 69a60a4..e284b67 100644 --- a/drivers/thermal/thermal_sys.c +++ b/drivers/thermal/thermal_sys.c @@ -525,6 +525,44 @@ static void remove_cdev_from_zone(struct thermal_zone *tz, tz->cdev_indx--; } +static inline void __remove_map_entry(struct thermal_zone *tz, int indx) +{ + int i; + struct thermal_map_attr *attr = tz->map_attr[indx]; + + for (i = 0; i < NUM_MAP_ATTRS; i++) + device_remove_file(&tz->device, &attr->attrs[i].attr); + + kfree(tz->map_attr[indx]); + tz->map[indx] = NULL; +} + +static void remove_sensor_map_entry(struct thermal_zone *tz, + struct thermal_sensor *ts) +{ + int i; + + for (i = 0; i < MAX_MAPS_PER_ZONE; i++) { + if (tz->map[i] && !strnicmp(ts->name, tz->map[i]->sensor_name, + THERMAL_NAME_LENGTH)) { + __remove_map_entry(tz, i); + } + } +} + +static void remove_cdev_map_entry(struct thermal_zone *tz, + struct thermal_cooling_device *cdev) +{ + int i; + + for (i = 0; i < MAX_MAPS_PER_ZONE; i++) { + if (tz->map[i] && !strnicmp(cdev->type, tz->map[i]->cdev_name, + THERMAL_NAME_LENGTH)) { + __remove_map_entry(tz, i); + } + } +} + /* sys I/F for thermal zone */ #define to_thermal_zone(_dev) \ @@ -917,6 +955,107 @@ policy_show(struct device *dev, struct device_attribute *devattr, char *buf) } static ssize_t +map_ttype_show(struct device *dev, struct device_attribute *attr, char *buf) +{ + char *trip; + int indx; + struct thermal_zone *tz = to_zone(dev); + + if (!sscanf(attr->attr.name, "map%d_trip_type", &indx)) + return -EINVAL; + + if (indx < 0 || indx >= MAX_MAPS_PER_ZONE) + return -EINVAL; + + if (!tz->map[indx]) + return sprintf(buf, "\n"); + + trip = (tz->map[indx]->trip_type == THERMAL_TRIP_ACTIVE) ? + "active" : "passive"; + return sprintf(buf, "%s\n", trip); +} + +static ssize_t map_ts_name_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + int indx; + struct thermal_zone *tz = to_zone(dev); + + if (!sscanf(attr->attr.name, "map%d_sensor_name", &indx)) + return -EINVAL; + + if (indx < 0 || indx >= MAX_MAPS_PER_ZONE) + return -EINVAL; + + if (!tz->map[indx]) + return sprintf(buf, "\n"); + + return sprintf(buf, "%s\n", tz->map[indx]->sensor_name); +} + +static ssize_t map_cdev_name_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + int indx; + struct thermal_zone *tz = to_zone(dev); + + if (!sscanf(attr->attr.name, "map%d_cdev_name", &indx)) + return -EINVAL; + + if (indx < 0 || indx >= MAX_MAPS_PER_ZONE) + return -EINVAL; + + if (!tz->map[indx]) + return sprintf(buf, "\n"); + + return sprintf(buf, "%s\n", tz->map[indx]->cdev_name); +} + +static ssize_t map_trip_mask_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + int indx; + struct thermal_zone *tz = to_zone(dev); + + if (!sscanf(attr->attr.name, "map%d_trip_mask", &indx)) + return -EINVAL; + + if (indx < 0 || indx >= MAX_MAPS_PER_ZONE) + return -EINVAL; + + if (!tz->map[indx]) + return sprintf(buf, "\n"); + + return sprintf(buf, "0x%x\n", tz->map[indx]->trip_mask); +} + +static ssize_t map_weights_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + int i, indx, ret = 0; + struct thermal_map *map; + struct thermal_zone *tz = to_zone(dev); + + if (!sscanf(attr->attr.name, "map%d_weights", &indx)) + return -EINVAL; + + if (indx < 0 || indx >= MAX_MAPS_PER_ZONE) + return -EINVAL; + + if (!tz->map[indx]) + return sprintf(buf, "\n"); + + map = tz->map[indx]; + + ret += sprintf(buf, "%d", map->weights[0]); + for (i = 1; i < map->num_weights; i++) + ret += sprintf(buf + ret, " %d", map->weights[i]); + + ret += sprintf(buf + ret, "\n"); + return ret; +} + +static ssize_t active_show(struct device *dev, struct device_attribute *attr, char *buf) { int i, indx, ret = 0; @@ -1655,8 +1794,10 @@ void thermal_cooling_device_unregister(struct thermal_cooling_device *cdev) mutex_lock(&zone_list_lock); - for_each_thermal_zone(tmp_tz) + for_each_thermal_zone(tmp_tz) { remove_cdev_from_zone(tmp_tz, cdev); + remove_cdev_map_entry(tmp_tz, cdev); + } mutex_unlock(&zone_list_lock); @@ -1994,6 +2135,9 @@ void remove_thermal_zone(struct thermal_zone *tz) kobject_name(&tz->cdevs[i]->device.kobj)); } + for (i = 0; i < MAX_MAPS_PER_ZONE; i++) + __remove_map_entry(tz, i); + release_idr(&thermal_zone_idr, &thermal_idr_lock, tz->id); idr_destroy(&tz->idr); @@ -2039,6 +2183,77 @@ struct thermal_sensor *get_sensor_by_name(const char *name) } EXPORT_SYMBOL(get_sensor_by_name); +static int create_map_attrs(struct thermal_zone *tz, int indx) +{ + int ret, i; + struct thermal_map_attr *attr = tz->map_attr[indx]; + + static const char *const names[NUM_MAP_ATTRS] = { "map%d_trip_type", + "map%d_sensor_name", "map%d_cdev_name", + "map%d_trip_mask", "map%d_weights" }; + static ssize_t (*const rd_ptr[NUM_MAP_ATTRS]) (struct device *dev, + struct device_attribute *devattr, char *buf) = { + map_ttype_show, map_ts_name_show, map_cdev_name_show, + map_trip_mask_show, map_weights_show }; + + for (i = 0; i < NUM_MAP_ATTRS; i++) { + snprintf(attr->attrs[i].name, + THERMAL_NAME_LENGTH, names[i], indx); + attr->attrs[i].attr.attr.name = attr->attrs[i].name; + attr->attrs[i].attr.attr.mode = S_IRUGO; + attr->attrs[i].attr.show = rd_ptr[i]; + sysfs_attr_init(&attr->attrs[i].attr); + + ret = device_create_file(&tz->device, &attr->attrs[i].attr); + if (ret) + goto exit_free; + } + return 0; +exit_free: + while (--i >= 0) + device_remove_file(&tz->device, &attr->attrs[i].attr); + return ret; +} + +int add_map_entry(struct thermal_zone *tz, struct thermal_map *map) +{ + int ret, indx; + + if (!tz || !map) + return -EINVAL; + + mutex_lock(&zone_list_lock); + + for (indx = 0; indx < MAX_MAPS_PER_ZONE; indx++) { + if (tz->map[indx] == NULL) + break; + } + + if (indx >= MAX_MAPS_PER_ZONE) { + ret = -EINVAL; + goto exit; + } + + tz->map_attr[indx] = kzalloc(sizeof(struct thermal_map_attr), + GFP_KERNEL); + if (!tz->map_attr[indx]) { + ret = -ENOMEM; + goto exit; + } + + ret = create_map_attrs(tz, indx); + if (ret) { + kfree(tz->map_attr[indx]); + goto exit; + } + + tz->map[indx] = map; +exit: + mutex_unlock(&zone_list_lock); + return ret; +} +EXPORT_SYMBOL(add_map_entry); + int add_sensor_to_zone(struct thermal_zone *tz, struct thermal_sensor *ts) { int ret; @@ -2243,8 +2458,10 @@ void thermal_sensor_unregister(struct thermal_sensor *ts) mutex_lock(&zone_list_lock); - for_each_thermal_zone(tz) + for_each_thermal_zone(tz) { remove_sensor_from_zone(tz, ts); + remove_sensor_map_entry(tz, ts); + } mutex_unlock(&zone_list_lock); diff --git a/include/linux/thermal.h b/include/linux/thermal.h index 2f68018..4389599 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -60,6 +60,11 @@ #define MAX_CDEVS_PER_ZONE 5 +#define NUM_MAP_ATTRS 5 + +/* If we map each sensor with every possible cdev for a zone */ +#define MAX_MAPS_PER_ZONE (MAX_SENSORS_PER_ZONE * MAX_CDEVS_PER_ZONE) + struct thermal_sensor; struct thermal_zone_device; struct thermal_cooling_device; @@ -167,6 +172,20 @@ struct thermal_attr { char name[THERMAL_NAME_LENGTH]; }; +struct thermal_map { + enum thermal_trip_type trip_type; + char cdev_name[THERMAL_NAME_LENGTH]; + char sensor_name[THERMAL_NAME_LENGTH]; + + int trip_mask; + int num_weights; + int *weights; +}; + +struct thermal_map_attr { + struct thermal_attr attrs[NUM_MAP_ATTRS]; +}; + /* * This structure defines the trip points for a sensor. * The actual values for these trip points come from @@ -256,6 +275,10 @@ struct thermal_zone { /* Thermal sensors trip information */ struct thermal_trip_point *sensor_trip[MAX_SENSORS_PER_ZONE]; struct thermal_trip_attr *trip_attr[MAX_SENSORS_PER_ZONE]; + + /* Thermal map information */ + struct thermal_map *map[MAX_MAPS_PER_ZONE]; + struct thermal_map_attr *map_attr[MAX_MAPS_PER_ZONE]; }; /* Structure that holds thermal governor information */ @@ -341,6 +364,8 @@ struct thermal_cooling_device *get_cdev_by_name(const char *); int add_sensor_trip_info(struct thermal_zone *, struct thermal_sensor *, struct thermal_trip_point *); +int add_map_entry(struct thermal_zone *, struct thermal_map *); + #ifdef CONFIG_NET extern int thermal_generate_netlink_event(struct thermal_zone_device *tz, enum events event);