* [RFC PATCH 1/4] thermal: hwmon: move hwmon support to single file
2013-07-09 14:00 [RFC PATCH 0/4] thermal: introduce DT thermal builder Eduardo Valentin
@ 2013-07-09 14:00 ` Eduardo Valentin
2013-07-09 14:00 ` Eduardo Valentin
` (2 subsequent siblings)
3 siblings, 0 replies; 33+ messages in thread
From: Eduardo Valentin @ 2013-07-09 14:00 UTC (permalink / raw)
To: linux-pm, durgadoss.r, amit.daniel
Cc: rui.zhang, Eduardo Valentin, linux-kernel
In order to improve code organization, this patch
moves the hwmon sysfs support to a file named
thermal_hwmon. This helps to add extra support
for hwmon without scrambling the code.
In order to do this move, the hwmon list head is now
using its own locking. Before, the list used
the global thermal locking.
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
---
drivers/thermal/Kconfig | 9 ++
drivers/thermal/Makefile | 3 +
drivers/thermal/thermal_core.c | 255 +-------------------------------------
drivers/thermal/thermal_hwmon.c | 268 ++++++++++++++++++++++++++++++++++++++++
drivers/thermal/thermal_hwmon.h | 49 ++++++++
5 files changed, 330 insertions(+), 254 deletions(-)
create mode 100644 drivers/thermal/thermal_hwmon.c
create mode 100644 drivers/thermal/thermal_hwmon.h
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index e988c81..7fb16bc 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -17,8 +17,17 @@ if THERMAL
config THERMAL_HWMON
bool
+ prompt "Expose thermal sensors as hwmon device"
depends on HWMON=y || HWMON=THERMAL
default y
+ help
+ In case a sensor is registered with the thermal
+ framework, this option will also register it
+ as a hwmon. The sensor will then have the common
+ hwmon sysfs interface.
+
+ Say 'Y' here if you want all thermal sensors to
+ have hwmon sysfs interface too.
choice
prompt "Default Thermal governor"
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 67184a2..24cb894 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -5,6 +5,9 @@
obj-$(CONFIG_THERMAL) += thermal_sys.o
thermal_sys-y += thermal_core.o
+# interface to/from other layers providing sensors
+thermal_sys-$(CONFIG_THERMAL_HWMON) += thermal_hwmon.o
+
# governors
thermal_sys-$(CONFIG_THERMAL_GOV_FAIR_SHARE) += fair_share.o
thermal_sys-$(CONFIG_THERMAL_GOV_STEP_WISE) += step_wise.o
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 1f02e8e..247528b 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -38,6 +38,7 @@
#include <net/genetlink.h>
#include "thermal_core.h"
+#include "thermal_hwmon.h"
MODULE_AUTHOR("Zhang Rui");
MODULE_DESCRIPTION("Generic thermal management sysfs support");
@@ -859,260 +860,6 @@ thermal_cooling_device_trip_point_show(struct device *dev,
/* Device management */
-#if defined(CONFIG_THERMAL_HWMON)
-
-/* hwmon sys I/F */
-#include <linux/hwmon.h>
-
-/* thermal zone devices with the same type share one hwmon device */
-struct thermal_hwmon_device {
- char type[THERMAL_NAME_LENGTH];
- struct device *device;
- int count;
- struct list_head tz_list;
- struct list_head node;
-};
-
-struct thermal_hwmon_attr {
- struct device_attribute attr;
- char name[16];
-};
-
-/* one temperature input for each thermal zone */
-struct thermal_hwmon_temp {
- struct list_head hwmon_node;
- struct thermal_zone_device *tz;
- struct thermal_hwmon_attr temp_input; /* hwmon sys attr */
- struct thermal_hwmon_attr temp_crit; /* hwmon sys attr */
-};
-
-static LIST_HEAD(thermal_hwmon_list);
-
-static ssize_t
-name_show(struct device *dev, struct device_attribute *attr, char *buf)
-{
- struct thermal_hwmon_device *hwmon = dev_get_drvdata(dev);
- return sprintf(buf, "%s\n", hwmon->type);
-}
-static DEVICE_ATTR(name, 0444, name_show, NULL);
-
-static ssize_t
-temp_input_show(struct device *dev, struct device_attribute *attr, char *buf)
-{
- long temperature;
- int ret;
- struct thermal_hwmon_attr *hwmon_attr
- = container_of(attr, struct thermal_hwmon_attr, attr);
- struct thermal_hwmon_temp *temp
- = container_of(hwmon_attr, struct thermal_hwmon_temp,
- temp_input);
- struct thermal_zone_device *tz = temp->tz;
-
- ret = thermal_zone_get_temp(tz, &temperature);
-
- if (ret)
- return ret;
-
- return sprintf(buf, "%ld\n", temperature);
-}
-
-static ssize_t
-temp_crit_show(struct device *dev, struct device_attribute *attr,
- char *buf)
-{
- struct thermal_hwmon_attr *hwmon_attr
- = container_of(attr, struct thermal_hwmon_attr, attr);
- struct thermal_hwmon_temp *temp
- = container_of(hwmon_attr, struct thermal_hwmon_temp,
- temp_crit);
- struct thermal_zone_device *tz = temp->tz;
- long temperature;
- int ret;
-
- ret = tz->ops->get_trip_temp(tz, 0, &temperature);
- if (ret)
- return ret;
-
- return sprintf(buf, "%ld\n", temperature);
-}
-
-
-static struct thermal_hwmon_device *
-thermal_hwmon_lookup_by_type(const struct thermal_zone_device *tz)
-{
- struct thermal_hwmon_device *hwmon;
-
- mutex_lock(&thermal_list_lock);
- list_for_each_entry(hwmon, &thermal_hwmon_list, node)
- if (!strcmp(hwmon->type, tz->type)) {
- mutex_unlock(&thermal_list_lock);
- return hwmon;
- }
- mutex_unlock(&thermal_list_lock);
-
- return NULL;
-}
-
-/* Find the temperature input matching a given thermal zone */
-static struct thermal_hwmon_temp *
-thermal_hwmon_lookup_temp(const struct thermal_hwmon_device *hwmon,
- const struct thermal_zone_device *tz)
-{
- struct thermal_hwmon_temp *temp;
-
- mutex_lock(&thermal_list_lock);
- list_for_each_entry(temp, &hwmon->tz_list, hwmon_node)
- if (temp->tz == tz) {
- mutex_unlock(&thermal_list_lock);
- return temp;
- }
- mutex_unlock(&thermal_list_lock);
-
- return NULL;
-}
-
-static int
-thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
-{
- struct thermal_hwmon_device *hwmon;
- struct thermal_hwmon_temp *temp;
- int new_hwmon_device = 1;
- int result;
-
- hwmon = thermal_hwmon_lookup_by_type(tz);
- if (hwmon) {
- new_hwmon_device = 0;
- goto register_sys_interface;
- }
-
- hwmon = kzalloc(sizeof(struct thermal_hwmon_device), GFP_KERNEL);
- if (!hwmon)
- return -ENOMEM;
-
- INIT_LIST_HEAD(&hwmon->tz_list);
- strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH);
- hwmon->device = hwmon_device_register(NULL);
- if (IS_ERR(hwmon->device)) {
- result = PTR_ERR(hwmon->device);
- goto free_mem;
- }
- dev_set_drvdata(hwmon->device, hwmon);
- result = device_create_file(hwmon->device, &dev_attr_name);
- if (result)
- goto free_mem;
-
- register_sys_interface:
- temp = kzalloc(sizeof(struct thermal_hwmon_temp), GFP_KERNEL);
- if (!temp) {
- result = -ENOMEM;
- goto unregister_name;
- }
-
- temp->tz = tz;
- hwmon->count++;
-
- snprintf(temp->temp_input.name, sizeof(temp->temp_input.name),
- "temp%d_input", hwmon->count);
- temp->temp_input.attr.attr.name = temp->temp_input.name;
- temp->temp_input.attr.attr.mode = 0444;
- temp->temp_input.attr.show = temp_input_show;
- sysfs_attr_init(&temp->temp_input.attr.attr);
- result = device_create_file(hwmon->device, &temp->temp_input.attr);
- if (result)
- goto free_temp_mem;
-
- if (tz->ops->get_crit_temp) {
- unsigned long temperature;
- if (!tz->ops->get_crit_temp(tz, &temperature)) {
- snprintf(temp->temp_crit.name,
- sizeof(temp->temp_crit.name),
- "temp%d_crit", hwmon->count);
- temp->temp_crit.attr.attr.name = temp->temp_crit.name;
- temp->temp_crit.attr.attr.mode = 0444;
- temp->temp_crit.attr.show = temp_crit_show;
- sysfs_attr_init(&temp->temp_crit.attr.attr);
- result = device_create_file(hwmon->device,
- &temp->temp_crit.attr);
- if (result)
- goto unregister_input;
- }
- }
-
- mutex_lock(&thermal_list_lock);
- if (new_hwmon_device)
- list_add_tail(&hwmon->node, &thermal_hwmon_list);
- list_add_tail(&temp->hwmon_node, &hwmon->tz_list);
- mutex_unlock(&thermal_list_lock);
-
- return 0;
-
- unregister_input:
- device_remove_file(hwmon->device, &temp->temp_input.attr);
- free_temp_mem:
- kfree(temp);
- unregister_name:
- if (new_hwmon_device) {
- device_remove_file(hwmon->device, &dev_attr_name);
- hwmon_device_unregister(hwmon->device);
- }
- free_mem:
- if (new_hwmon_device)
- kfree(hwmon);
-
- return result;
-}
-
-static void
-thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
-{
- struct thermal_hwmon_device *hwmon;
- struct thermal_hwmon_temp *temp;
-
- hwmon = thermal_hwmon_lookup_by_type(tz);
- if (unlikely(!hwmon)) {
- /* Should never happen... */
- dev_dbg(&tz->device, "hwmon device lookup failed!\n");
- return;
- }
-
- temp = thermal_hwmon_lookup_temp(hwmon, tz);
- if (unlikely(!temp)) {
- /* Should never happen... */
- dev_dbg(&tz->device, "temperature input lookup failed!\n");
- return;
- }
-
- device_remove_file(hwmon->device, &temp->temp_input.attr);
- if (tz->ops->get_crit_temp)
- device_remove_file(hwmon->device, &temp->temp_crit.attr);
-
- mutex_lock(&thermal_list_lock);
- list_del(&temp->hwmon_node);
- kfree(temp);
- if (!list_empty(&hwmon->tz_list)) {
- mutex_unlock(&thermal_list_lock);
- return;
- }
- list_del(&hwmon->node);
- mutex_unlock(&thermal_list_lock);
-
- device_remove_file(hwmon->device, &dev_attr_name);
- hwmon_device_unregister(hwmon->device);
- kfree(hwmon);
-}
-#else
-static int
-thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
-{
- return 0;
-}
-
-static void
-thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
-{
-}
-#endif
-
/**
* thermal_zone_bind_cooling_device() - bind a cooling device to a thermal zone
* @tz: pointer to struct thermal_zone_device
diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c
new file mode 100644
index 0000000..7c665c8
--- /dev/null
+++ b/drivers/thermal/thermal_hwmon.c
@@ -0,0 +1,268 @@
+/*
+ * thermal_hwmon.c - Generic Thermal Management hwmon support.
+ *
+ * Code based on Intel thermal_core.c. Copyrights of the original code:
+ * Copyright (C) 2008 Intel Corp
+ * Copyright (C) 2008 Zhang Rui <rui.zhang@intel.com>
+ * Copyright (C) 2008 Sujith Thomas <sujith.thomas@intel.com>
+ *
+ * Copyright (C) 2013 Texas Instruments
+ * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+#include <linux/hwmon.h>
+#include <linux/thermal.h>
+#include <linux/slab.h>
+#include <linux/err.h>
+
+/* hwmon sys I/F */
+/* thermal zone devices with the same type share one hwmon device */
+struct thermal_hwmon_device {
+ char type[THERMAL_NAME_LENGTH];
+ struct device *device;
+ int count;
+ struct list_head tz_list;
+ struct list_head node;
+};
+
+struct thermal_hwmon_attr {
+ struct device_attribute attr;
+ char name[16];
+};
+
+/* one temperature input for each thermal zone */
+struct thermal_hwmon_temp {
+ struct list_head hwmon_node;
+ struct thermal_zone_device *tz;
+ struct thermal_hwmon_attr temp_input; /* hwmon sys attr */
+ struct thermal_hwmon_attr temp_crit; /* hwmon sys attr */
+};
+
+static LIST_HEAD(thermal_hwmon_list);
+
+static DEFINE_MUTEX(thermal_hwmon_list_lock);
+
+static ssize_t
+name_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+ struct thermal_hwmon_device *hwmon = dev_get_drvdata(dev);
+ return sprintf(buf, "%s\n", hwmon->type);
+}
+static DEVICE_ATTR(name, 0444, name_show, NULL);
+
+static ssize_t
+temp_input_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+ long temperature;
+ int ret;
+ struct thermal_hwmon_attr *hwmon_attr
+ = container_of(attr, struct thermal_hwmon_attr, attr);
+ struct thermal_hwmon_temp *temp
+ = container_of(hwmon_attr, struct thermal_hwmon_temp,
+ temp_input);
+ struct thermal_zone_device *tz = temp->tz;
+
+ ret = thermal_zone_get_temp(tz, &temperature);
+
+ if (ret)
+ return ret;
+
+ return sprintf(buf, "%ld\n", temperature);
+}
+
+static ssize_t
+temp_crit_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+ struct thermal_hwmon_attr *hwmon_attr
+ = container_of(attr, struct thermal_hwmon_attr, attr);
+ struct thermal_hwmon_temp *temp
+ = container_of(hwmon_attr, struct thermal_hwmon_temp,
+ temp_crit);
+ struct thermal_zone_device *tz = temp->tz;
+ long temperature;
+ int ret;
+
+ ret = tz->ops->get_trip_temp(tz, 0, &temperature);
+ if (ret)
+ return ret;
+
+ return sprintf(buf, "%ld\n", temperature);
+}
+
+
+static struct thermal_hwmon_device *
+thermal_hwmon_lookup_by_type(const struct thermal_zone_device *tz)
+{
+ struct thermal_hwmon_device *hwmon;
+
+ mutex_lock(&thermal_hwmon_list_lock);
+ list_for_each_entry(hwmon, &thermal_hwmon_list, node)
+ if (!strcmp(hwmon->type, tz->type)) {
+ mutex_unlock(&thermal_hwmon_list_lock);
+ return hwmon;
+ }
+ mutex_unlock(&thermal_hwmon_list_lock);
+
+ return NULL;
+}
+
+/* Find the temperature input matching a given thermal zone */
+static struct thermal_hwmon_temp *
+thermal_hwmon_lookup_temp(const struct thermal_hwmon_device *hwmon,
+ const struct thermal_zone_device *tz)
+{
+ struct thermal_hwmon_temp *temp;
+
+ mutex_lock(&thermal_hwmon_list_lock);
+ list_for_each_entry(temp, &hwmon->tz_list, hwmon_node)
+ if (temp->tz == tz) {
+ mutex_unlock(&thermal_hwmon_list_lock);
+ return temp;
+ }
+ mutex_unlock(&thermal_hwmon_list_lock);
+
+ return NULL;
+}
+
+int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
+{
+ struct thermal_hwmon_device *hwmon;
+ struct thermal_hwmon_temp *temp;
+ int new_hwmon_device = 1;
+ int result;
+
+ hwmon = thermal_hwmon_lookup_by_type(tz);
+ if (hwmon) {
+ new_hwmon_device = 0;
+ goto register_sys_interface;
+ }
+
+ hwmon = kzalloc(sizeof(struct thermal_hwmon_device), GFP_KERNEL);
+ if (!hwmon)
+ return -ENOMEM;
+
+ INIT_LIST_HEAD(&hwmon->tz_list);
+ strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH);
+ hwmon->device = hwmon_device_register(NULL);
+ if (IS_ERR(hwmon->device)) {
+ result = PTR_ERR(hwmon->device);
+ goto free_mem;
+ }
+ dev_set_drvdata(hwmon->device, hwmon);
+ result = device_create_file(hwmon->device, &dev_attr_name);
+ if (result)
+ goto free_mem;
+
+ register_sys_interface:
+ temp = kzalloc(sizeof(struct thermal_hwmon_temp), GFP_KERNEL);
+ if (!temp) {
+ result = -ENOMEM;
+ goto unregister_name;
+ }
+
+ temp->tz = tz;
+ hwmon->count++;
+
+ snprintf(temp->temp_input.name, sizeof(temp->temp_input.name),
+ "temp%d_input", hwmon->count);
+ temp->temp_input.attr.attr.name = temp->temp_input.name;
+ temp->temp_input.attr.attr.mode = 0444;
+ temp->temp_input.attr.show = temp_input_show;
+ sysfs_attr_init(&temp->temp_input.attr.attr);
+ result = device_create_file(hwmon->device, &temp->temp_input.attr);
+ if (result)
+ goto free_temp_mem;
+
+ if (tz->ops->get_crit_temp) {
+ unsigned long temperature;
+ if (!tz->ops->get_crit_temp(tz, &temperature)) {
+ snprintf(temp->temp_crit.name,
+ sizeof(temp->temp_crit.name),
+ "temp%d_crit", hwmon->count);
+ temp->temp_crit.attr.attr.name = temp->temp_crit.name;
+ temp->temp_crit.attr.attr.mode = 0444;
+ temp->temp_crit.attr.show = temp_crit_show;
+ sysfs_attr_init(&temp->temp_crit.attr.attr);
+ result = device_create_file(hwmon->device,
+ &temp->temp_crit.attr);
+ if (result)
+ goto unregister_input;
+ }
+ }
+
+ mutex_lock(&thermal_hwmon_list_lock);
+ if (new_hwmon_device)
+ list_add_tail(&hwmon->node, &thermal_hwmon_list);
+ list_add_tail(&temp->hwmon_node, &hwmon->tz_list);
+ mutex_unlock(&thermal_hwmon_list_lock);
+
+ return 0;
+
+ unregister_input:
+ device_remove_file(hwmon->device, &temp->temp_input.attr);
+ free_temp_mem:
+ kfree(temp);
+ unregister_name:
+ if (new_hwmon_device) {
+ device_remove_file(hwmon->device, &dev_attr_name);
+ hwmon_device_unregister(hwmon->device);
+ }
+ free_mem:
+ if (new_hwmon_device)
+ kfree(hwmon);
+
+ return result;
+}
+
+void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
+{
+ struct thermal_hwmon_device *hwmon;
+ struct thermal_hwmon_temp *temp;
+
+ hwmon = thermal_hwmon_lookup_by_type(tz);
+ if (unlikely(!hwmon)) {
+ /* Should never happen... */
+ dev_dbg(&tz->device, "hwmon device lookup failed!\n");
+ return;
+ }
+
+ temp = thermal_hwmon_lookup_temp(hwmon, tz);
+ if (unlikely(!temp)) {
+ /* Should never happen... */
+ dev_dbg(&tz->device, "temperature input lookup failed!\n");
+ return;
+ }
+
+ device_remove_file(hwmon->device, &temp->temp_input.attr);
+ if (tz->ops->get_crit_temp)
+ device_remove_file(hwmon->device, &temp->temp_crit.attr);
+
+ mutex_lock(&thermal_hwmon_list_lock);
+ list_del(&temp->hwmon_node);
+ kfree(temp);
+ if (!list_empty(&hwmon->tz_list)) {
+ mutex_unlock(&thermal_hwmon_list_lock);
+ return;
+ }
+ list_del(&hwmon->node);
+ mutex_unlock(&thermal_hwmon_list_lock);
+
+ device_remove_file(hwmon->device, &dev_attr_name);
+ hwmon_device_unregister(hwmon->device);
+ kfree(hwmon);
+}
diff --git a/drivers/thermal/thermal_hwmon.h b/drivers/thermal/thermal_hwmon.h
new file mode 100644
index 0000000..c798fdb
--- /dev/null
+++ b/drivers/thermal/thermal_hwmon.h
@@ -0,0 +1,49 @@
+/*
+ * thermal_hwmon.h - Generic Thermal Management hwmon support.
+ *
+ * Code based on Intel thermal_core.c. Copyrights of the original code:
+ * Copyright (C) 2008 Intel Corp
+ * Copyright (C) 2008 Zhang Rui <rui.zhang@intel.com>
+ * Copyright (C) 2008 Sujith Thomas <sujith.thomas@intel.com>
+ *
+ * Copyright (C) 2013 Texas Instruments
+ * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+#ifndef __THERMAL_HWMON_H__
+#define __THERMAL_HWMON_H__
+
+#include <linux/thermal.h>
+
+#ifdef CONFIG_THERMAL_HWMON
+int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz);
+void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz);
+#else
+static int
+thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
+{
+ return 0;
+}
+
+static void
+thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
+{
+}
+#endif
+
+#endif /* __THERMAL_HWMON_H__ */
--
1.8.2.1.342.gfa7285d
^ permalink raw reply related [flat|nested] 33+ messages in thread* [RFC PATCH 1/4] thermal: hwmon: move hwmon support to single file
@ 2013-07-09 14:00 ` Eduardo Valentin
0 siblings, 0 replies; 33+ messages in thread
From: Eduardo Valentin @ 2013-07-09 14:00 UTC (permalink / raw)
To: linux-pm, durgadoss.r, amit.daniel
Cc: rui.zhang, Eduardo Valentin, linux-kernel
In order to improve code organization, this patch
moves the hwmon sysfs support to a file named
thermal_hwmon. This helps to add extra support
for hwmon without scrambling the code.
In order to do this move, the hwmon list head is now
using its own locking. Before, the list used
the global thermal locking.
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
---
drivers/thermal/Kconfig | 9 ++
drivers/thermal/Makefile | 3 +
drivers/thermal/thermal_core.c | 255 +-------------------------------------
drivers/thermal/thermal_hwmon.c | 268 ++++++++++++++++++++++++++++++++++++++++
drivers/thermal/thermal_hwmon.h | 49 ++++++++
5 files changed, 330 insertions(+), 254 deletions(-)
create mode 100644 drivers/thermal/thermal_hwmon.c
create mode 100644 drivers/thermal/thermal_hwmon.h
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index e988c81..7fb16bc 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -17,8 +17,17 @@ if THERMAL
config THERMAL_HWMON
bool
+ prompt "Expose thermal sensors as hwmon device"
depends on HWMON=y || HWMON=THERMAL
default y
+ help
+ In case a sensor is registered with the thermal
+ framework, this option will also register it
+ as a hwmon. The sensor will then have the common
+ hwmon sysfs interface.
+
+ Say 'Y' here if you want all thermal sensors to
+ have hwmon sysfs interface too.
choice
prompt "Default Thermal governor"
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 67184a2..24cb894 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -5,6 +5,9 @@
obj-$(CONFIG_THERMAL) += thermal_sys.o
thermal_sys-y += thermal_core.o
+# interface to/from other layers providing sensors
+thermal_sys-$(CONFIG_THERMAL_HWMON) += thermal_hwmon.o
+
# governors
thermal_sys-$(CONFIG_THERMAL_GOV_FAIR_SHARE) += fair_share.o
thermal_sys-$(CONFIG_THERMAL_GOV_STEP_WISE) += step_wise.o
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 1f02e8e..247528b 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -38,6 +38,7 @@
#include <net/genetlink.h>
#include "thermal_core.h"
+#include "thermal_hwmon.h"
MODULE_AUTHOR("Zhang Rui");
MODULE_DESCRIPTION("Generic thermal management sysfs support");
@@ -859,260 +860,6 @@ thermal_cooling_device_trip_point_show(struct device *dev,
/* Device management */
-#if defined(CONFIG_THERMAL_HWMON)
-
-/* hwmon sys I/F */
-#include <linux/hwmon.h>
-
-/* thermal zone devices with the same type share one hwmon device */
-struct thermal_hwmon_device {
- char type[THERMAL_NAME_LENGTH];
- struct device *device;
- int count;
- struct list_head tz_list;
- struct list_head node;
-};
-
-struct thermal_hwmon_attr {
- struct device_attribute attr;
- char name[16];
-};
-
-/* one temperature input for each thermal zone */
-struct thermal_hwmon_temp {
- struct list_head hwmon_node;
- struct thermal_zone_device *tz;
- struct thermal_hwmon_attr temp_input; /* hwmon sys attr */
- struct thermal_hwmon_attr temp_crit; /* hwmon sys attr */
-};
-
-static LIST_HEAD(thermal_hwmon_list);
-
-static ssize_t
-name_show(struct device *dev, struct device_attribute *attr, char *buf)
-{
- struct thermal_hwmon_device *hwmon = dev_get_drvdata(dev);
- return sprintf(buf, "%s\n", hwmon->type);
-}
-static DEVICE_ATTR(name, 0444, name_show, NULL);
-
-static ssize_t
-temp_input_show(struct device *dev, struct device_attribute *attr, char *buf)
-{
- long temperature;
- int ret;
- struct thermal_hwmon_attr *hwmon_attr
- = container_of(attr, struct thermal_hwmon_attr, attr);
- struct thermal_hwmon_temp *temp
- = container_of(hwmon_attr, struct thermal_hwmon_temp,
- temp_input);
- struct thermal_zone_device *tz = temp->tz;
-
- ret = thermal_zone_get_temp(tz, &temperature);
-
- if (ret)
- return ret;
-
- return sprintf(buf, "%ld\n", temperature);
-}
-
-static ssize_t
-temp_crit_show(struct device *dev, struct device_attribute *attr,
- char *buf)
-{
- struct thermal_hwmon_attr *hwmon_attr
- = container_of(attr, struct thermal_hwmon_attr, attr);
- struct thermal_hwmon_temp *temp
- = container_of(hwmon_attr, struct thermal_hwmon_temp,
- temp_crit);
- struct thermal_zone_device *tz = temp->tz;
- long temperature;
- int ret;
-
- ret = tz->ops->get_trip_temp(tz, 0, &temperature);
- if (ret)
- return ret;
-
- return sprintf(buf, "%ld\n", temperature);
-}
-
-
-static struct thermal_hwmon_device *
-thermal_hwmon_lookup_by_type(const struct thermal_zone_device *tz)
-{
- struct thermal_hwmon_device *hwmon;
-
- mutex_lock(&thermal_list_lock);
- list_for_each_entry(hwmon, &thermal_hwmon_list, node)
- if (!strcmp(hwmon->type, tz->type)) {
- mutex_unlock(&thermal_list_lock);
- return hwmon;
- }
- mutex_unlock(&thermal_list_lock);
-
- return NULL;
-}
-
-/* Find the temperature input matching a given thermal zone */
-static struct thermal_hwmon_temp *
-thermal_hwmon_lookup_temp(const struct thermal_hwmon_device *hwmon,
- const struct thermal_zone_device *tz)
-{
- struct thermal_hwmon_temp *temp;
-
- mutex_lock(&thermal_list_lock);
- list_for_each_entry(temp, &hwmon->tz_list, hwmon_node)
- if (temp->tz == tz) {
- mutex_unlock(&thermal_list_lock);
- return temp;
- }
- mutex_unlock(&thermal_list_lock);
-
- return NULL;
-}
-
-static int
-thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
-{
- struct thermal_hwmon_device *hwmon;
- struct thermal_hwmon_temp *temp;
- int new_hwmon_device = 1;
- int result;
-
- hwmon = thermal_hwmon_lookup_by_type(tz);
- if (hwmon) {
- new_hwmon_device = 0;
- goto register_sys_interface;
- }
-
- hwmon = kzalloc(sizeof(struct thermal_hwmon_device), GFP_KERNEL);
- if (!hwmon)
- return -ENOMEM;
-
- INIT_LIST_HEAD(&hwmon->tz_list);
- strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH);
- hwmon->device = hwmon_device_register(NULL);
- if (IS_ERR(hwmon->device)) {
- result = PTR_ERR(hwmon->device);
- goto free_mem;
- }
- dev_set_drvdata(hwmon->device, hwmon);
- result = device_create_file(hwmon->device, &dev_attr_name);
- if (result)
- goto free_mem;
-
- register_sys_interface:
- temp = kzalloc(sizeof(struct thermal_hwmon_temp), GFP_KERNEL);
- if (!temp) {
- result = -ENOMEM;
- goto unregister_name;
- }
-
- temp->tz = tz;
- hwmon->count++;
-
- snprintf(temp->temp_input.name, sizeof(temp->temp_input.name),
- "temp%d_input", hwmon->count);
- temp->temp_input.attr.attr.name = temp->temp_input.name;
- temp->temp_input.attr.attr.mode = 0444;
- temp->temp_input.attr.show = temp_input_show;
- sysfs_attr_init(&temp->temp_input.attr.attr);
- result = device_create_file(hwmon->device, &temp->temp_input.attr);
- if (result)
- goto free_temp_mem;
-
- if (tz->ops->get_crit_temp) {
- unsigned long temperature;
- if (!tz->ops->get_crit_temp(tz, &temperature)) {
- snprintf(temp->temp_crit.name,
- sizeof(temp->temp_crit.name),
- "temp%d_crit", hwmon->count);
- temp->temp_crit.attr.attr.name = temp->temp_crit.name;
- temp->temp_crit.attr.attr.mode = 0444;
- temp->temp_crit.attr.show = temp_crit_show;
- sysfs_attr_init(&temp->temp_crit.attr.attr);
- result = device_create_file(hwmon->device,
- &temp->temp_crit.attr);
- if (result)
- goto unregister_input;
- }
- }
-
- mutex_lock(&thermal_list_lock);
- if (new_hwmon_device)
- list_add_tail(&hwmon->node, &thermal_hwmon_list);
- list_add_tail(&temp->hwmon_node, &hwmon->tz_list);
- mutex_unlock(&thermal_list_lock);
-
- return 0;
-
- unregister_input:
- device_remove_file(hwmon->device, &temp->temp_input.attr);
- free_temp_mem:
- kfree(temp);
- unregister_name:
- if (new_hwmon_device) {
- device_remove_file(hwmon->device, &dev_attr_name);
- hwmon_device_unregister(hwmon->device);
- }
- free_mem:
- if (new_hwmon_device)
- kfree(hwmon);
-
- return result;
-}
-
-static void
-thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
-{
- struct thermal_hwmon_device *hwmon;
- struct thermal_hwmon_temp *temp;
-
- hwmon = thermal_hwmon_lookup_by_type(tz);
- if (unlikely(!hwmon)) {
- /* Should never happen... */
- dev_dbg(&tz->device, "hwmon device lookup failed!\n");
- return;
- }
-
- temp = thermal_hwmon_lookup_temp(hwmon, tz);
- if (unlikely(!temp)) {
- /* Should never happen... */
- dev_dbg(&tz->device, "temperature input lookup failed!\n");
- return;
- }
-
- device_remove_file(hwmon->device, &temp->temp_input.attr);
- if (tz->ops->get_crit_temp)
- device_remove_file(hwmon->device, &temp->temp_crit.attr);
-
- mutex_lock(&thermal_list_lock);
- list_del(&temp->hwmon_node);
- kfree(temp);
- if (!list_empty(&hwmon->tz_list)) {
- mutex_unlock(&thermal_list_lock);
- return;
- }
- list_del(&hwmon->node);
- mutex_unlock(&thermal_list_lock);
-
- device_remove_file(hwmon->device, &dev_attr_name);
- hwmon_device_unregister(hwmon->device);
- kfree(hwmon);
-}
-#else
-static int
-thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
-{
- return 0;
-}
-
-static void
-thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
-{
-}
-#endif
-
/**
* thermal_zone_bind_cooling_device() - bind a cooling device to a thermal zone
* @tz: pointer to struct thermal_zone_device
diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c
new file mode 100644
index 0000000..7c665c8
--- /dev/null
+++ b/drivers/thermal/thermal_hwmon.c
@@ -0,0 +1,268 @@
+/*
+ * thermal_hwmon.c - Generic Thermal Management hwmon support.
+ *
+ * Code based on Intel thermal_core.c. Copyrights of the original code:
+ * Copyright (C) 2008 Intel Corp
+ * Copyright (C) 2008 Zhang Rui <rui.zhang@intel.com>
+ * Copyright (C) 2008 Sujith Thomas <sujith.thomas@intel.com>
+ *
+ * Copyright (C) 2013 Texas Instruments
+ * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+#include <linux/hwmon.h>
+#include <linux/thermal.h>
+#include <linux/slab.h>
+#include <linux/err.h>
+
+/* hwmon sys I/F */
+/* thermal zone devices with the same type share one hwmon device */
+struct thermal_hwmon_device {
+ char type[THERMAL_NAME_LENGTH];
+ struct device *device;
+ int count;
+ struct list_head tz_list;
+ struct list_head node;
+};
+
+struct thermal_hwmon_attr {
+ struct device_attribute attr;
+ char name[16];
+};
+
+/* one temperature input for each thermal zone */
+struct thermal_hwmon_temp {
+ struct list_head hwmon_node;
+ struct thermal_zone_device *tz;
+ struct thermal_hwmon_attr temp_input; /* hwmon sys attr */
+ struct thermal_hwmon_attr temp_crit; /* hwmon sys attr */
+};
+
+static LIST_HEAD(thermal_hwmon_list);
+
+static DEFINE_MUTEX(thermal_hwmon_list_lock);
+
+static ssize_t
+name_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+ struct thermal_hwmon_device *hwmon = dev_get_drvdata(dev);
+ return sprintf(buf, "%s\n", hwmon->type);
+}
+static DEVICE_ATTR(name, 0444, name_show, NULL);
+
+static ssize_t
+temp_input_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+ long temperature;
+ int ret;
+ struct thermal_hwmon_attr *hwmon_attr
+ = container_of(attr, struct thermal_hwmon_attr, attr);
+ struct thermal_hwmon_temp *temp
+ = container_of(hwmon_attr, struct thermal_hwmon_temp,
+ temp_input);
+ struct thermal_zone_device *tz = temp->tz;
+
+ ret = thermal_zone_get_temp(tz, &temperature);
+
+ if (ret)
+ return ret;
+
+ return sprintf(buf, "%ld\n", temperature);
+}
+
+static ssize_t
+temp_crit_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+ struct thermal_hwmon_attr *hwmon_attr
+ = container_of(attr, struct thermal_hwmon_attr, attr);
+ struct thermal_hwmon_temp *temp
+ = container_of(hwmon_attr, struct thermal_hwmon_temp,
+ temp_crit);
+ struct thermal_zone_device *tz = temp->tz;
+ long temperature;
+ int ret;
+
+ ret = tz->ops->get_trip_temp(tz, 0, &temperature);
+ if (ret)
+ return ret;
+
+ return sprintf(buf, "%ld\n", temperature);
+}
+
+
+static struct thermal_hwmon_device *
+thermal_hwmon_lookup_by_type(const struct thermal_zone_device *tz)
+{
+ struct thermal_hwmon_device *hwmon;
+
+ mutex_lock(&thermal_hwmon_list_lock);
+ list_for_each_entry(hwmon, &thermal_hwmon_list, node)
+ if (!strcmp(hwmon->type, tz->type)) {
+ mutex_unlock(&thermal_hwmon_list_lock);
+ return hwmon;
+ }
+ mutex_unlock(&thermal_hwmon_list_lock);
+
+ return NULL;
+}
+
+/* Find the temperature input matching a given thermal zone */
+static struct thermal_hwmon_temp *
+thermal_hwmon_lookup_temp(const struct thermal_hwmon_device *hwmon,
+ const struct thermal_zone_device *tz)
+{
+ struct thermal_hwmon_temp *temp;
+
+ mutex_lock(&thermal_hwmon_list_lock);
+ list_for_each_entry(temp, &hwmon->tz_list, hwmon_node)
+ if (temp->tz == tz) {
+ mutex_unlock(&thermal_hwmon_list_lock);
+ return temp;
+ }
+ mutex_unlock(&thermal_hwmon_list_lock);
+
+ return NULL;
+}
+
+int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
+{
+ struct thermal_hwmon_device *hwmon;
+ struct thermal_hwmon_temp *temp;
+ int new_hwmon_device = 1;
+ int result;
+
+ hwmon = thermal_hwmon_lookup_by_type(tz);
+ if (hwmon) {
+ new_hwmon_device = 0;
+ goto register_sys_interface;
+ }
+
+ hwmon = kzalloc(sizeof(struct thermal_hwmon_device), GFP_KERNEL);
+ if (!hwmon)
+ return -ENOMEM;
+
+ INIT_LIST_HEAD(&hwmon->tz_list);
+ strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH);
+ hwmon->device = hwmon_device_register(NULL);
+ if (IS_ERR(hwmon->device)) {
+ result = PTR_ERR(hwmon->device);
+ goto free_mem;
+ }
+ dev_set_drvdata(hwmon->device, hwmon);
+ result = device_create_file(hwmon->device, &dev_attr_name);
+ if (result)
+ goto free_mem;
+
+ register_sys_interface:
+ temp = kzalloc(sizeof(struct thermal_hwmon_temp), GFP_KERNEL);
+ if (!temp) {
+ result = -ENOMEM;
+ goto unregister_name;
+ }
+
+ temp->tz = tz;
+ hwmon->count++;
+
+ snprintf(temp->temp_input.name, sizeof(temp->temp_input.name),
+ "temp%d_input", hwmon->count);
+ temp->temp_input.attr.attr.name = temp->temp_input.name;
+ temp->temp_input.attr.attr.mode = 0444;
+ temp->temp_input.attr.show = temp_input_show;
+ sysfs_attr_init(&temp->temp_input.attr.attr);
+ result = device_create_file(hwmon->device, &temp->temp_input.attr);
+ if (result)
+ goto free_temp_mem;
+
+ if (tz->ops->get_crit_temp) {
+ unsigned long temperature;
+ if (!tz->ops->get_crit_temp(tz, &temperature)) {
+ snprintf(temp->temp_crit.name,
+ sizeof(temp->temp_crit.name),
+ "temp%d_crit", hwmon->count);
+ temp->temp_crit.attr.attr.name = temp->temp_crit.name;
+ temp->temp_crit.attr.attr.mode = 0444;
+ temp->temp_crit.attr.show = temp_crit_show;
+ sysfs_attr_init(&temp->temp_crit.attr.attr);
+ result = device_create_file(hwmon->device,
+ &temp->temp_crit.attr);
+ if (result)
+ goto unregister_input;
+ }
+ }
+
+ mutex_lock(&thermal_hwmon_list_lock);
+ if (new_hwmon_device)
+ list_add_tail(&hwmon->node, &thermal_hwmon_list);
+ list_add_tail(&temp->hwmon_node, &hwmon->tz_list);
+ mutex_unlock(&thermal_hwmon_list_lock);
+
+ return 0;
+
+ unregister_input:
+ device_remove_file(hwmon->device, &temp->temp_input.attr);
+ free_temp_mem:
+ kfree(temp);
+ unregister_name:
+ if (new_hwmon_device) {
+ device_remove_file(hwmon->device, &dev_attr_name);
+ hwmon_device_unregister(hwmon->device);
+ }
+ free_mem:
+ if (new_hwmon_device)
+ kfree(hwmon);
+
+ return result;
+}
+
+void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
+{
+ struct thermal_hwmon_device *hwmon;
+ struct thermal_hwmon_temp *temp;
+
+ hwmon = thermal_hwmon_lookup_by_type(tz);
+ if (unlikely(!hwmon)) {
+ /* Should never happen... */
+ dev_dbg(&tz->device, "hwmon device lookup failed!\n");
+ return;
+ }
+
+ temp = thermal_hwmon_lookup_temp(hwmon, tz);
+ if (unlikely(!temp)) {
+ /* Should never happen... */
+ dev_dbg(&tz->device, "temperature input lookup failed!\n");
+ return;
+ }
+
+ device_remove_file(hwmon->device, &temp->temp_input.attr);
+ if (tz->ops->get_crit_temp)
+ device_remove_file(hwmon->device, &temp->temp_crit.attr);
+
+ mutex_lock(&thermal_hwmon_list_lock);
+ list_del(&temp->hwmon_node);
+ kfree(temp);
+ if (!list_empty(&hwmon->tz_list)) {
+ mutex_unlock(&thermal_hwmon_list_lock);
+ return;
+ }
+ list_del(&hwmon->node);
+ mutex_unlock(&thermal_hwmon_list_lock);
+
+ device_remove_file(hwmon->device, &dev_attr_name);
+ hwmon_device_unregister(hwmon->device);
+ kfree(hwmon);
+}
diff --git a/drivers/thermal/thermal_hwmon.h b/drivers/thermal/thermal_hwmon.h
new file mode 100644
index 0000000..c798fdb
--- /dev/null
+++ b/drivers/thermal/thermal_hwmon.h
@@ -0,0 +1,49 @@
+/*
+ * thermal_hwmon.h - Generic Thermal Management hwmon support.
+ *
+ * Code based on Intel thermal_core.c. Copyrights of the original code:
+ * Copyright (C) 2008 Intel Corp
+ * Copyright (C) 2008 Zhang Rui <rui.zhang@intel.com>
+ * Copyright (C) 2008 Sujith Thomas <sujith.thomas@intel.com>
+ *
+ * Copyright (C) 2013 Texas Instruments
+ * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+#ifndef __THERMAL_HWMON_H__
+#define __THERMAL_HWMON_H__
+
+#include <linux/thermal.h>
+
+#ifdef CONFIG_THERMAL_HWMON
+int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz);
+void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz);
+#else
+static int
+thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
+{
+ return 0;
+}
+
+static void
+thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
+{
+}
+#endif
+
+#endif /* __THERMAL_HWMON_H__ */
--
1.8.2.1.342.gfa7285d
^ permalink raw reply related [flat|nested] 33+ messages in thread* RE: [RFC PATCH 1/4] thermal: hwmon: move hwmon support to single file
2013-07-09 14:00 ` Eduardo Valentin
(?)
@ 2013-07-09 16:04 ` R, Durgadoss
2013-07-09 16:54 ` Eduardo Valentin
-1 siblings, 1 reply; 33+ messages in thread
From: R, Durgadoss @ 2013-07-09 16:04 UTC (permalink / raw)
To: Eduardo Valentin, linux-pm, amit.daniel; +Cc: Zhang, Rui, linux-kernel
Hi Eduardo,
> -----Original Message-----
> From: linux-pm-owner@vger.kernel.org [mailto:linux-pm-
> owner@vger.kernel.org] On Behalf Of Eduardo Valentin
> Sent: Tuesday, July 09, 2013 7:30 PM
> To: linux-pm@vger.kernel.org; R, Durgadoss; amit.daniel@samsung.com
> Cc: Zhang, Rui; Eduardo Valentin; linux-kernel@vger.kernel.org
> Subject: [RFC PATCH 1/4] thermal: hwmon: move hwmon support to single file
>
> In order to improve code organization, this patch
> moves the hwmon sysfs support to a file named
> thermal_hwmon. This helps to add extra support
> for hwmon without scrambling the code.
Nice clean up for thermal_core.c. +1 from me.
I am inclined to even remove the hwmon related code completely.
AFAIK, there are not many users of this config option.
However people are looking for the other option. If they have a
hwmon driver, how can it use the thermal framework with ease.
[like what you mentioned about this in 0/5]
Thanks,
Durga
>
> In order to do this move, the hwmon list head is now
> using its own locking. Before, the list used
> the global thermal locking.
>
> Cc: Zhang Rui <rui.zhang@intel.com>
> Cc: linux-pm@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
> ---
> drivers/thermal/Kconfig | 9 ++
> drivers/thermal/Makefile | 3 +
> drivers/thermal/thermal_core.c | 255 +-------------------------------------
> drivers/thermal/thermal_hwmon.c | 268
> ++++++++++++++++++++++++++++++++++++++++
> drivers/thermal/thermal_hwmon.h | 49 ++++++++
> 5 files changed, 330 insertions(+), 254 deletions(-)
> create mode 100644 drivers/thermal/thermal_hwmon.c
> create mode 100644 drivers/thermal/thermal_hwmon.h
>
> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> index e988c81..7fb16bc 100644
> --- a/drivers/thermal/Kconfig
> +++ b/drivers/thermal/Kconfig
> @@ -17,8 +17,17 @@ if THERMAL
>
> config THERMAL_HWMON
> bool
> + prompt "Expose thermal sensors as hwmon device"
> depends on HWMON=y || HWMON=THERMAL
> default y
> + help
> + In case a sensor is registered with the thermal
> + framework, this option will also register it
> + as a hwmon. The sensor will then have the common
> + hwmon sysfs interface.
> +
> + Say 'Y' here if you want all thermal sensors to
> + have hwmon sysfs interface too.
>
> choice
> prompt "Default Thermal governor"
> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> index 67184a2..24cb894 100644
> --- a/drivers/thermal/Makefile
> +++ b/drivers/thermal/Makefile
> @@ -5,6 +5,9 @@
> obj-$(CONFIG_THERMAL) += thermal_sys.o
> thermal_sys-y += thermal_core.o
>
> +# interface to/from other layers providing sensors
> +thermal_sys-$(CONFIG_THERMAL_HWMON) += thermal_hwmon.o
> +
> # governors
> thermal_sys-$(CONFIG_THERMAL_GOV_FAIR_SHARE) += fair_share.o
> thermal_sys-$(CONFIG_THERMAL_GOV_STEP_WISE) += step_wise.o
> diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
> index 1f02e8e..247528b 100644
> --- a/drivers/thermal/thermal_core.c
> +++ b/drivers/thermal/thermal_core.c
> @@ -38,6 +38,7 @@
> #include <net/genetlink.h>
>
> #include "thermal_core.h"
> +#include "thermal_hwmon.h"
>
> MODULE_AUTHOR("Zhang Rui");
> MODULE_DESCRIPTION("Generic thermal management sysfs support");
> @@ -859,260 +860,6 @@ thermal_cooling_device_trip_point_show(struct device
> *dev,
>
> /* Device management */
>
> -#if defined(CONFIG_THERMAL_HWMON)
> -
> -/* hwmon sys I/F */
> -#include <linux/hwmon.h>
> -
> -/* thermal zone devices with the same type share one hwmon device */
> -struct thermal_hwmon_device {
> - char type[THERMAL_NAME_LENGTH];
> - struct device *device;
> - int count;
> - struct list_head tz_list;
> - struct list_head node;
> -};
> -
> -struct thermal_hwmon_attr {
> - struct device_attribute attr;
> - char name[16];
> -};
> -
> -/* one temperature input for each thermal zone */
> -struct thermal_hwmon_temp {
> - struct list_head hwmon_node;
> - struct thermal_zone_device *tz;
> - struct thermal_hwmon_attr temp_input; /* hwmon sys attr */
> - struct thermal_hwmon_attr temp_crit; /* hwmon sys attr */
> -};
> -
> -static LIST_HEAD(thermal_hwmon_list);
> -
> -static ssize_t
> -name_show(struct device *dev, struct device_attribute *attr, char *buf)
> -{
> - struct thermal_hwmon_device *hwmon = dev_get_drvdata(dev);
> - return sprintf(buf, "%s\n", hwmon->type);
> -}
> -static DEVICE_ATTR(name, 0444, name_show, NULL);
> -
> -static ssize_t
> -temp_input_show(struct device *dev, struct device_attribute *attr, char *buf)
> -{
> - long temperature;
> - int ret;
> - struct thermal_hwmon_attr *hwmon_attr
> - = container_of(attr, struct thermal_hwmon_attr, attr);
> - struct thermal_hwmon_temp *temp
> - = container_of(hwmon_attr, struct
> thermal_hwmon_temp,
> - temp_input);
> - struct thermal_zone_device *tz = temp->tz;
> -
> - ret = thermal_zone_get_temp(tz, &temperature);
> -
> - if (ret)
> - return ret;
> -
> - return sprintf(buf, "%ld\n", temperature);
> -}
> -
> -static ssize_t
> -temp_crit_show(struct device *dev, struct device_attribute *attr,
> - char *buf)
> -{
> - struct thermal_hwmon_attr *hwmon_attr
> - = container_of(attr, struct thermal_hwmon_attr, attr);
> - struct thermal_hwmon_temp *temp
> - = container_of(hwmon_attr, struct
> thermal_hwmon_temp,
> - temp_crit);
> - struct thermal_zone_device *tz = temp->tz;
> - long temperature;
> - int ret;
> -
> - ret = tz->ops->get_trip_temp(tz, 0, &temperature);
> - if (ret)
> - return ret;
> -
> - return sprintf(buf, "%ld\n", temperature);
> -}
> -
> -
> -static struct thermal_hwmon_device *
> -thermal_hwmon_lookup_by_type(const struct thermal_zone_device *tz)
> -{
> - struct thermal_hwmon_device *hwmon;
> -
> - mutex_lock(&thermal_list_lock);
> - list_for_each_entry(hwmon, &thermal_hwmon_list, node)
> - if (!strcmp(hwmon->type, tz->type)) {
> - mutex_unlock(&thermal_list_lock);
> - return hwmon;
> - }
> - mutex_unlock(&thermal_list_lock);
> -
> - return NULL;
> -}
> -
> -/* Find the temperature input matching a given thermal zone */
> -static struct thermal_hwmon_temp *
> -thermal_hwmon_lookup_temp(const struct thermal_hwmon_device *hwmon,
> - const struct thermal_zone_device *tz)
> -{
> - struct thermal_hwmon_temp *temp;
> -
> - mutex_lock(&thermal_list_lock);
> - list_for_each_entry(temp, &hwmon->tz_list, hwmon_node)
> - if (temp->tz == tz) {
> - mutex_unlock(&thermal_list_lock);
> - return temp;
> - }
> - mutex_unlock(&thermal_list_lock);
> -
> - return NULL;
> -}
> -
> -static int
> -thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
> -{
> - struct thermal_hwmon_device *hwmon;
> - struct thermal_hwmon_temp *temp;
> - int new_hwmon_device = 1;
> - int result;
> -
> - hwmon = thermal_hwmon_lookup_by_type(tz);
> - if (hwmon) {
> - new_hwmon_device = 0;
> - goto register_sys_interface;
> - }
> -
> - hwmon = kzalloc(sizeof(struct thermal_hwmon_device), GFP_KERNEL);
> - if (!hwmon)
> - return -ENOMEM;
> -
> - INIT_LIST_HEAD(&hwmon->tz_list);
> - strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH);
> - hwmon->device = hwmon_device_register(NULL);
> - if (IS_ERR(hwmon->device)) {
> - result = PTR_ERR(hwmon->device);
> - goto free_mem;
> - }
> - dev_set_drvdata(hwmon->device, hwmon);
> - result = device_create_file(hwmon->device, &dev_attr_name);
> - if (result)
> - goto free_mem;
> -
> - register_sys_interface:
> - temp = kzalloc(sizeof(struct thermal_hwmon_temp), GFP_KERNEL);
> - if (!temp) {
> - result = -ENOMEM;
> - goto unregister_name;
> - }
> -
> - temp->tz = tz;
> - hwmon->count++;
> -
> - snprintf(temp->temp_input.name, sizeof(temp->temp_input.name),
> - "temp%d_input", hwmon->count);
> - temp->temp_input.attr.attr.name = temp->temp_input.name;
> - temp->temp_input.attr.attr.mode = 0444;
> - temp->temp_input.attr.show = temp_input_show;
> - sysfs_attr_init(&temp->temp_input.attr.attr);
> - result = device_create_file(hwmon->device, &temp->temp_input.attr);
> - if (result)
> - goto free_temp_mem;
> -
> - if (tz->ops->get_crit_temp) {
> - unsigned long temperature;
> - if (!tz->ops->get_crit_temp(tz, &temperature)) {
> - snprintf(temp->temp_crit.name,
> - sizeof(temp->temp_crit.name),
> - "temp%d_crit", hwmon->count);
> - temp->temp_crit.attr.attr.name = temp-
> >temp_crit.name;
> - temp->temp_crit.attr.attr.mode = 0444;
> - temp->temp_crit.attr.show = temp_crit_show;
> - sysfs_attr_init(&temp->temp_crit.attr.attr);
> - result = device_create_file(hwmon->device,
> - &temp->temp_crit.attr);
> - if (result)
> - goto unregister_input;
> - }
> - }
> -
> - mutex_lock(&thermal_list_lock);
> - if (new_hwmon_device)
> - list_add_tail(&hwmon->node, &thermal_hwmon_list);
> - list_add_tail(&temp->hwmon_node, &hwmon->tz_list);
> - mutex_unlock(&thermal_list_lock);
> -
> - return 0;
> -
> - unregister_input:
> - device_remove_file(hwmon->device, &temp->temp_input.attr);
> - free_temp_mem:
> - kfree(temp);
> - unregister_name:
> - if (new_hwmon_device) {
> - device_remove_file(hwmon->device, &dev_attr_name);
> - hwmon_device_unregister(hwmon->device);
> - }
> - free_mem:
> - if (new_hwmon_device)
> - kfree(hwmon);
> -
> - return result;
> -}
> -
> -static void
> -thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
> -{
> - struct thermal_hwmon_device *hwmon;
> - struct thermal_hwmon_temp *temp;
> -
> - hwmon = thermal_hwmon_lookup_by_type(tz);
> - if (unlikely(!hwmon)) {
> - /* Should never happen... */
> - dev_dbg(&tz->device, "hwmon device lookup failed!\n");
> - return;
> - }
> -
> - temp = thermal_hwmon_lookup_temp(hwmon, tz);
> - if (unlikely(!temp)) {
> - /* Should never happen... */
> - dev_dbg(&tz->device, "temperature input lookup failed!\n");
> - return;
> - }
> -
> - device_remove_file(hwmon->device, &temp->temp_input.attr);
> - if (tz->ops->get_crit_temp)
> - device_remove_file(hwmon->device, &temp->temp_crit.attr);
> -
> - mutex_lock(&thermal_list_lock);
> - list_del(&temp->hwmon_node);
> - kfree(temp);
> - if (!list_empty(&hwmon->tz_list)) {
> - mutex_unlock(&thermal_list_lock);
> - return;
> - }
> - list_del(&hwmon->node);
> - mutex_unlock(&thermal_list_lock);
> -
> - device_remove_file(hwmon->device, &dev_attr_name);
> - hwmon_device_unregister(hwmon->device);
> - kfree(hwmon);
> -}
> -#else
> -static int
> -thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
> -{
> - return 0;
> -}
> -
> -static void
> -thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
> -{
> -}
> -#endif
> -
> /**
> * thermal_zone_bind_cooling_device() - bind a cooling device to a thermal zone
> * @tz: pointer to struct thermal_zone_device
> diff --git a/drivers/thermal/thermal_hwmon.c
> b/drivers/thermal/thermal_hwmon.c
> new file mode 100644
> index 0000000..7c665c8
> --- /dev/null
> +++ b/drivers/thermal/thermal_hwmon.c
> @@ -0,0 +1,268 @@
> +/*
> + * thermal_hwmon.c - Generic Thermal Management hwmon support.
> + *
> + * Code based on Intel thermal_core.c. Copyrights of the original code:
> + * Copyright (C) 2008 Intel Corp
> + * Copyright (C) 2008 Zhang Rui <rui.zhang@intel.com>
> + * Copyright (C) 2008 Sujith Thomas <sujith.thomas@intel.com>
> + *
> + * Copyright (C) 2013 Texas Instruments
> + * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
> + *
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ~~~~~~~~~~~~
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; version 2 of the License.
> + *
> + * This program is distributed in the hope that it will be useful, but
> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License along
> + * with this program; if not, write to the Free Software Foundation, Inc.,
> + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
> + *
> + *
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ~~~~~~~~~~~~
> + */
> +#include <linux/hwmon.h>
> +#include <linux/thermal.h>
> +#include <linux/slab.h>
> +#include <linux/err.h>
> +
> +/* hwmon sys I/F */
> +/* thermal zone devices with the same type share one hwmon device */
> +struct thermal_hwmon_device {
> + char type[THERMAL_NAME_LENGTH];
> + struct device *device;
> + int count;
> + struct list_head tz_list;
> + struct list_head node;
> +};
> +
> +struct thermal_hwmon_attr {
> + struct device_attribute attr;
> + char name[16];
> +};
> +
> +/* one temperature input for each thermal zone */
> +struct thermal_hwmon_temp {
> + struct list_head hwmon_node;
> + struct thermal_zone_device *tz;
> + struct thermal_hwmon_attr temp_input; /* hwmon sys attr */
> + struct thermal_hwmon_attr temp_crit; /* hwmon sys attr */
> +};
> +
> +static LIST_HEAD(thermal_hwmon_list);
> +
> +static DEFINE_MUTEX(thermal_hwmon_list_lock);
> +
> +static ssize_t
> +name_show(struct device *dev, struct device_attribute *attr, char *buf)
> +{
> + struct thermal_hwmon_device *hwmon = dev_get_drvdata(dev);
> + return sprintf(buf, "%s\n", hwmon->type);
> +}
> +static DEVICE_ATTR(name, 0444, name_show, NULL);
> +
> +static ssize_t
> +temp_input_show(struct device *dev, struct device_attribute *attr, char *buf)
> +{
> + long temperature;
> + int ret;
> + struct thermal_hwmon_attr *hwmon_attr
> + = container_of(attr, struct thermal_hwmon_attr, attr);
> + struct thermal_hwmon_temp *temp
> + = container_of(hwmon_attr, struct
> thermal_hwmon_temp,
> + temp_input);
> + struct thermal_zone_device *tz = temp->tz;
> +
> + ret = thermal_zone_get_temp(tz, &temperature);
> +
> + if (ret)
> + return ret;
> +
> + return sprintf(buf, "%ld\n", temperature);
> +}
> +
> +static ssize_t
> +temp_crit_show(struct device *dev, struct device_attribute *attr, char *buf)
> +{
> + struct thermal_hwmon_attr *hwmon_attr
> + = container_of(attr, struct thermal_hwmon_attr, attr);
> + struct thermal_hwmon_temp *temp
> + = container_of(hwmon_attr, struct
> thermal_hwmon_temp,
> + temp_crit);
> + struct thermal_zone_device *tz = temp->tz;
> + long temperature;
> + int ret;
> +
> + ret = tz->ops->get_trip_temp(tz, 0, &temperature);
> + if (ret)
> + return ret;
> +
> + return sprintf(buf, "%ld\n", temperature);
> +}
> +
> +
> +static struct thermal_hwmon_device *
> +thermal_hwmon_lookup_by_type(const struct thermal_zone_device *tz)
> +{
> + struct thermal_hwmon_device *hwmon;
> +
> + mutex_lock(&thermal_hwmon_list_lock);
> + list_for_each_entry(hwmon, &thermal_hwmon_list, node)
> + if (!strcmp(hwmon->type, tz->type)) {
> + mutex_unlock(&thermal_hwmon_list_lock);
> + return hwmon;
> + }
> + mutex_unlock(&thermal_hwmon_list_lock);
> +
> + return NULL;
> +}
> +
> +/* Find the temperature input matching a given thermal zone */
> +static struct thermal_hwmon_temp *
> +thermal_hwmon_lookup_temp(const struct thermal_hwmon_device *hwmon,
> + const struct thermal_zone_device *tz)
> +{
> + struct thermal_hwmon_temp *temp;
> +
> + mutex_lock(&thermal_hwmon_list_lock);
> + list_for_each_entry(temp, &hwmon->tz_list, hwmon_node)
> + if (temp->tz == tz) {
> + mutex_unlock(&thermal_hwmon_list_lock);
> + return temp;
> + }
> + mutex_unlock(&thermal_hwmon_list_lock);
> +
> + return NULL;
> +}
> +
> +int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
> +{
> + struct thermal_hwmon_device *hwmon;
> + struct thermal_hwmon_temp *temp;
> + int new_hwmon_device = 1;
> + int result;
> +
> + hwmon = thermal_hwmon_lookup_by_type(tz);
> + if (hwmon) {
> + new_hwmon_device = 0;
> + goto register_sys_interface;
> + }
> +
> + hwmon = kzalloc(sizeof(struct thermal_hwmon_device), GFP_KERNEL);
> + if (!hwmon)
> + return -ENOMEM;
> +
> + INIT_LIST_HEAD(&hwmon->tz_list);
> + strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH);
> + hwmon->device = hwmon_device_register(NULL);
> + if (IS_ERR(hwmon->device)) {
> + result = PTR_ERR(hwmon->device);
> + goto free_mem;
> + }
> + dev_set_drvdata(hwmon->device, hwmon);
> + result = device_create_file(hwmon->device, &dev_attr_name);
> + if (result)
> + goto free_mem;
> +
> + register_sys_interface:
> + temp = kzalloc(sizeof(struct thermal_hwmon_temp), GFP_KERNEL);
> + if (!temp) {
> + result = -ENOMEM;
> + goto unregister_name;
> + }
> +
> + temp->tz = tz;
> + hwmon->count++;
> +
> + snprintf(temp->temp_input.name, sizeof(temp->temp_input.name),
> + "temp%d_input", hwmon->count);
> + temp->temp_input.attr.attr.name = temp->temp_input.name;
> + temp->temp_input.attr.attr.mode = 0444;
> + temp->temp_input.attr.show = temp_input_show;
> + sysfs_attr_init(&temp->temp_input.attr.attr);
> + result = device_create_file(hwmon->device, &temp->temp_input.attr);
> + if (result)
> + goto free_temp_mem;
> +
> + if (tz->ops->get_crit_temp) {
> + unsigned long temperature;
> + if (!tz->ops->get_crit_temp(tz, &temperature)) {
> + snprintf(temp->temp_crit.name,
> + sizeof(temp->temp_crit.name),
> + "temp%d_crit", hwmon->count);
> + temp->temp_crit.attr.attr.name = temp-
> >temp_crit.name;
> + temp->temp_crit.attr.attr.mode = 0444;
> + temp->temp_crit.attr.show = temp_crit_show;
> + sysfs_attr_init(&temp->temp_crit.attr.attr);
> + result = device_create_file(hwmon->device,
> + &temp->temp_crit.attr);
> + if (result)
> + goto unregister_input;
> + }
> + }
> +
> + mutex_lock(&thermal_hwmon_list_lock);
> + if (new_hwmon_device)
> + list_add_tail(&hwmon->node, &thermal_hwmon_list);
> + list_add_tail(&temp->hwmon_node, &hwmon->tz_list);
> + mutex_unlock(&thermal_hwmon_list_lock);
> +
> + return 0;
> +
> + unregister_input:
> + device_remove_file(hwmon->device, &temp->temp_input.attr);
> + free_temp_mem:
> + kfree(temp);
> + unregister_name:
> + if (new_hwmon_device) {
> + device_remove_file(hwmon->device, &dev_attr_name);
> + hwmon_device_unregister(hwmon->device);
> + }
> + free_mem:
> + if (new_hwmon_device)
> + kfree(hwmon);
> +
> + return result;
> +}
> +
> +void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
> +{
> + struct thermal_hwmon_device *hwmon;
> + struct thermal_hwmon_temp *temp;
> +
> + hwmon = thermal_hwmon_lookup_by_type(tz);
> + if (unlikely(!hwmon)) {
> + /* Should never happen... */
> + dev_dbg(&tz->device, "hwmon device lookup failed!\n");
> + return;
> + }
> +
> + temp = thermal_hwmon_lookup_temp(hwmon, tz);
> + if (unlikely(!temp)) {
> + /* Should never happen... */
> + dev_dbg(&tz->device, "temperature input lookup failed!\n");
> + return;
> + }
> +
> + device_remove_file(hwmon->device, &temp->temp_input.attr);
> + if (tz->ops->get_crit_temp)
> + device_remove_file(hwmon->device, &temp->temp_crit.attr);
> +
> + mutex_lock(&thermal_hwmon_list_lock);
> + list_del(&temp->hwmon_node);
> + kfree(temp);
> + if (!list_empty(&hwmon->tz_list)) {
> + mutex_unlock(&thermal_hwmon_list_lock);
> + return;
> + }
> + list_del(&hwmon->node);
> + mutex_unlock(&thermal_hwmon_list_lock);
> +
> + device_remove_file(hwmon->device, &dev_attr_name);
> + hwmon_device_unregister(hwmon->device);
> + kfree(hwmon);
> +}
> diff --git a/drivers/thermal/thermal_hwmon.h
> b/drivers/thermal/thermal_hwmon.h
> new file mode 100644
> index 0000000..c798fdb
> --- /dev/null
> +++ b/drivers/thermal/thermal_hwmon.h
> @@ -0,0 +1,49 @@
> +/*
> + * thermal_hwmon.h - Generic Thermal Management hwmon support.
> + *
> + * Code based on Intel thermal_core.c. Copyrights of the original code:
> + * Copyright (C) 2008 Intel Corp
> + * Copyright (C) 2008 Zhang Rui <rui.zhang@intel.com>
> + * Copyright (C) 2008 Sujith Thomas <sujith.thomas@intel.com>
> + *
> + * Copyright (C) 2013 Texas Instruments
> + * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
> + *
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ~~~~~~~~~~~~
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; version 2 of the License.
> + *
> + * This program is distributed in the hope that it will be useful, but
> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License along
> + * with this program; if not, write to the Free Software Foundation, Inc.,
> + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
> + *
> + *
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ~~~~~~~~~~~~
> + */
> +#ifndef __THERMAL_HWMON_H__
> +#define __THERMAL_HWMON_H__
> +
> +#include <linux/thermal.h>
> +
> +#ifdef CONFIG_THERMAL_HWMON
> +int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz);
> +void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz);
> +#else
> +static int
> +thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
> +{
> + return 0;
> +}
> +
> +static void
> +thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
> +{
> +}
> +#endif
> +
> +#endif /* __THERMAL_HWMON_H__ */
> --
> 1.8.2.1.342.gfa7285d
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [RFC PATCH 1/4] thermal: hwmon: move hwmon support to single file
2013-07-09 16:04 ` R, Durgadoss
@ 2013-07-09 16:54 ` Eduardo Valentin
2013-07-09 17:14 ` R, Durgadoss
2013-07-17 9:49 ` Wei Ni
0 siblings, 2 replies; 33+ messages in thread
From: Eduardo Valentin @ 2013-07-09 16:54 UTC (permalink / raw)
To: R, Durgadoss
Cc: Eduardo Valentin, linux-pm, amit.daniel, Zhang, Rui, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 23710 bytes --]
On 09-07-2013 12:04, R, Durgadoss wrote:
> Hi Eduardo,
>
>> -----Original Message-----
>> From: linux-pm-owner@vger.kernel.org [mailto:linux-pm-
>> owner@vger.kernel.org] On Behalf Of Eduardo Valentin
>> Sent: Tuesday, July 09, 2013 7:30 PM
>> To: linux-pm@vger.kernel.org; R, Durgadoss; amit.daniel@samsung.com
>> Cc: Zhang, Rui; Eduardo Valentin; linux-kernel@vger.kernel.org
>> Subject: [RFC PATCH 1/4] thermal: hwmon: move hwmon support to single file
>>
>> In order to improve code organization, this patch
>> moves the hwmon sysfs support to a file named
>> thermal_hwmon. This helps to add extra support
>> for hwmon without scrambling the code.
>
> Nice clean up for thermal_core.c. +1 from me.
>
> I am inclined to even remove the hwmon related code completely.
> AFAIK, there are not many users of this config option.
>
Hmm. OK. I thought of keeping it as I dont know if there are users.
Besides, if new code comes out of the hwmon2thermalfw exercise, then it
would be a good place to keep all the hwmon code.
> However people are looking for the other option. If they have a
> hwmon driver, how can it use the thermal framework with ease.
> [like what you mentioned about this in 0/5]
yes, problem is that hwmon does not have a standard way of representing
the drivers. So, one cannot simply write a simple wrapper because hwmon
drivers does not have a standard get_temperature operation, for instance.
We could either propose a way to standardize then or implement the call
to thermal fw driver by driver. Probably the later is desirable, if we
implement it in a need basis.
>
> Thanks,
> Durga
>
>>
>> In order to do this move, the hwmon list head is now
>> using its own locking. Before, the list used
>> the global thermal locking.
>>
>> Cc: Zhang Rui <rui.zhang@intel.com>
>> Cc: linux-pm@vger.kernel.org
>> Cc: linux-kernel@vger.kernel.org
>> Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
>> ---
>> drivers/thermal/Kconfig | 9 ++
>> drivers/thermal/Makefile | 3 +
>> drivers/thermal/thermal_core.c | 255 +-------------------------------------
>> drivers/thermal/thermal_hwmon.c | 268
>> ++++++++++++++++++++++++++++++++++++++++
>> drivers/thermal/thermal_hwmon.h | 49 ++++++++
>> 5 files changed, 330 insertions(+), 254 deletions(-)
>> create mode 100644 drivers/thermal/thermal_hwmon.c
>> create mode 100644 drivers/thermal/thermal_hwmon.h
>>
>> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
>> index e988c81..7fb16bc 100644
>> --- a/drivers/thermal/Kconfig
>> +++ b/drivers/thermal/Kconfig
>> @@ -17,8 +17,17 @@ if THERMAL
>>
>> config THERMAL_HWMON
>> bool
>> + prompt "Expose thermal sensors as hwmon device"
>> depends on HWMON=y || HWMON=THERMAL
>> default y
>> + help
>> + In case a sensor is registered with the thermal
>> + framework, this option will also register it
>> + as a hwmon. The sensor will then have the common
>> + hwmon sysfs interface.
>> +
>> + Say 'Y' here if you want all thermal sensors to
>> + have hwmon sysfs interface too.
>>
>> choice
>> prompt "Default Thermal governor"
>> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
>> index 67184a2..24cb894 100644
>> --- a/drivers/thermal/Makefile
>> +++ b/drivers/thermal/Makefile
>> @@ -5,6 +5,9 @@
>> obj-$(CONFIG_THERMAL) += thermal_sys.o
>> thermal_sys-y += thermal_core.o
>>
>> +# interface to/from other layers providing sensors
>> +thermal_sys-$(CONFIG_THERMAL_HWMON) += thermal_hwmon.o
>> +
>> # governors
>> thermal_sys-$(CONFIG_THERMAL_GOV_FAIR_SHARE) += fair_share.o
>> thermal_sys-$(CONFIG_THERMAL_GOV_STEP_WISE) += step_wise.o
>> diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
>> index 1f02e8e..247528b 100644
>> --- a/drivers/thermal/thermal_core.c
>> +++ b/drivers/thermal/thermal_core.c
>> @@ -38,6 +38,7 @@
>> #include <net/genetlink.h>
>>
>> #include "thermal_core.h"
>> +#include "thermal_hwmon.h"
>>
>> MODULE_AUTHOR("Zhang Rui");
>> MODULE_DESCRIPTION("Generic thermal management sysfs support");
>> @@ -859,260 +860,6 @@ thermal_cooling_device_trip_point_show(struct device
>> *dev,
>>
>> /* Device management */
>>
>> -#if defined(CONFIG_THERMAL_HWMON)
>> -
>> -/* hwmon sys I/F */
>> -#include <linux/hwmon.h>
>> -
>> -/* thermal zone devices with the same type share one hwmon device */
>> -struct thermal_hwmon_device {
>> - char type[THERMAL_NAME_LENGTH];
>> - struct device *device;
>> - int count;
>> - struct list_head tz_list;
>> - struct list_head node;
>> -};
>> -
>> -struct thermal_hwmon_attr {
>> - struct device_attribute attr;
>> - char name[16];
>> -};
>> -
>> -/* one temperature input for each thermal zone */
>> -struct thermal_hwmon_temp {
>> - struct list_head hwmon_node;
>> - struct thermal_zone_device *tz;
>> - struct thermal_hwmon_attr temp_input; /* hwmon sys attr */
>> - struct thermal_hwmon_attr temp_crit; /* hwmon sys attr */
>> -};
>> -
>> -static LIST_HEAD(thermal_hwmon_list);
>> -
>> -static ssize_t
>> -name_show(struct device *dev, struct device_attribute *attr, char *buf)
>> -{
>> - struct thermal_hwmon_device *hwmon = dev_get_drvdata(dev);
>> - return sprintf(buf, "%s\n", hwmon->type);
>> -}
>> -static DEVICE_ATTR(name, 0444, name_show, NULL);
>> -
>> -static ssize_t
>> -temp_input_show(struct device *dev, struct device_attribute *attr, char *buf)
>> -{
>> - long temperature;
>> - int ret;
>> - struct thermal_hwmon_attr *hwmon_attr
>> - = container_of(attr, struct thermal_hwmon_attr, attr);
>> - struct thermal_hwmon_temp *temp
>> - = container_of(hwmon_attr, struct
>> thermal_hwmon_temp,
>> - temp_input);
>> - struct thermal_zone_device *tz = temp->tz;
>> -
>> - ret = thermal_zone_get_temp(tz, &temperature);
>> -
>> - if (ret)
>> - return ret;
>> -
>> - return sprintf(buf, "%ld\n", temperature);
>> -}
>> -
>> -static ssize_t
>> -temp_crit_show(struct device *dev, struct device_attribute *attr,
>> - char *buf)
>> -{
>> - struct thermal_hwmon_attr *hwmon_attr
>> - = container_of(attr, struct thermal_hwmon_attr, attr);
>> - struct thermal_hwmon_temp *temp
>> - = container_of(hwmon_attr, struct
>> thermal_hwmon_temp,
>> - temp_crit);
>> - struct thermal_zone_device *tz = temp->tz;
>> - long temperature;
>> - int ret;
>> -
>> - ret = tz->ops->get_trip_temp(tz, 0, &temperature);
>> - if (ret)
>> - return ret;
>> -
>> - return sprintf(buf, "%ld\n", temperature);
>> -}
>> -
>> -
>> -static struct thermal_hwmon_device *
>> -thermal_hwmon_lookup_by_type(const struct thermal_zone_device *tz)
>> -{
>> - struct thermal_hwmon_device *hwmon;
>> -
>> - mutex_lock(&thermal_list_lock);
>> - list_for_each_entry(hwmon, &thermal_hwmon_list, node)
>> - if (!strcmp(hwmon->type, tz->type)) {
>> - mutex_unlock(&thermal_list_lock);
>> - return hwmon;
>> - }
>> - mutex_unlock(&thermal_list_lock);
>> -
>> - return NULL;
>> -}
>> -
>> -/* Find the temperature input matching a given thermal zone */
>> -static struct thermal_hwmon_temp *
>> -thermal_hwmon_lookup_temp(const struct thermal_hwmon_device *hwmon,
>> - const struct thermal_zone_device *tz)
>> -{
>> - struct thermal_hwmon_temp *temp;
>> -
>> - mutex_lock(&thermal_list_lock);
>> - list_for_each_entry(temp, &hwmon->tz_list, hwmon_node)
>> - if (temp->tz == tz) {
>> - mutex_unlock(&thermal_list_lock);
>> - return temp;
>> - }
>> - mutex_unlock(&thermal_list_lock);
>> -
>> - return NULL;
>> -}
>> -
>> -static int
>> -thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
>> -{
>> - struct thermal_hwmon_device *hwmon;
>> - struct thermal_hwmon_temp *temp;
>> - int new_hwmon_device = 1;
>> - int result;
>> -
>> - hwmon = thermal_hwmon_lookup_by_type(tz);
>> - if (hwmon) {
>> - new_hwmon_device = 0;
>> - goto register_sys_interface;
>> - }
>> -
>> - hwmon = kzalloc(sizeof(struct thermal_hwmon_device), GFP_KERNEL);
>> - if (!hwmon)
>> - return -ENOMEM;
>> -
>> - INIT_LIST_HEAD(&hwmon->tz_list);
>> - strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH);
>> - hwmon->device = hwmon_device_register(NULL);
>> - if (IS_ERR(hwmon->device)) {
>> - result = PTR_ERR(hwmon->device);
>> - goto free_mem;
>> - }
>> - dev_set_drvdata(hwmon->device, hwmon);
>> - result = device_create_file(hwmon->device, &dev_attr_name);
>> - if (result)
>> - goto free_mem;
>> -
>> - register_sys_interface:
>> - temp = kzalloc(sizeof(struct thermal_hwmon_temp), GFP_KERNEL);
>> - if (!temp) {
>> - result = -ENOMEM;
>> - goto unregister_name;
>> - }
>> -
>> - temp->tz = tz;
>> - hwmon->count++;
>> -
>> - snprintf(temp->temp_input.name, sizeof(temp->temp_input.name),
>> - "temp%d_input", hwmon->count);
>> - temp->temp_input.attr.attr.name = temp->temp_input.name;
>> - temp->temp_input.attr.attr.mode = 0444;
>> - temp->temp_input.attr.show = temp_input_show;
>> - sysfs_attr_init(&temp->temp_input.attr.attr);
>> - result = device_create_file(hwmon->device, &temp->temp_input.attr);
>> - if (result)
>> - goto free_temp_mem;
>> -
>> - if (tz->ops->get_crit_temp) {
>> - unsigned long temperature;
>> - if (!tz->ops->get_crit_temp(tz, &temperature)) {
>> - snprintf(temp->temp_crit.name,
>> - sizeof(temp->temp_crit.name),
>> - "temp%d_crit", hwmon->count);
>> - temp->temp_crit.attr.attr.name = temp-
>>> temp_crit.name;
>> - temp->temp_crit.attr.attr.mode = 0444;
>> - temp->temp_crit.attr.show = temp_crit_show;
>> - sysfs_attr_init(&temp->temp_crit.attr.attr);
>> - result = device_create_file(hwmon->device,
>> - &temp->temp_crit.attr);
>> - if (result)
>> - goto unregister_input;
>> - }
>> - }
>> -
>> - mutex_lock(&thermal_list_lock);
>> - if (new_hwmon_device)
>> - list_add_tail(&hwmon->node, &thermal_hwmon_list);
>> - list_add_tail(&temp->hwmon_node, &hwmon->tz_list);
>> - mutex_unlock(&thermal_list_lock);
>> -
>> - return 0;
>> -
>> - unregister_input:
>> - device_remove_file(hwmon->device, &temp->temp_input.attr);
>> - free_temp_mem:
>> - kfree(temp);
>> - unregister_name:
>> - if (new_hwmon_device) {
>> - device_remove_file(hwmon->device, &dev_attr_name);
>> - hwmon_device_unregister(hwmon->device);
>> - }
>> - free_mem:
>> - if (new_hwmon_device)
>> - kfree(hwmon);
>> -
>> - return result;
>> -}
>> -
>> -static void
>> -thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
>> -{
>> - struct thermal_hwmon_device *hwmon;
>> - struct thermal_hwmon_temp *temp;
>> -
>> - hwmon = thermal_hwmon_lookup_by_type(tz);
>> - if (unlikely(!hwmon)) {
>> - /* Should never happen... */
>> - dev_dbg(&tz->device, "hwmon device lookup failed!\n");
>> - return;
>> - }
>> -
>> - temp = thermal_hwmon_lookup_temp(hwmon, tz);
>> - if (unlikely(!temp)) {
>> - /* Should never happen... */
>> - dev_dbg(&tz->device, "temperature input lookup failed!\n");
>> - return;
>> - }
>> -
>> - device_remove_file(hwmon->device, &temp->temp_input.attr);
>> - if (tz->ops->get_crit_temp)
>> - device_remove_file(hwmon->device, &temp->temp_crit.attr);
>> -
>> - mutex_lock(&thermal_list_lock);
>> - list_del(&temp->hwmon_node);
>> - kfree(temp);
>> - if (!list_empty(&hwmon->tz_list)) {
>> - mutex_unlock(&thermal_list_lock);
>> - return;
>> - }
>> - list_del(&hwmon->node);
>> - mutex_unlock(&thermal_list_lock);
>> -
>> - device_remove_file(hwmon->device, &dev_attr_name);
>> - hwmon_device_unregister(hwmon->device);
>> - kfree(hwmon);
>> -}
>> -#else
>> -static int
>> -thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
>> -{
>> - return 0;
>> -}
>> -
>> -static void
>> -thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
>> -{
>> -}
>> -#endif
>> -
>> /**
>> * thermal_zone_bind_cooling_device() - bind a cooling device to a thermal zone
>> * @tz: pointer to struct thermal_zone_device
>> diff --git a/drivers/thermal/thermal_hwmon.c
>> b/drivers/thermal/thermal_hwmon.c
>> new file mode 100644
>> index 0000000..7c665c8
>> --- /dev/null
>> +++ b/drivers/thermal/thermal_hwmon.c
>> @@ -0,0 +1,268 @@
>> +/*
>> + * thermal_hwmon.c - Generic Thermal Management hwmon support.
>> + *
>> + * Code based on Intel thermal_core.c. Copyrights of the original code:
>> + * Copyright (C) 2008 Intel Corp
>> + * Copyright (C) 2008 Zhang Rui <rui.zhang@intel.com>
>> + * Copyright (C) 2008 Sujith Thomas <sujith.thomas@intel.com>
>> + *
>> + * Copyright (C) 2013 Texas Instruments
>> + * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
>> + *
>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> ~~~~~~~~~~~~
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License as published by
>> + * the Free Software Foundation; version 2 of the License.
>> + *
>> + * This program is distributed in the hope that it will be useful, but
>> + * WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>> + * General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU General Public License along
>> + * with this program; if not, write to the Free Software Foundation, Inc.,
>> + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
>> + *
>> + *
>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> ~~~~~~~~~~~~
>> + */
>> +#include <linux/hwmon.h>
>> +#include <linux/thermal.h>
>> +#include <linux/slab.h>
>> +#include <linux/err.h>
>> +
>> +/* hwmon sys I/F */
>> +/* thermal zone devices with the same type share one hwmon device */
>> +struct thermal_hwmon_device {
>> + char type[THERMAL_NAME_LENGTH];
>> + struct device *device;
>> + int count;
>> + struct list_head tz_list;
>> + struct list_head node;
>> +};
>> +
>> +struct thermal_hwmon_attr {
>> + struct device_attribute attr;
>> + char name[16];
>> +};
>> +
>> +/* one temperature input for each thermal zone */
>> +struct thermal_hwmon_temp {
>> + struct list_head hwmon_node;
>> + struct thermal_zone_device *tz;
>> + struct thermal_hwmon_attr temp_input; /* hwmon sys attr */
>> + struct thermal_hwmon_attr temp_crit; /* hwmon sys attr */
>> +};
>> +
>> +static LIST_HEAD(thermal_hwmon_list);
>> +
>> +static DEFINE_MUTEX(thermal_hwmon_list_lock);
>> +
>> +static ssize_t
>> +name_show(struct device *dev, struct device_attribute *attr, char *buf)
>> +{
>> + struct thermal_hwmon_device *hwmon = dev_get_drvdata(dev);
>> + return sprintf(buf, "%s\n", hwmon->type);
>> +}
>> +static DEVICE_ATTR(name, 0444, name_show, NULL);
>> +
>> +static ssize_t
>> +temp_input_show(struct device *dev, struct device_attribute *attr, char *buf)
>> +{
>> + long temperature;
>> + int ret;
>> + struct thermal_hwmon_attr *hwmon_attr
>> + = container_of(attr, struct thermal_hwmon_attr, attr);
>> + struct thermal_hwmon_temp *temp
>> + = container_of(hwmon_attr, struct
>> thermal_hwmon_temp,
>> + temp_input);
>> + struct thermal_zone_device *tz = temp->tz;
>> +
>> + ret = thermal_zone_get_temp(tz, &temperature);
>> +
>> + if (ret)
>> + return ret;
>> +
>> + return sprintf(buf, "%ld\n", temperature);
>> +}
>> +
>> +static ssize_t
>> +temp_crit_show(struct device *dev, struct device_attribute *attr, char *buf)
>> +{
>> + struct thermal_hwmon_attr *hwmon_attr
>> + = container_of(attr, struct thermal_hwmon_attr, attr);
>> + struct thermal_hwmon_temp *temp
>> + = container_of(hwmon_attr, struct
>> thermal_hwmon_temp,
>> + temp_crit);
>> + struct thermal_zone_device *tz = temp->tz;
>> + long temperature;
>> + int ret;
>> +
>> + ret = tz->ops->get_trip_temp(tz, 0, &temperature);
>> + if (ret)
>> + return ret;
>> +
>> + return sprintf(buf, "%ld\n", temperature);
>> +}
>> +
>> +
>> +static struct thermal_hwmon_device *
>> +thermal_hwmon_lookup_by_type(const struct thermal_zone_device *tz)
>> +{
>> + struct thermal_hwmon_device *hwmon;
>> +
>> + mutex_lock(&thermal_hwmon_list_lock);
>> + list_for_each_entry(hwmon, &thermal_hwmon_list, node)
>> + if (!strcmp(hwmon->type, tz->type)) {
>> + mutex_unlock(&thermal_hwmon_list_lock);
>> + return hwmon;
>> + }
>> + mutex_unlock(&thermal_hwmon_list_lock);
>> +
>> + return NULL;
>> +}
>> +
>> +/* Find the temperature input matching a given thermal zone */
>> +static struct thermal_hwmon_temp *
>> +thermal_hwmon_lookup_temp(const struct thermal_hwmon_device *hwmon,
>> + const struct thermal_zone_device *tz)
>> +{
>> + struct thermal_hwmon_temp *temp;
>> +
>> + mutex_lock(&thermal_hwmon_list_lock);
>> + list_for_each_entry(temp, &hwmon->tz_list, hwmon_node)
>> + if (temp->tz == tz) {
>> + mutex_unlock(&thermal_hwmon_list_lock);
>> + return temp;
>> + }
>> + mutex_unlock(&thermal_hwmon_list_lock);
>> +
>> + return NULL;
>> +}
>> +
>> +int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
>> +{
>> + struct thermal_hwmon_device *hwmon;
>> + struct thermal_hwmon_temp *temp;
>> + int new_hwmon_device = 1;
>> + int result;
>> +
>> + hwmon = thermal_hwmon_lookup_by_type(tz);
>> + if (hwmon) {
>> + new_hwmon_device = 0;
>> + goto register_sys_interface;
>> + }
>> +
>> + hwmon = kzalloc(sizeof(struct thermal_hwmon_device), GFP_KERNEL);
>> + if (!hwmon)
>> + return -ENOMEM;
>> +
>> + INIT_LIST_HEAD(&hwmon->tz_list);
>> + strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH);
>> + hwmon->device = hwmon_device_register(NULL);
>> + if (IS_ERR(hwmon->device)) {
>> + result = PTR_ERR(hwmon->device);
>> + goto free_mem;
>> + }
>> + dev_set_drvdata(hwmon->device, hwmon);
>> + result = device_create_file(hwmon->device, &dev_attr_name);
>> + if (result)
>> + goto free_mem;
>> +
>> + register_sys_interface:
>> + temp = kzalloc(sizeof(struct thermal_hwmon_temp), GFP_KERNEL);
>> + if (!temp) {
>> + result = -ENOMEM;
>> + goto unregister_name;
>> + }
>> +
>> + temp->tz = tz;
>> + hwmon->count++;
>> +
>> + snprintf(temp->temp_input.name, sizeof(temp->temp_input.name),
>> + "temp%d_input", hwmon->count);
>> + temp->temp_input.attr.attr.name = temp->temp_input.name;
>> + temp->temp_input.attr.attr.mode = 0444;
>> + temp->temp_input.attr.show = temp_input_show;
>> + sysfs_attr_init(&temp->temp_input.attr.attr);
>> + result = device_create_file(hwmon->device, &temp->temp_input.attr);
>> + if (result)
>> + goto free_temp_mem;
>> +
>> + if (tz->ops->get_crit_temp) {
>> + unsigned long temperature;
>> + if (!tz->ops->get_crit_temp(tz, &temperature)) {
>> + snprintf(temp->temp_crit.name,
>> + sizeof(temp->temp_crit.name),
>> + "temp%d_crit", hwmon->count);
>> + temp->temp_crit.attr.attr.name = temp-
>>> temp_crit.name;
>> + temp->temp_crit.attr.attr.mode = 0444;
>> + temp->temp_crit.attr.show = temp_crit_show;
>> + sysfs_attr_init(&temp->temp_crit.attr.attr);
>> + result = device_create_file(hwmon->device,
>> + &temp->temp_crit.attr);
>> + if (result)
>> + goto unregister_input;
>> + }
>> + }
>> +
>> + mutex_lock(&thermal_hwmon_list_lock);
>> + if (new_hwmon_device)
>> + list_add_tail(&hwmon->node, &thermal_hwmon_list);
>> + list_add_tail(&temp->hwmon_node, &hwmon->tz_list);
>> + mutex_unlock(&thermal_hwmon_list_lock);
>> +
>> + return 0;
>> +
>> + unregister_input:
>> + device_remove_file(hwmon->device, &temp->temp_input.attr);
>> + free_temp_mem:
>> + kfree(temp);
>> + unregister_name:
>> + if (new_hwmon_device) {
>> + device_remove_file(hwmon->device, &dev_attr_name);
>> + hwmon_device_unregister(hwmon->device);
>> + }
>> + free_mem:
>> + if (new_hwmon_device)
>> + kfree(hwmon);
>> +
>> + return result;
>> +}
>> +
>> +void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
>> +{
>> + struct thermal_hwmon_device *hwmon;
>> + struct thermal_hwmon_temp *temp;
>> +
>> + hwmon = thermal_hwmon_lookup_by_type(tz);
>> + if (unlikely(!hwmon)) {
>> + /* Should never happen... */
>> + dev_dbg(&tz->device, "hwmon device lookup failed!\n");
>> + return;
>> + }
>> +
>> + temp = thermal_hwmon_lookup_temp(hwmon, tz);
>> + if (unlikely(!temp)) {
>> + /* Should never happen... */
>> + dev_dbg(&tz->device, "temperature input lookup failed!\n");
>> + return;
>> + }
>> +
>> + device_remove_file(hwmon->device, &temp->temp_input.attr);
>> + if (tz->ops->get_crit_temp)
>> + device_remove_file(hwmon->device, &temp->temp_crit.attr);
>> +
>> + mutex_lock(&thermal_hwmon_list_lock);
>> + list_del(&temp->hwmon_node);
>> + kfree(temp);
>> + if (!list_empty(&hwmon->tz_list)) {
>> + mutex_unlock(&thermal_hwmon_list_lock);
>> + return;
>> + }
>> + list_del(&hwmon->node);
>> + mutex_unlock(&thermal_hwmon_list_lock);
>> +
>> + device_remove_file(hwmon->device, &dev_attr_name);
>> + hwmon_device_unregister(hwmon->device);
>> + kfree(hwmon);
>> +}
>> diff --git a/drivers/thermal/thermal_hwmon.h
>> b/drivers/thermal/thermal_hwmon.h
>> new file mode 100644
>> index 0000000..c798fdb
>> --- /dev/null
>> +++ b/drivers/thermal/thermal_hwmon.h
>> @@ -0,0 +1,49 @@
>> +/*
>> + * thermal_hwmon.h - Generic Thermal Management hwmon support.
>> + *
>> + * Code based on Intel thermal_core.c. Copyrights of the original code:
>> + * Copyright (C) 2008 Intel Corp
>> + * Copyright (C) 2008 Zhang Rui <rui.zhang@intel.com>
>> + * Copyright (C) 2008 Sujith Thomas <sujith.thomas@intel.com>
>> + *
>> + * Copyright (C) 2013 Texas Instruments
>> + * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
>> + *
>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> ~~~~~~~~~~~~
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License as published by
>> + * the Free Software Foundation; version 2 of the License.
>> + *
>> + * This program is distributed in the hope that it will be useful, but
>> + * WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>> + * General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU General Public License along
>> + * with this program; if not, write to the Free Software Foundation, Inc.,
>> + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
>> + *
>> + *
>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> ~~~~~~~~~~~~
>> + */
>> +#ifndef __THERMAL_HWMON_H__
>> +#define __THERMAL_HWMON_H__
>> +
>> +#include <linux/thermal.h>
>> +
>> +#ifdef CONFIG_THERMAL_HWMON
>> +int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz);
>> +void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz);
>> +#else
>> +static int
>> +thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
>> +{
>> + return 0;
>> +}
>> +
>> +static void
>> +thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
>> +{
>> +}
>> +#endif
>> +
>> +#endif /* __THERMAL_HWMON_H__ */
>> --
>> 1.8.2.1.342.gfa7285d
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-pm" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
--
You have got to be excited about what you are doing. (L. Lamport)
Eduardo Valentin
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 295 bytes --]
^ permalink raw reply [flat|nested] 33+ messages in thread* RE: [RFC PATCH 1/4] thermal: hwmon: move hwmon support to single file
2013-07-09 16:54 ` Eduardo Valentin
@ 2013-07-09 17:14 ` R, Durgadoss
2013-07-17 9:49 ` Wei Ni
1 sibling, 0 replies; 33+ messages in thread
From: R, Durgadoss @ 2013-07-09 17:14 UTC (permalink / raw)
To: Eduardo Valentin; +Cc: linux-pm, amit.daniel, Zhang, Rui, linux-kernel
> -----Original Message-----
> From: linux-pm-owner@vger.kernel.org [mailto:linux-pm-
> owner@vger.kernel.org] On Behalf Of Eduardo Valentin
> Sent: Tuesday, July 09, 2013 10:24 PM
> To: R, Durgadoss
> Cc: Eduardo Valentin; linux-pm@vger.kernel.org; amit.daniel@samsung.com;
> Zhang, Rui; linux-kernel@vger.kernel.org
> Subject: Re: [RFC PATCH 1/4] thermal: hwmon: move hwmon support to single
> file
>
> On 09-07-2013 12:04, R, Durgadoss wrote:
> > Hi Eduardo,
> >
> >> -----Original Message-----
> >> From: linux-pm-owner@vger.kernel.org [mailto:linux-pm-
> >> owner@vger.kernel.org] On Behalf Of Eduardo Valentin
> >> Sent: Tuesday, July 09, 2013 7:30 PM
> >> To: linux-pm@vger.kernel.org; R, Durgadoss; amit.daniel@samsung.com
> >> Cc: Zhang, Rui; Eduardo Valentin; linux-kernel@vger.kernel.org
> >> Subject: [RFC PATCH 1/4] thermal: hwmon: move hwmon support to single file
> >>
> >> In order to improve code organization, this patch
> >> moves the hwmon sysfs support to a file named
> >> thermal_hwmon. This helps to add extra support
> >> for hwmon without scrambling the code.
> >
> > Nice clean up for thermal_core.c. +1 from me.
> >
> > I am inclined to even remove the hwmon related code completely.
> > AFAIK, there are not many users of this config option.
> >
>
> Hmm. OK. I thought of keeping it as I dont know if there are users.
Yes. This is fine for now.
> Besides, if new code comes out of the hwmon2thermalfw exercise, then it
> would be a good place to keep all the hwmon code.
>
> > However people are looking for the other option. If they have a
> > hwmon driver, how can it use the thermal framework with ease.
> > [like what you mentioned about this in 0/5]
>
> yes, problem is that hwmon does not have a standard way of representing
> the drivers. So, one cannot simply write a simple wrapper because hwmon
> drivers does not have a standard get_temperature operation, for instance.
>
> We could either propose a way to standardize then or implement the call
> to thermal fw driver by driver. Probably the later is desirable, if we
> implement it in a need basis.
later is desirable: Agreed.
Thanks,
Durga
>
> >
> > Thanks,
> > Durga
> >
> >>
> >> In order to do this move, the hwmon list head is now
> >> using its own locking. Before, the list used
> >> the global thermal locking.
> >>
> >> Cc: Zhang Rui <rui.zhang@intel.com>
> >> Cc: linux-pm@vger.kernel.org
> >> Cc: linux-kernel@vger.kernel.org
> >> Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
> >> ---
> >> drivers/thermal/Kconfig | 9 ++
> >> drivers/thermal/Makefile | 3 +
> >> drivers/thermal/thermal_core.c | 255 +-------------------------------------
> >> drivers/thermal/thermal_hwmon.c | 268
> >> ++++++++++++++++++++++++++++++++++++++++
> >> drivers/thermal/thermal_hwmon.h | 49 ++++++++
> >> 5 files changed, 330 insertions(+), 254 deletions(-)
> >> create mode 100644 drivers/thermal/thermal_hwmon.c
> >> create mode 100644 drivers/thermal/thermal_hwmon.h
> >>
> >> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> >> index e988c81..7fb16bc 100644
> >> --- a/drivers/thermal/Kconfig
> >> +++ b/drivers/thermal/Kconfig
> >> @@ -17,8 +17,17 @@ if THERMAL
> >>
> >> config THERMAL_HWMON
> >> bool
> >> + prompt "Expose thermal sensors as hwmon device"
> >> depends on HWMON=y || HWMON=THERMAL
> >> default y
> >> + help
> >> + In case a sensor is registered with the thermal
> >> + framework, this option will also register it
> >> + as a hwmon. The sensor will then have the common
> >> + hwmon sysfs interface.
> >> +
> >> + Say 'Y' here if you want all thermal sensors to
> >> + have hwmon sysfs interface too.
> >>
> >> choice
> >> prompt "Default Thermal governor"
> >> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> >> index 67184a2..24cb894 100644
> >> --- a/drivers/thermal/Makefile
> >> +++ b/drivers/thermal/Makefile
> >> @@ -5,6 +5,9 @@
> >> obj-$(CONFIG_THERMAL) += thermal_sys.o
> >> thermal_sys-y += thermal_core.o
> >>
> >> +# interface to/from other layers providing sensors
> >> +thermal_sys-$(CONFIG_THERMAL_HWMON) +=
> thermal_hwmon.o
> >> +
> >> # governors
> >> thermal_sys-$(CONFIG_THERMAL_GOV_FAIR_SHARE) += fair_share.o
> >> thermal_sys-$(CONFIG_THERMAL_GOV_STEP_WISE) += step_wise.o
> >> diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
> >> index 1f02e8e..247528b 100644
> >> --- a/drivers/thermal/thermal_core.c
> >> +++ b/drivers/thermal/thermal_core.c
> >> @@ -38,6 +38,7 @@
> >> #include <net/genetlink.h>
> >>
> >> #include "thermal_core.h"
> >> +#include "thermal_hwmon.h"
> >>
> >> MODULE_AUTHOR("Zhang Rui");
> >> MODULE_DESCRIPTION("Generic thermal management sysfs support");
> >> @@ -859,260 +860,6 @@ thermal_cooling_device_trip_point_show(struct
> device
> >> *dev,
> >>
> >> /* Device management */
> >>
> >> -#if defined(CONFIG_THERMAL_HWMON)
> >> -
> >> -/* hwmon sys I/F */
> >> -#include <linux/hwmon.h>
> >> -
> >> -/* thermal zone devices with the same type share one hwmon device */
> >> -struct thermal_hwmon_device {
> >> - char type[THERMAL_NAME_LENGTH];
> >> - struct device *device;
> >> - int count;
> >> - struct list_head tz_list;
> >> - struct list_head node;
> >> -};
> >> -
> >> -struct thermal_hwmon_attr {
> >> - struct device_attribute attr;
> >> - char name[16];
> >> -};
> >> -
> >> -/* one temperature input for each thermal zone */
> >> -struct thermal_hwmon_temp {
> >> - struct list_head hwmon_node;
> >> - struct thermal_zone_device *tz;
> >> - struct thermal_hwmon_attr temp_input; /* hwmon sys attr */
> >> - struct thermal_hwmon_attr temp_crit; /* hwmon sys attr */
> >> -};
> >> -
> >> -static LIST_HEAD(thermal_hwmon_list);
> >> -
> >> -static ssize_t
> >> -name_show(struct device *dev, struct device_attribute *attr, char *buf)
> >> -{
> >> - struct thermal_hwmon_device *hwmon = dev_get_drvdata(dev);
> >> - return sprintf(buf, "%s\n", hwmon->type);
> >> -}
> >> -static DEVICE_ATTR(name, 0444, name_show, NULL);
> >> -
> >> -static ssize_t
> >> -temp_input_show(struct device *dev, struct device_attribute *attr, char
> *buf)
> >> -{
> >> - long temperature;
> >> - int ret;
> >> - struct thermal_hwmon_attr *hwmon_attr
> >> - = container_of(attr, struct thermal_hwmon_attr, attr);
> >> - struct thermal_hwmon_temp *temp
> >> - = container_of(hwmon_attr, struct
> >> thermal_hwmon_temp,
> >> - temp_input);
> >> - struct thermal_zone_device *tz = temp->tz;
> >> -
> >> - ret = thermal_zone_get_temp(tz, &temperature);
> >> -
> >> - if (ret)
> >> - return ret;
> >> -
> >> - return sprintf(buf, "%ld\n", temperature);
> >> -}
> >> -
> >> -static ssize_t
> >> -temp_crit_show(struct device *dev, struct device_attribute *attr,
> >> - char *buf)
> >> -{
> >> - struct thermal_hwmon_attr *hwmon_attr
> >> - = container_of(attr, struct thermal_hwmon_attr, attr);
> >> - struct thermal_hwmon_temp *temp
> >> - = container_of(hwmon_attr, struct
> >> thermal_hwmon_temp,
> >> - temp_crit);
> >> - struct thermal_zone_device *tz = temp->tz;
> >> - long temperature;
> >> - int ret;
> >> -
> >> - ret = tz->ops->get_trip_temp(tz, 0, &temperature);
> >> - if (ret)
> >> - return ret;
> >> -
> >> - return sprintf(buf, "%ld\n", temperature);
> >> -}
> >> -
> >> -
> >> -static struct thermal_hwmon_device *
> >> -thermal_hwmon_lookup_by_type(const struct thermal_zone_device *tz)
> >> -{
> >> - struct thermal_hwmon_device *hwmon;
> >> -
> >> - mutex_lock(&thermal_list_lock);
> >> - list_for_each_entry(hwmon, &thermal_hwmon_list, node)
> >> - if (!strcmp(hwmon->type, tz->type)) {
> >> - mutex_unlock(&thermal_list_lock);
> >> - return hwmon;
> >> - }
> >> - mutex_unlock(&thermal_list_lock);
> >> -
> >> - return NULL;
> >> -}
> >> -
> >> -/* Find the temperature input matching a given thermal zone */
> >> -static struct thermal_hwmon_temp *
> >> -thermal_hwmon_lookup_temp(const struct thermal_hwmon_device
> *hwmon,
> >> - const struct thermal_zone_device *tz)
> >> -{
> >> - struct thermal_hwmon_temp *temp;
> >> -
> >> - mutex_lock(&thermal_list_lock);
> >> - list_for_each_entry(temp, &hwmon->tz_list, hwmon_node)
> >> - if (temp->tz == tz) {
> >> - mutex_unlock(&thermal_list_lock);
> >> - return temp;
> >> - }
> >> - mutex_unlock(&thermal_list_lock);
> >> -
> >> - return NULL;
> >> -}
> >> -
> >> -static int
> >> -thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
> >> -{
> >> - struct thermal_hwmon_device *hwmon;
> >> - struct thermal_hwmon_temp *temp;
> >> - int new_hwmon_device = 1;
> >> - int result;
> >> -
> >> - hwmon = thermal_hwmon_lookup_by_type(tz);
> >> - if (hwmon) {
> >> - new_hwmon_device = 0;
> >> - goto register_sys_interface;
> >> - }
> >> -
> >> - hwmon = kzalloc(sizeof(struct thermal_hwmon_device), GFP_KERNEL);
> >> - if (!hwmon)
> >> - return -ENOMEM;
> >> -
> >> - INIT_LIST_HEAD(&hwmon->tz_list);
> >> - strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH);
> >> - hwmon->device = hwmon_device_register(NULL);
> >> - if (IS_ERR(hwmon->device)) {
> >> - result = PTR_ERR(hwmon->device);
> >> - goto free_mem;
> >> - }
> >> - dev_set_drvdata(hwmon->device, hwmon);
> >> - result = device_create_file(hwmon->device, &dev_attr_name);
> >> - if (result)
> >> - goto free_mem;
> >> -
> >> - register_sys_interface:
> >> - temp = kzalloc(sizeof(struct thermal_hwmon_temp), GFP_KERNEL);
> >> - if (!temp) {
> >> - result = -ENOMEM;
> >> - goto unregister_name;
> >> - }
> >> -
> >> - temp->tz = tz;
> >> - hwmon->count++;
> >> -
> >> - snprintf(temp->temp_input.name, sizeof(temp->temp_input.name),
> >> - "temp%d_input", hwmon->count);
> >> - temp->temp_input.attr.attr.name = temp->temp_input.name;
> >> - temp->temp_input.attr.attr.mode = 0444;
> >> - temp->temp_input.attr.show = temp_input_show;
> >> - sysfs_attr_init(&temp->temp_input.attr.attr);
> >> - result = device_create_file(hwmon->device, &temp->temp_input.attr);
> >> - if (result)
> >> - goto free_temp_mem;
> >> -
> >> - if (tz->ops->get_crit_temp) {
> >> - unsigned long temperature;
> >> - if (!tz->ops->get_crit_temp(tz, &temperature)) {
> >> - snprintf(temp->temp_crit.name,
> >> - sizeof(temp->temp_crit.name),
> >> - "temp%d_crit", hwmon->count);
> >> - temp->temp_crit.attr.attr.name = temp-
> >>> temp_crit.name;
> >> - temp->temp_crit.attr.attr.mode = 0444;
> >> - temp->temp_crit.attr.show = temp_crit_show;
> >> - sysfs_attr_init(&temp->temp_crit.attr.attr);
> >> - result = device_create_file(hwmon->device,
> >> - &temp->temp_crit.attr);
> >> - if (result)
> >> - goto unregister_input;
> >> - }
> >> - }
> >> -
> >> - mutex_lock(&thermal_list_lock);
> >> - if (new_hwmon_device)
> >> - list_add_tail(&hwmon->node, &thermal_hwmon_list);
> >> - list_add_tail(&temp->hwmon_node, &hwmon->tz_list);
> >> - mutex_unlock(&thermal_list_lock);
> >> -
> >> - return 0;
> >> -
> >> - unregister_input:
> >> - device_remove_file(hwmon->device, &temp->temp_input.attr);
> >> - free_temp_mem:
> >> - kfree(temp);
> >> - unregister_name:
> >> - if (new_hwmon_device) {
> >> - device_remove_file(hwmon->device, &dev_attr_name);
> >> - hwmon_device_unregister(hwmon->device);
> >> - }
> >> - free_mem:
> >> - if (new_hwmon_device)
> >> - kfree(hwmon);
> >> -
> >> - return result;
> >> -}
> >> -
> >> -static void
> >> -thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
> >> -{
> >> - struct thermal_hwmon_device *hwmon;
> >> - struct thermal_hwmon_temp *temp;
> >> -
> >> - hwmon = thermal_hwmon_lookup_by_type(tz);
> >> - if (unlikely(!hwmon)) {
> >> - /* Should never happen... */
> >> - dev_dbg(&tz->device, "hwmon device lookup failed!\n");
> >> - return;
> >> - }
> >> -
> >> - temp = thermal_hwmon_lookup_temp(hwmon, tz);
> >> - if (unlikely(!temp)) {
> >> - /* Should never happen... */
> >> - dev_dbg(&tz->device, "temperature input lookup failed!\n");
> >> - return;
> >> - }
> >> -
> >> - device_remove_file(hwmon->device, &temp->temp_input.attr);
> >> - if (tz->ops->get_crit_temp)
> >> - device_remove_file(hwmon->device, &temp->temp_crit.attr);
> >> -
> >> - mutex_lock(&thermal_list_lock);
> >> - list_del(&temp->hwmon_node);
> >> - kfree(temp);
> >> - if (!list_empty(&hwmon->tz_list)) {
> >> - mutex_unlock(&thermal_list_lock);
> >> - return;
> >> - }
> >> - list_del(&hwmon->node);
> >> - mutex_unlock(&thermal_list_lock);
> >> -
> >> - device_remove_file(hwmon->device, &dev_attr_name);
> >> - hwmon_device_unregister(hwmon->device);
> >> - kfree(hwmon);
> >> -}
> >> -#else
> >> -static int
> >> -thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
> >> -{
> >> - return 0;
> >> -}
> >> -
> >> -static void
> >> -thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
> >> -{
> >> -}
> >> -#endif
> >> -
> >> /**
> >> * thermal_zone_bind_cooling_device() - bind a cooling device to a thermal
> zone
> >> * @tz: pointer to struct thermal_zone_device
> >> diff --git a/drivers/thermal/thermal_hwmon.c
> >> b/drivers/thermal/thermal_hwmon.c
> >> new file mode 100644
> >> index 0000000..7c665c8
> >> --- /dev/null
> >> +++ b/drivers/thermal/thermal_hwmon.c
> >> @@ -0,0 +1,268 @@
> >> +/*
> >> + * thermal_hwmon.c - Generic Thermal Management hwmon support.
> >> + *
> >> + * Code based on Intel thermal_core.c. Copyrights of the original code:
> >> + * Copyright (C) 2008 Intel Corp
> >> + * Copyright (C) 2008 Zhang Rui <rui.zhang@intel.com>
> >> + * Copyright (C) 2008 Sujith Thomas <sujith.thomas@intel.com>
> >> + *
> >> + * Copyright (C) 2013 Texas Instruments
> >> + * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
> >> + *
> >>
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >> ~~~~~~~~~~~~
> >> + *
> >> + * This program is free software; you can redistribute it and/or modify
> >> + * it under the terms of the GNU General Public License as published by
> >> + * the Free Software Foundation; version 2 of the License.
> >> + *
> >> + * This program is distributed in the hope that it will be useful, but
> >> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> GNU
> >> + * General Public License for more details.
> >> + *
> >> + * You should have received a copy of the GNU General Public License along
> >> + * with this program; if not, write to the Free Software Foundation, Inc.,
> >> + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
> >> + *
> >> + *
> >>
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >> ~~~~~~~~~~~~
> >> + */
> >> +#include <linux/hwmon.h>
> >> +#include <linux/thermal.h>
> >> +#include <linux/slab.h>
> >> +#include <linux/err.h>
> >> +
> >> +/* hwmon sys I/F */
> >> +/* thermal zone devices with the same type share one hwmon device */
> >> +struct thermal_hwmon_device {
> >> + char type[THERMAL_NAME_LENGTH];
> >> + struct device *device;
> >> + int count;
> >> + struct list_head tz_list;
> >> + struct list_head node;
> >> +};
> >> +
> >> +struct thermal_hwmon_attr {
> >> + struct device_attribute attr;
> >> + char name[16];
> >> +};
> >> +
> >> +/* one temperature input for each thermal zone */
> >> +struct thermal_hwmon_temp {
> >> + struct list_head hwmon_node;
> >> + struct thermal_zone_device *tz;
> >> + struct thermal_hwmon_attr temp_input; /* hwmon sys attr */
> >> + struct thermal_hwmon_attr temp_crit; /* hwmon sys attr */
> >> +};
> >> +
> >> +static LIST_HEAD(thermal_hwmon_list);
> >> +
> >> +static DEFINE_MUTEX(thermal_hwmon_list_lock);
> >> +
> >> +static ssize_t
> >> +name_show(struct device *dev, struct device_attribute *attr, char *buf)
> >> +{
> >> + struct thermal_hwmon_device *hwmon = dev_get_drvdata(dev);
> >> + return sprintf(buf, "%s\n", hwmon->type);
> >> +}
> >> +static DEVICE_ATTR(name, 0444, name_show, NULL);
> >> +
> >> +static ssize_t
> >> +temp_input_show(struct device *dev, struct device_attribute *attr, char
> *buf)
> >> +{
> >> + long temperature;
> >> + int ret;
> >> + struct thermal_hwmon_attr *hwmon_attr
> >> + = container_of(attr, struct thermal_hwmon_attr, attr);
> >> + struct thermal_hwmon_temp *temp
> >> + = container_of(hwmon_attr, struct
> >> thermal_hwmon_temp,
> >> + temp_input);
> >> + struct thermal_zone_device *tz = temp->tz;
> >> +
> >> + ret = thermal_zone_get_temp(tz, &temperature);
> >> +
> >> + if (ret)
> >> + return ret;
> >> +
> >> + return sprintf(buf, "%ld\n", temperature);
> >> +}
> >> +
> >> +static ssize_t
> >> +temp_crit_show(struct device *dev, struct device_attribute *attr, char *buf)
> >> +{
> >> + struct thermal_hwmon_attr *hwmon_attr
> >> + = container_of(attr, struct thermal_hwmon_attr, attr);
> >> + struct thermal_hwmon_temp *temp
> >> + = container_of(hwmon_attr, struct
> >> thermal_hwmon_temp,
> >> + temp_crit);
> >> + struct thermal_zone_device *tz = temp->tz;
> >> + long temperature;
> >> + int ret;
> >> +
> >> + ret = tz->ops->get_trip_temp(tz, 0, &temperature);
> >> + if (ret)
> >> + return ret;
> >> +
> >> + return sprintf(buf, "%ld\n", temperature);
> >> +}
> >> +
> >> +
> >> +static struct thermal_hwmon_device *
> >> +thermal_hwmon_lookup_by_type(const struct thermal_zone_device *tz)
> >> +{
> >> + struct thermal_hwmon_device *hwmon;
> >> +
> >> + mutex_lock(&thermal_hwmon_list_lock);
> >> + list_for_each_entry(hwmon, &thermal_hwmon_list, node)
> >> + if (!strcmp(hwmon->type, tz->type)) {
> >> + mutex_unlock(&thermal_hwmon_list_lock);
> >> + return hwmon;
> >> + }
> >> + mutex_unlock(&thermal_hwmon_list_lock);
> >> +
> >> + return NULL;
> >> +}
> >> +
> >> +/* Find the temperature input matching a given thermal zone */
> >> +static struct thermal_hwmon_temp *
> >> +thermal_hwmon_lookup_temp(const struct thermal_hwmon_device
> *hwmon,
> >> + const struct thermal_zone_device *tz)
> >> +{
> >> + struct thermal_hwmon_temp *temp;
> >> +
> >> + mutex_lock(&thermal_hwmon_list_lock);
> >> + list_for_each_entry(temp, &hwmon->tz_list, hwmon_node)
> >> + if (temp->tz == tz) {
> >> + mutex_unlock(&thermal_hwmon_list_lock);
> >> + return temp;
> >> + }
> >> + mutex_unlock(&thermal_hwmon_list_lock);
> >> +
> >> + return NULL;
> >> +}
> >> +
> >> +int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
> >> +{
> >> + struct thermal_hwmon_device *hwmon;
> >> + struct thermal_hwmon_temp *temp;
> >> + int new_hwmon_device = 1;
> >> + int result;
> >> +
> >> + hwmon = thermal_hwmon_lookup_by_type(tz);
> >> + if (hwmon) {
> >> + new_hwmon_device = 0;
> >> + goto register_sys_interface;
> >> + }
> >> +
> >> + hwmon = kzalloc(sizeof(struct thermal_hwmon_device), GFP_KERNEL);
> >> + if (!hwmon)
> >> + return -ENOMEM;
> >> +
> >> + INIT_LIST_HEAD(&hwmon->tz_list);
> >> + strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH);
> >> + hwmon->device = hwmon_device_register(NULL);
> >> + if (IS_ERR(hwmon->device)) {
> >> + result = PTR_ERR(hwmon->device);
> >> + goto free_mem;
> >> + }
> >> + dev_set_drvdata(hwmon->device, hwmon);
> >> + result = device_create_file(hwmon->device, &dev_attr_name);
> >> + if (result)
> >> + goto free_mem;
> >> +
> >> + register_sys_interface:
> >> + temp = kzalloc(sizeof(struct thermal_hwmon_temp), GFP_KERNEL);
> >> + if (!temp) {
> >> + result = -ENOMEM;
> >> + goto unregister_name;
> >> + }
> >> +
> >> + temp->tz = tz;
> >> + hwmon->count++;
> >> +
> >> + snprintf(temp->temp_input.name, sizeof(temp->temp_input.name),
> >> + "temp%d_input", hwmon->count);
> >> + temp->temp_input.attr.attr.name = temp->temp_input.name;
> >> + temp->temp_input.attr.attr.mode = 0444;
> >> + temp->temp_input.attr.show = temp_input_show;
> >> + sysfs_attr_init(&temp->temp_input.attr.attr);
> >> + result = device_create_file(hwmon->device, &temp->temp_input.attr);
> >> + if (result)
> >> + goto free_temp_mem;
> >> +
> >> + if (tz->ops->get_crit_temp) {
> >> + unsigned long temperature;
> >> + if (!tz->ops->get_crit_temp(tz, &temperature)) {
> >> + snprintf(temp->temp_crit.name,
> >> + sizeof(temp->temp_crit.name),
> >> + "temp%d_crit", hwmon->count);
> >> + temp->temp_crit.attr.attr.name = temp-
> >>> temp_crit.name;
> >> + temp->temp_crit.attr.attr.mode = 0444;
> >> + temp->temp_crit.attr.show = temp_crit_show;
> >> + sysfs_attr_init(&temp->temp_crit.attr.attr);
> >> + result = device_create_file(hwmon->device,
> >> + &temp->temp_crit.attr);
> >> + if (result)
> >> + goto unregister_input;
> >> + }
> >> + }
> >> +
> >> + mutex_lock(&thermal_hwmon_list_lock);
> >> + if (new_hwmon_device)
> >> + list_add_tail(&hwmon->node, &thermal_hwmon_list);
> >> + list_add_tail(&temp->hwmon_node, &hwmon->tz_list);
> >> + mutex_unlock(&thermal_hwmon_list_lock);
> >> +
> >> + return 0;
> >> +
> >> + unregister_input:
> >> + device_remove_file(hwmon->device, &temp->temp_input.attr);
> >> + free_temp_mem:
> >> + kfree(temp);
> >> + unregister_name:
> >> + if (new_hwmon_device) {
> >> + device_remove_file(hwmon->device, &dev_attr_name);
> >> + hwmon_device_unregister(hwmon->device);
> >> + }
> >> + free_mem:
> >> + if (new_hwmon_device)
> >> + kfree(hwmon);
> >> +
> >> + return result;
> >> +}
> >> +
> >> +void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
> >> +{
> >> + struct thermal_hwmon_device *hwmon;
> >> + struct thermal_hwmon_temp *temp;
> >> +
> >> + hwmon = thermal_hwmon_lookup_by_type(tz);
> >> + if (unlikely(!hwmon)) {
> >> + /* Should never happen... */
> >> + dev_dbg(&tz->device, "hwmon device lookup failed!\n");
> >> + return;
> >> + }
> >> +
> >> + temp = thermal_hwmon_lookup_temp(hwmon, tz);
> >> + if (unlikely(!temp)) {
> >> + /* Should never happen... */
> >> + dev_dbg(&tz->device, "temperature input lookup failed!\n");
> >> + return;
> >> + }
> >> +
> >> + device_remove_file(hwmon->device, &temp->temp_input.attr);
> >> + if (tz->ops->get_crit_temp)
> >> + device_remove_file(hwmon->device, &temp->temp_crit.attr);
> >> +
> >> + mutex_lock(&thermal_hwmon_list_lock);
> >> + list_del(&temp->hwmon_node);
> >> + kfree(temp);
> >> + if (!list_empty(&hwmon->tz_list)) {
> >> + mutex_unlock(&thermal_hwmon_list_lock);
> >> + return;
> >> + }
> >> + list_del(&hwmon->node);
> >> + mutex_unlock(&thermal_hwmon_list_lock);
> >> +
> >> + device_remove_file(hwmon->device, &dev_attr_name);
> >> + hwmon_device_unregister(hwmon->device);
> >> + kfree(hwmon);
> >> +}
> >> diff --git a/drivers/thermal/thermal_hwmon.h
> >> b/drivers/thermal/thermal_hwmon.h
> >> new file mode 100644
> >> index 0000000..c798fdb
> >> --- /dev/null
> >> +++ b/drivers/thermal/thermal_hwmon.h
> >> @@ -0,0 +1,49 @@
> >> +/*
> >> + * thermal_hwmon.h - Generic Thermal Management hwmon support.
> >> + *
> >> + * Code based on Intel thermal_core.c. Copyrights of the original code:
> >> + * Copyright (C) 2008 Intel Corp
> >> + * Copyright (C) 2008 Zhang Rui <rui.zhang@intel.com>
> >> + * Copyright (C) 2008 Sujith Thomas <sujith.thomas@intel.com>
> >> + *
> >> + * Copyright (C) 2013 Texas Instruments
> >> + * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
> >> + *
> >>
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >> ~~~~~~~~~~~~
> >> + *
> >> + * This program is free software; you can redistribute it and/or modify
> >> + * it under the terms of the GNU General Public License as published by
> >> + * the Free Software Foundation; version 2 of the License.
> >> + *
> >> + * This program is distributed in the hope that it will be useful, but
> >> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> GNU
> >> + * General Public License for more details.
> >> + *
> >> + * You should have received a copy of the GNU General Public License along
> >> + * with this program; if not, write to the Free Software Foundation, Inc.,
> >> + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
> >> + *
> >> + *
> >>
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >> ~~~~~~~~~~~~
> >> + */
> >> +#ifndef __THERMAL_HWMON_H__
> >> +#define __THERMAL_HWMON_H__
> >> +
> >> +#include <linux/thermal.h>
> >> +
> >> +#ifdef CONFIG_THERMAL_HWMON
> >> +int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz);
> >> +void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz);
> >> +#else
> >> +static int
> >> +thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
> >> +{
> >> + return 0;
> >> +}
> >> +
> >> +static void
> >> +thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
> >> +{
> >> +}
> >> +#endif
> >> +
> >> +#endif /* __THERMAL_HWMON_H__ */
> >> --
> >> 1.8.2.1.342.gfa7285d
> >>
> >> --
> >> To unsubscribe from this list: send the line "unsubscribe linux-pm" in
> >> the body of a message to majordomo@vger.kernel.org
> >> More majordomo info at http://vger.kernel.org/majordomo-info.html
> >
> >
>
>
> --
> You have got to be excited about what you are doing. (L. Lamport)
>
> Eduardo Valentin
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [RFC PATCH 1/4] thermal: hwmon: move hwmon support to single file
2013-07-09 16:54 ` Eduardo Valentin
2013-07-09 17:14 ` R, Durgadoss
@ 2013-07-17 9:49 ` Wei Ni
2013-07-17 10:07 ` R, Durgadoss
1 sibling, 1 reply; 33+ messages in thread
From: Wei Ni @ 2013-07-17 9:49 UTC (permalink / raw)
To: Eduardo Valentin
Cc: R, Durgadoss, linux-pm, amit.daniel, Zhang, Rui, linux-kernel
On 07/10/2013 12:54 AM, Eduardo Valentin wrote:
> * PGP Signed: 07/09/2013 at 09:54:04 AM
>
> On 09-07-2013 12:04, R, Durgadoss wrote:
>> Hi Eduardo,
>>
>>> -----Original Message-----
>>> From: linux-pm-owner@vger.kernel.org [mailto:linux-pm-
>>> owner@vger.kernel.org] On Behalf Of Eduardo Valentin
>>> Sent: Tuesday, July 09, 2013 7:30 PM
>>> To: linux-pm@vger.kernel.org; R, Durgadoss; amit.daniel@samsung.com
>>> Cc: Zhang, Rui; Eduardo Valentin; linux-kernel@vger.kernel.org
>>> Subject: [RFC PATCH 1/4] thermal: hwmon: move hwmon support to single file
>>>
>>> In order to improve code organization, this patch
>>> moves the hwmon sysfs support to a file named
>>> thermal_hwmon. This helps to add extra support
>>> for hwmon without scrambling the code.
>>
>> Nice clean up for thermal_core.c. +1 from me.
>>
>> I am inclined to even remove the hwmon related code completely.
>> AFAIK, there are not many users of this config option.
>>
>
> Hmm. OK. I thought of keeping it as I dont know if there are users.
> Besides, if new code comes out of the hwmon2thermalfw exercise, then it
> would be a good place to keep all the hwmon code.
>
>> However people are looking for the other option. If they have a
>> hwmon driver, how can it use the thermal framework with ease.
>> [like what you mentioned about this in 0/5]
Yes, I'm trying to add lm90 driver to the thermal framework, but this
driver already register as a hwmon device, so when register as thermal
zone device, the thermal framework will register another virtual hwmon
device, it mean we have duplicate hwmon devices, it will make confusion.
How about to add a flag in the thermal_zone_params, so when call
thermal_zone_device_register() to register, this flag can indicate if we
want to register the virtual hwmon device or not.
Thanks.
Wei.
>
> yes, problem is that hwmon does not have a standard way of representing
> the drivers. So, one cannot simply write a simple wrapper because hwmon
> drivers does not have a standard get_temperature operation, for instance.
>
> We could either propose a way to standardize then or implement the call
> to thermal fw driver by driver. Probably the later is desirable, if we
> implement it in a need basis.
>
>>
>> Thanks,
>> Durga
>>
>>>
>>> In order to do this move, the hwmon list head is now
>>> using its own locking. Before, the list used
>>> the global thermal locking.
>>>
>>> Cc: Zhang Rui <rui.zhang@intel.com>
>>> Cc: linux-pm@vger.kernel.org
>>> Cc: linux-kernel@vger.kernel.org
>>> Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
>>> ---
>>> drivers/thermal/Kconfig | 9 ++
>>> drivers/thermal/Makefile | 3 +
>>> drivers/thermal/thermal_core.c | 255 +-------------------------------------
>>> drivers/thermal/thermal_hwmon.c | 268
>>> ++++++++++++++++++++++++++++++++++++++++
>>> drivers/thermal/thermal_hwmon.h | 49 ++++++++
>>> 5 files changed, 330 insertions(+), 254 deletions(-)
>>> create mode 100644 drivers/thermal/thermal_hwmon.c
>>> create mode 100644 drivers/thermal/thermal_hwmon.h
>>>
>>> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
>>> index e988c81..7fb16bc 100644
>>> --- a/drivers/thermal/Kconfig
>>> +++ b/drivers/thermal/Kconfig
>>> @@ -17,8 +17,17 @@ if THERMAL
>>>
>>> config THERMAL_HWMON
>>> bool
>>> + prompt "Expose thermal sensors as hwmon device"
>>> depends on HWMON=y || HWMON=THERMAL
>>> default y
>>> + help
>>> + In case a sensor is registered with the thermal
>>> + framework, this option will also register it
>>> + as a hwmon. The sensor will then have the common
>>> + hwmon sysfs interface.
>>> +
>>> + Say 'Y' here if you want all thermal sensors to
>>> + have hwmon sysfs interface too.
>>>
>>> choice
>>> prompt "Default Thermal governor"
>>> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
>>> index 67184a2..24cb894 100644
>>> --- a/drivers/thermal/Makefile
>>> +++ b/drivers/thermal/Makefile
>>> @@ -5,6 +5,9 @@
>>> obj-$(CONFIG_THERMAL) += thermal_sys.o
>>> thermal_sys-y += thermal_core.o
>>>
>>> +# interface to/from other layers providing sensors
>>> +thermal_sys-$(CONFIG_THERMAL_HWMON) += thermal_hwmon.o
>>> +
>>> # governors
>>> thermal_sys-$(CONFIG_THERMAL_GOV_FAIR_SHARE) += fair_share.o
>>> thermal_sys-$(CONFIG_THERMAL_GOV_STEP_WISE) += step_wise.o
>>> diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
>>> index 1f02e8e..247528b 100644
>>> --- a/drivers/thermal/thermal_core.c
>>> +++ b/drivers/thermal/thermal_core.c
>>> @@ -38,6 +38,7 @@
>>> #include <net/genetlink.h>
>>>
>>> #include "thermal_core.h"
>>> +#include "thermal_hwmon.h"
>>>
>>> MODULE_AUTHOR("Zhang Rui");
>>> MODULE_DESCRIPTION("Generic thermal management sysfs support");
>>> @@ -859,260 +860,6 @@ thermal_cooling_device_trip_point_show(struct device
>>> *dev,
>>>
>>> /* Device management */
>>>
>>> -#if defined(CONFIG_THERMAL_HWMON)
>>> -
>>> -/* hwmon sys I/F */
>>> -#include <linux/hwmon.h>
>>> -
>>> -/* thermal zone devices with the same type share one hwmon device */
>>> -struct thermal_hwmon_device {
>>> - char type[THERMAL_NAME_LENGTH];
>>> - struct device *device;
>>> - int count;
>>> - struct list_head tz_list;
>>> - struct list_head node;
>>> -};
>>> -
>>> -struct thermal_hwmon_attr {
>>> - struct device_attribute attr;
>>> - char name[16];
>>> -};
>>> -
>>> -/* one temperature input for each thermal zone */
>>> -struct thermal_hwmon_temp {
>>> - struct list_head hwmon_node;
>>> - struct thermal_zone_device *tz;
>>> - struct thermal_hwmon_attr temp_input; /* hwmon sys attr */
>>> - struct thermal_hwmon_attr temp_crit; /* hwmon sys attr */
>>> -};
>>> -
>>> -static LIST_HEAD(thermal_hwmon_list);
>>> -
>>> -static ssize_t
>>> -name_show(struct device *dev, struct device_attribute *attr, char *buf)
>>> -{
>>> - struct thermal_hwmon_device *hwmon = dev_get_drvdata(dev);
>>> - return sprintf(buf, "%s\n", hwmon->type);
>>> -}
>>> -static DEVICE_ATTR(name, 0444, name_show, NULL);
>>> -
>>> -static ssize_t
>>> -temp_input_show(struct device *dev, struct device_attribute *attr, char *buf)
>>> -{
>>> - long temperature;
>>> - int ret;
>>> - struct thermal_hwmon_attr *hwmon_attr
>>> - = container_of(attr, struct thermal_hwmon_attr, attr);
>>> - struct thermal_hwmon_temp *temp
>>> - = container_of(hwmon_attr, struct
>>> thermal_hwmon_temp,
>>> - temp_input);
>>> - struct thermal_zone_device *tz = temp->tz;
>>> -
>>> - ret = thermal_zone_get_temp(tz, &temperature);
>>> -
>>> - if (ret)
>>> - return ret;
>>> -
>>> - return sprintf(buf, "%ld\n", temperature);
>>> -}
>>> -
>>> -static ssize_t
>>> -temp_crit_show(struct device *dev, struct device_attribute *attr,
>>> - char *buf)
>>> -{
>>> - struct thermal_hwmon_attr *hwmon_attr
>>> - = container_of(attr, struct thermal_hwmon_attr, attr);
>>> - struct thermal_hwmon_temp *temp
>>> - = container_of(hwmon_attr, struct
>>> thermal_hwmon_temp,
>>> - temp_crit);
>>> - struct thermal_zone_device *tz = temp->tz;
>>> - long temperature;
>>> - int ret;
>>> -
>>> - ret = tz->ops->get_trip_temp(tz, 0, &temperature);
>>> - if (ret)
>>> - return ret;
>>> -
>>> - return sprintf(buf, "%ld\n", temperature);
>>> -}
>>> -
>>> -
>>> -static struct thermal_hwmon_device *
>>> -thermal_hwmon_lookup_by_type(const struct thermal_zone_device *tz)
>>> -{
>>> - struct thermal_hwmon_device *hwmon;
>>> -
>>> - mutex_lock(&thermal_list_lock);
>>> - list_for_each_entry(hwmon, &thermal_hwmon_list, node)
>>> - if (!strcmp(hwmon->type, tz->type)) {
>>> - mutex_unlock(&thermal_list_lock);
>>> - return hwmon;
>>> - }
>>> - mutex_unlock(&thermal_list_lock);
>>> -
>>> - return NULL;
>>> -}
>>> -
>>> -/* Find the temperature input matching a given thermal zone */
>>> -static struct thermal_hwmon_temp *
>>> -thermal_hwmon_lookup_temp(const struct thermal_hwmon_device *hwmon,
>>> - const struct thermal_zone_device *tz)
>>> -{
>>> - struct thermal_hwmon_temp *temp;
>>> -
>>> - mutex_lock(&thermal_list_lock);
>>> - list_for_each_entry(temp, &hwmon->tz_list, hwmon_node)
>>> - if (temp->tz == tz) {
>>> - mutex_unlock(&thermal_list_lock);
>>> - return temp;
>>> - }
>>> - mutex_unlock(&thermal_list_lock);
>>> -
>>> - return NULL;
>>> -}
>>> -
>>> -static int
>>> -thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
>>> -{
>>> - struct thermal_hwmon_device *hwmon;
>>> - struct thermal_hwmon_temp *temp;
>>> - int new_hwmon_device = 1;
>>> - int result;
>>> -
>>> - hwmon = thermal_hwmon_lookup_by_type(tz);
>>> - if (hwmon) {
>>> - new_hwmon_device = 0;
>>> - goto register_sys_interface;
>>> - }
>>> -
>>> - hwmon = kzalloc(sizeof(struct thermal_hwmon_device), GFP_KERNEL);
>>> - if (!hwmon)
>>> - return -ENOMEM;
>>> -
>>> - INIT_LIST_HEAD(&hwmon->tz_list);
>>> - strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH);
>>> - hwmon->device = hwmon_device_register(NULL);
>>> - if (IS_ERR(hwmon->device)) {
>>> - result = PTR_ERR(hwmon->device);
>>> - goto free_mem;
>>> - }
>>> - dev_set_drvdata(hwmon->device, hwmon);
>>> - result = device_create_file(hwmon->device, &dev_attr_name);
>>> - if (result)
>>> - goto free_mem;
>>> -
>>> - register_sys_interface:
>>> - temp = kzalloc(sizeof(struct thermal_hwmon_temp), GFP_KERNEL);
>>> - if (!temp) {
>>> - result = -ENOMEM;
>>> - goto unregister_name;
>>> - }
>>> -
>>> - temp->tz = tz;
>>> - hwmon->count++;
>>> -
>>> - snprintf(temp->temp_input.name, sizeof(temp->temp_input.name),
>>> - "temp%d_input", hwmon->count);
>>> - temp->temp_input.attr.attr.name = temp->temp_input.name;
>>> - temp->temp_input.attr.attr.mode = 0444;
>>> - temp->temp_input.attr.show = temp_input_show;
>>> - sysfs_attr_init(&temp->temp_input.attr.attr);
>>> - result = device_create_file(hwmon->device, &temp->temp_input.attr);
>>> - if (result)
>>> - goto free_temp_mem;
>>> -
>>> - if (tz->ops->get_crit_temp) {
>>> - unsigned long temperature;
>>> - if (!tz->ops->get_crit_temp(tz, &temperature)) {
>>> - snprintf(temp->temp_crit.name,
>>> - sizeof(temp->temp_crit.name),
>>> - "temp%d_crit", hwmon->count);
>>> - temp->temp_crit.attr.attr.name = temp-
>>>> temp_crit.name;
>>> - temp->temp_crit.attr.attr.mode = 0444;
>>> - temp->temp_crit.attr.show = temp_crit_show;
>>> - sysfs_attr_init(&temp->temp_crit.attr.attr);
>>> - result = device_create_file(hwmon->device,
>>> - &temp->temp_crit.attr);
>>> - if (result)
>>> - goto unregister_input;
>>> - }
>>> - }
>>> -
>>> - mutex_lock(&thermal_list_lock);
>>> - if (new_hwmon_device)
>>> - list_add_tail(&hwmon->node, &thermal_hwmon_list);
>>> - list_add_tail(&temp->hwmon_node, &hwmon->tz_list);
>>> - mutex_unlock(&thermal_list_lock);
>>> -
>>> - return 0;
>>> -
>>> - unregister_input:
>>> - device_remove_file(hwmon->device, &temp->temp_input.attr);
>>> - free_temp_mem:
>>> - kfree(temp);
>>> - unregister_name:
>>> - if (new_hwmon_device) {
>>> - device_remove_file(hwmon->device, &dev_attr_name);
>>> - hwmon_device_unregister(hwmon->device);
>>> - }
>>> - free_mem:
>>> - if (new_hwmon_device)
>>> - kfree(hwmon);
>>> -
>>> - return result;
>>> -}
>>> -
>>> -static void
>>> -thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
>>> -{
>>> - struct thermal_hwmon_device *hwmon;
>>> - struct thermal_hwmon_temp *temp;
>>> -
>>> - hwmon = thermal_hwmon_lookup_by_type(tz);
>>> - if (unlikely(!hwmon)) {
>>> - /* Should never happen... */
>>> - dev_dbg(&tz->device, "hwmon device lookup failed!\n");
>>> - return;
>>> - }
>>> -
>>> - temp = thermal_hwmon_lookup_temp(hwmon, tz);
>>> - if (unlikely(!temp)) {
>>> - /* Should never happen... */
>>> - dev_dbg(&tz->device, "temperature input lookup failed!\n");
>>> - return;
>>> - }
>>> -
>>> - device_remove_file(hwmon->device, &temp->temp_input.attr);
>>> - if (tz->ops->get_crit_temp)
>>> - device_remove_file(hwmon->device, &temp->temp_crit.attr);
>>> -
>>> - mutex_lock(&thermal_list_lock);
>>> - list_del(&temp->hwmon_node);
>>> - kfree(temp);
>>> - if (!list_empty(&hwmon->tz_list)) {
>>> - mutex_unlock(&thermal_list_lock);
>>> - return;
>>> - }
>>> - list_del(&hwmon->node);
>>> - mutex_unlock(&thermal_list_lock);
>>> -
>>> - device_remove_file(hwmon->device, &dev_attr_name);
>>> - hwmon_device_unregister(hwmon->device);
>>> - kfree(hwmon);
>>> -}
>>> -#else
>>> -static int
>>> -thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
>>> -{
>>> - return 0;
>>> -}
>>> -
>>> -static void
>>> -thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
>>> -{
>>> -}
>>> -#endif
>>> -
>>> /**
>>> * thermal_zone_bind_cooling_device() - bind a cooling device to a thermal zone
>>> * @tz: pointer to struct thermal_zone_device
>>> diff --git a/drivers/thermal/thermal_hwmon.c
>>> b/drivers/thermal/thermal_hwmon.c
>>> new file mode 100644
>>> index 0000000..7c665c8
>>> --- /dev/null
>>> +++ b/drivers/thermal/thermal_hwmon.c
>>> @@ -0,0 +1,268 @@
>>> +/*
>>> + * thermal_hwmon.c - Generic Thermal Management hwmon support.
>>> + *
>>> + * Code based on Intel thermal_core.c. Copyrights of the original code:
>>> + * Copyright (C) 2008 Intel Corp
>>> + * Copyright (C) 2008 Zhang Rui <rui.zhang@intel.com>
>>> + * Copyright (C) 2008 Sujith Thomas <sujith.thomas@intel.com>
>>> + *
>>> + * Copyright (C) 2013 Texas Instruments
>>> + * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
>>> + *
>>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>> ~~~~~~~~~~~~
>>> + *
>>> + * This program is free software; you can redistribute it and/or modify
>>> + * it under the terms of the GNU General Public License as published by
>>> + * the Free Software Foundation; version 2 of the License.
>>> + *
>>> + * This program is distributed in the hope that it will be useful, but
>>> + * WITHOUT ANY WARRANTY; without even the implied warranty of
>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>>> + * General Public License for more details.
>>> + *
>>> + * You should have received a copy of the GNU General Public License along
>>> + * with this program; if not, write to the Free Software Foundation, Inc.,
>>> + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
>>> + *
>>> + *
>>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>> ~~~~~~~~~~~~
>>> + */
>>> +#include <linux/hwmon.h>
>>> +#include <linux/thermal.h>
>>> +#include <linux/slab.h>
>>> +#include <linux/err.h>
>>> +
>>> +/* hwmon sys I/F */
>>> +/* thermal zone devices with the same type share one hwmon device */
>>> +struct thermal_hwmon_device {
>>> + char type[THERMAL_NAME_LENGTH];
>>> + struct device *device;
>>> + int count;
>>> + struct list_head tz_list;
>>> + struct list_head node;
>>> +};
>>> +
>>> +struct thermal_hwmon_attr {
>>> + struct device_attribute attr;
>>> + char name[16];
>>> +};
>>> +
>>> +/* one temperature input for each thermal zone */
>>> +struct thermal_hwmon_temp {
>>> + struct list_head hwmon_node;
>>> + struct thermal_zone_device *tz;
>>> + struct thermal_hwmon_attr temp_input; /* hwmon sys attr */
>>> + struct thermal_hwmon_attr temp_crit; /* hwmon sys attr */
>>> +};
>>> +
>>> +static LIST_HEAD(thermal_hwmon_list);
>>> +
>>> +static DEFINE_MUTEX(thermal_hwmon_list_lock);
>>> +
>>> +static ssize_t
>>> +name_show(struct device *dev, struct device_attribute *attr, char *buf)
>>> +{
>>> + struct thermal_hwmon_device *hwmon = dev_get_drvdata(dev);
>>> + return sprintf(buf, "%s\n", hwmon->type);
>>> +}
>>> +static DEVICE_ATTR(name, 0444, name_show, NULL);
>>> +
>>> +static ssize_t
>>> +temp_input_show(struct device *dev, struct device_attribute *attr, char *buf)
>>> +{
>>> + long temperature;
>>> + int ret;
>>> + struct thermal_hwmon_attr *hwmon_attr
>>> + = container_of(attr, struct thermal_hwmon_attr, attr);
>>> + struct thermal_hwmon_temp *temp
>>> + = container_of(hwmon_attr, struct
>>> thermal_hwmon_temp,
>>> + temp_input);
>>> + struct thermal_zone_device *tz = temp->tz;
>>> +
>>> + ret = thermal_zone_get_temp(tz, &temperature);
>>> +
>>> + if (ret)
>>> + return ret;
>>> +
>>> + return sprintf(buf, "%ld\n", temperature);
>>> +}
>>> +
>>> +static ssize_t
>>> +temp_crit_show(struct device *dev, struct device_attribute *attr, char *buf)
>>> +{
>>> + struct thermal_hwmon_attr *hwmon_attr
>>> + = container_of(attr, struct thermal_hwmon_attr, attr);
>>> + struct thermal_hwmon_temp *temp
>>> + = container_of(hwmon_attr, struct
>>> thermal_hwmon_temp,
>>> + temp_crit);
>>> + struct thermal_zone_device *tz = temp->tz;
>>> + long temperature;
>>> + int ret;
>>> +
>>> + ret = tz->ops->get_trip_temp(tz, 0, &temperature);
>>> + if (ret)
>>> + return ret;
>>> +
>>> + return sprintf(buf, "%ld\n", temperature);
>>> +}
>>> +
>>> +
>>> +static struct thermal_hwmon_device *
>>> +thermal_hwmon_lookup_by_type(const struct thermal_zone_device *tz)
>>> +{
>>> + struct thermal_hwmon_device *hwmon;
>>> +
>>> + mutex_lock(&thermal_hwmon_list_lock);
>>> + list_for_each_entry(hwmon, &thermal_hwmon_list, node)
>>> + if (!strcmp(hwmon->type, tz->type)) {
>>> + mutex_unlock(&thermal_hwmon_list_lock);
>>> + return hwmon;
>>> + }
>>> + mutex_unlock(&thermal_hwmon_list_lock);
>>> +
>>> + return NULL;
>>> +}
>>> +
>>> +/* Find the temperature input matching a given thermal zone */
>>> +static struct thermal_hwmon_temp *
>>> +thermal_hwmon_lookup_temp(const struct thermal_hwmon_device *hwmon,
>>> + const struct thermal_zone_device *tz)
>>> +{
>>> + struct thermal_hwmon_temp *temp;
>>> +
>>> + mutex_lock(&thermal_hwmon_list_lock);
>>> + list_for_each_entry(temp, &hwmon->tz_list, hwmon_node)
>>> + if (temp->tz == tz) {
>>> + mutex_unlock(&thermal_hwmon_list_lock);
>>> + return temp;
>>> + }
>>> + mutex_unlock(&thermal_hwmon_list_lock);
>>> +
>>> + return NULL;
>>> +}
>>> +
>>> +int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
>>> +{
>>> + struct thermal_hwmon_device *hwmon;
>>> + struct thermal_hwmon_temp *temp;
>>> + int new_hwmon_device = 1;
>>> + int result;
>>> +
>>> + hwmon = thermal_hwmon_lookup_by_type(tz);
>>> + if (hwmon) {
>>> + new_hwmon_device = 0;
>>> + goto register_sys_interface;
>>> + }
>>> +
>>> + hwmon = kzalloc(sizeof(struct thermal_hwmon_device), GFP_KERNEL);
>>> + if (!hwmon)
>>> + return -ENOMEM;
>>> +
>>> + INIT_LIST_HEAD(&hwmon->tz_list);
>>> + strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH);
>>> + hwmon->device = hwmon_device_register(NULL);
>>> + if (IS_ERR(hwmon->device)) {
>>> + result = PTR_ERR(hwmon->device);
>>> + goto free_mem;
>>> + }
>>> + dev_set_drvdata(hwmon->device, hwmon);
>>> + result = device_create_file(hwmon->device, &dev_attr_name);
>>> + if (result)
>>> + goto free_mem;
>>> +
>>> + register_sys_interface:
>>> + temp = kzalloc(sizeof(struct thermal_hwmon_temp), GFP_KERNEL);
>>> + if (!temp) {
>>> + result = -ENOMEM;
>>> + goto unregister_name;
>>> + }
>>> +
>>> + temp->tz = tz;
>>> + hwmon->count++;
>>> +
>>> + snprintf(temp->temp_input.name, sizeof(temp->temp_input.name),
>>> + "temp%d_input", hwmon->count);
>>> + temp->temp_input.attr.attr.name = temp->temp_input.name;
>>> + temp->temp_input.attr.attr.mode = 0444;
>>> + temp->temp_input.attr.show = temp_input_show;
>>> + sysfs_attr_init(&temp->temp_input.attr.attr);
>>> + result = device_create_file(hwmon->device, &temp->temp_input.attr);
>>> + if (result)
>>> + goto free_temp_mem;
>>> +
>>> + if (tz->ops->get_crit_temp) {
>>> + unsigned long temperature;
>>> + if (!tz->ops->get_crit_temp(tz, &temperature)) {
>>> + snprintf(temp->temp_crit.name,
>>> + sizeof(temp->temp_crit.name),
>>> + "temp%d_crit", hwmon->count);
>>> + temp->temp_crit.attr.attr.name = temp-
>>>> temp_crit.name;
>>> + temp->temp_crit.attr.attr.mode = 0444;
>>> + temp->temp_crit.attr.show = temp_crit_show;
>>> + sysfs_attr_init(&temp->temp_crit.attr.attr);
>>> + result = device_create_file(hwmon->device,
>>> + &temp->temp_crit.attr);
>>> + if (result)
>>> + goto unregister_input;
>>> + }
>>> + }
>>> +
>>> + mutex_lock(&thermal_hwmon_list_lock);
>>> + if (new_hwmon_device)
>>> + list_add_tail(&hwmon->node, &thermal_hwmon_list);
>>> + list_add_tail(&temp->hwmon_node, &hwmon->tz_list);
>>> + mutex_unlock(&thermal_hwmon_list_lock);
>>> +
>>> + return 0;
>>> +
>>> + unregister_input:
>>> + device_remove_file(hwmon->device, &temp->temp_input.attr);
>>> + free_temp_mem:
>>> + kfree(temp);
>>> + unregister_name:
>>> + if (new_hwmon_device) {
>>> + device_remove_file(hwmon->device, &dev_attr_name);
>>> + hwmon_device_unregister(hwmon->device);
>>> + }
>>> + free_mem:
>>> + if (new_hwmon_device)
>>> + kfree(hwmon);
>>> +
>>> + return result;
>>> +}
>>> +
>>> +void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
>>> +{
>>> + struct thermal_hwmon_device *hwmon;
>>> + struct thermal_hwmon_temp *temp;
>>> +
>>> + hwmon = thermal_hwmon_lookup_by_type(tz);
>>> + if (unlikely(!hwmon)) {
>>> + /* Should never happen... */
>>> + dev_dbg(&tz->device, "hwmon device lookup failed!\n");
>>> + return;
>>> + }
>>> +
>>> + temp = thermal_hwmon_lookup_temp(hwmon, tz);
>>> + if (unlikely(!temp)) {
>>> + /* Should never happen... */
>>> + dev_dbg(&tz->device, "temperature input lookup failed!\n");
>>> + return;
>>> + }
>>> +
>>> + device_remove_file(hwmon->device, &temp->temp_input.attr);
>>> + if (tz->ops->get_crit_temp)
>>> + device_remove_file(hwmon->device, &temp->temp_crit.attr);
>>> +
>>> + mutex_lock(&thermal_hwmon_list_lock);
>>> + list_del(&temp->hwmon_node);
>>> + kfree(temp);
>>> + if (!list_empty(&hwmon->tz_list)) {
>>> + mutex_unlock(&thermal_hwmon_list_lock);
>>> + return;
>>> + }
>>> + list_del(&hwmon->node);
>>> + mutex_unlock(&thermal_hwmon_list_lock);
>>> +
>>> + device_remove_file(hwmon->device, &dev_attr_name);
>>> + hwmon_device_unregister(hwmon->device);
>>> + kfree(hwmon);
>>> +}
>>> diff --git a/drivers/thermal/thermal_hwmon.h
>>> b/drivers/thermal/thermal_hwmon.h
>>> new file mode 100644
>>> index 0000000..c798fdb
>>> --- /dev/null
>>> +++ b/drivers/thermal/thermal_hwmon.h
>>> @@ -0,0 +1,49 @@
>>> +/*
>>> + * thermal_hwmon.h - Generic Thermal Management hwmon support.
>>> + *
>>> + * Code based on Intel thermal_core.c. Copyrights of the original code:
>>> + * Copyright (C) 2008 Intel Corp
>>> + * Copyright (C) 2008 Zhang Rui <rui.zhang@intel.com>
>>> + * Copyright (C) 2008 Sujith Thomas <sujith.thomas@intel.com>
>>> + *
>>> + * Copyright (C) 2013 Texas Instruments
>>> + * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
>>> + *
>>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>> ~~~~~~~~~~~~
>>> + *
>>> + * This program is free software; you can redistribute it and/or modify
>>> + * it under the terms of the GNU General Public License as published by
>>> + * the Free Software Foundation; version 2 of the License.
>>> + *
>>> + * This program is distributed in the hope that it will be useful, but
>>> + * WITHOUT ANY WARRANTY; without even the implied warranty of
>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>>> + * General Public License for more details.
>>> + *
>>> + * You should have received a copy of the GNU General Public License along
>>> + * with this program; if not, write to the Free Software Foundation, Inc.,
>>> + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
>>> + *
>>> + *
>>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>> ~~~~~~~~~~~~
>>> + */
>>> +#ifndef __THERMAL_HWMON_H__
>>> +#define __THERMAL_HWMON_H__
>>> +
>>> +#include <linux/thermal.h>
>>> +
>>> +#ifdef CONFIG_THERMAL_HWMON
>>> +int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz);
>>> +void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz);
>>> +#else
>>> +static int
>>> +thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
>>> +{
>>> + return 0;
>>> +}
>>> +
>>> +static void
>>> +thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
>>> +{
>>> +}
>>> +#endif
>>> +
>>> +#endif /* __THERMAL_HWMON_H__ */
>>> --
>>> 1.8.2.1.342.gfa7285d
>>>
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe linux-pm" in
>>> the body of a message to majordomo@vger.kernel.org
>>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
>>
>
>
> --
> You have got to be excited about what you are doing. (L. Lamport)
>
> Eduardo Valentin
>
>
> * Eduardo Valentin <eduardo.valentin@ti.com>
> * 0x75D0BCFD
>
^ permalink raw reply [flat|nested] 33+ messages in thread* RE: [RFC PATCH 1/4] thermal: hwmon: move hwmon support to single file
2013-07-17 9:49 ` Wei Ni
@ 2013-07-17 10:07 ` R, Durgadoss
0 siblings, 0 replies; 33+ messages in thread
From: R, Durgadoss @ 2013-07-17 10:07 UTC (permalink / raw)
To: Wei Ni, Eduardo Valentin; +Cc: linux-pm, amit.daniel, Zhang, Rui, linux-kernel
Hi Wei,
> -----Original Message-----
> From: linux-pm-owner@vger.kernel.org [mailto:linux-pm-
> owner@vger.kernel.org] On Behalf Of Wei Ni
> Sent: Wednesday, July 17, 2013 3:19 PM
> To: Eduardo Valentin
> Cc: R, Durgadoss; linux-pm@vger.kernel.org; amit.daniel@samsung.com; Zhang,
> Rui; linux-kernel@vger.kernel.org
> Subject: Re: [RFC PATCH 1/4] thermal: hwmon: move hwmon support to single
> file
>
> On 07/10/2013 12:54 AM, Eduardo Valentin wrote:
> > * PGP Signed: 07/09/2013 at 09:54:04 AM
> >
> > On 09-07-2013 12:04, R, Durgadoss wrote:
> >> Hi Eduardo,
> >>
> >>> -----Original Message-----
> >>> From: linux-pm-owner@vger.kernel.org [mailto:linux-pm-
> >>> owner@vger.kernel.org] On Behalf Of Eduardo Valentin
> >>> Sent: Tuesday, July 09, 2013 7:30 PM
> >>> To: linux-pm@vger.kernel.org; R, Durgadoss; amit.daniel@samsung.com
> >>> Cc: Zhang, Rui; Eduardo Valentin; linux-kernel@vger.kernel.org
> >>> Subject: [RFC PATCH 1/4] thermal: hwmon: move hwmon support to single
> file
> >>>
> >>> In order to improve code organization, this patch
> >>> moves the hwmon sysfs support to a file named
> >>> thermal_hwmon. This helps to add extra support
> >>> for hwmon without scrambling the code.
> >>
> >> Nice clean up for thermal_core.c. +1 from me.
> >>
> >> I am inclined to even remove the hwmon related code completely.
> >> AFAIK, there are not many users of this config option.
> >>
> >
> > Hmm. OK. I thought of keeping it as I dont know if there are users.
> > Besides, if new code comes out of the hwmon2thermalfw exercise, then it
> > would be a good place to keep all the hwmon code.
> >
> >> However people are looking for the other option. If they have a
> >> hwmon driver, how can it use the thermal framework with ease.
> >> [like what you mentioned about this in 0/5]
>
> Yes, I'm trying to add lm90 driver to the thermal framework, but this
> driver already register as a hwmon device, so when register as thermal
> zone device, the thermal framework will register another virtual hwmon
> device, it mean we have duplicate hwmon devices, it will make confusion.
> How about to add a flag in the thermal_zone_params, so when call
> thermal_zone_device_register() to register, this flag can indicate if we
> want to register the virtual hwmon device or not.
I was following your threads in both lm-sensors and here.
I tend to agree with adding this flag in tzp structure.
But, we don't have tzp defined for all thermal zones
that are registering today. So, we need to define the default behavior.
I suggest we set the default to 'No', meaning 'do not create hwmon
devices when this zone is registered'.
Thanks,
Durga
>
> Thanks.
> Wei.
>
> >
> > yes, problem is that hwmon does not have a standard way of representing
> > the drivers. So, one cannot simply write a simple wrapper because hwmon
> > drivers does not have a standard get_temperature operation, for instance.
> >
> > We could either propose a way to standardize then or implement the call
> > to thermal fw driver by driver. Probably the later is desirable, if we
> > implement it in a need basis.
> >
> >>
> >> Thanks,
> >> Durga
> >>
> >>>
> >>> In order to do this move, the hwmon list head is now
> >>> using its own locking. Before, the list used
> >>> the global thermal locking.
> >>>
> >>> Cc: Zhang Rui <rui.zhang@intel.com>
> >>> Cc: linux-pm@vger.kernel.org
> >>> Cc: linux-kernel@vger.kernel.org
> >>> Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
> >>> ---
> >>> drivers/thermal/Kconfig | 9 ++
> >>> drivers/thermal/Makefile | 3 +
> >>> drivers/thermal/thermal_core.c | 255 +-------------------------------------
> >>> drivers/thermal/thermal_hwmon.c | 268
> >>> ++++++++++++++++++++++++++++++++++++++++
> >>> drivers/thermal/thermal_hwmon.h | 49 ++++++++
> >>> 5 files changed, 330 insertions(+), 254 deletions(-)
> >>> create mode 100644 drivers/thermal/thermal_hwmon.c
> >>> create mode 100644 drivers/thermal/thermal_hwmon.h
> >>>
> >>> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> >>> index e988c81..7fb16bc 100644
> >>> --- a/drivers/thermal/Kconfig
> >>> +++ b/drivers/thermal/Kconfig
> >>> @@ -17,8 +17,17 @@ if THERMAL
> >>>
> >>> config THERMAL_HWMON
> >>> bool
> >>> + prompt "Expose thermal sensors as hwmon device"
> >>> depends on HWMON=y || HWMON=THERMAL
> >>> default y
> >>> + help
> >>> + In case a sensor is registered with the thermal
> >>> + framework, this option will also register it
> >>> + as a hwmon. The sensor will then have the common
> >>> + hwmon sysfs interface.
> >>> +
> >>> + Say 'Y' here if you want all thermal sensors to
> >>> + have hwmon sysfs interface too.
> >>>
> >>> choice
> >>> prompt "Default Thermal governor"
> >>> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> >>> index 67184a2..24cb894 100644
> >>> --- a/drivers/thermal/Makefile
> >>> +++ b/drivers/thermal/Makefile
> >>> @@ -5,6 +5,9 @@
> >>> obj-$(CONFIG_THERMAL) += thermal_sys.o
> >>> thermal_sys-y += thermal_core.o
> >>>
> >>> +# interface to/from other layers providing sensors
> >>> +thermal_sys-$(CONFIG_THERMAL_HWMON) += thermal_hwmon.o
> >>> +
> >>> # governors
> >>> thermal_sys-$(CONFIG_THERMAL_GOV_FAIR_SHARE) += fair_share.o
> >>> thermal_sys-$(CONFIG_THERMAL_GOV_STEP_WISE) += step_wise.o
> >>> diff --git a/drivers/thermal/thermal_core.c
> b/drivers/thermal/thermal_core.c
> >>> index 1f02e8e..247528b 100644
> >>> --- a/drivers/thermal/thermal_core.c
> >>> +++ b/drivers/thermal/thermal_core.c
> >>> @@ -38,6 +38,7 @@
> >>> #include <net/genetlink.h>
> >>>
> >>> #include "thermal_core.h"
> >>> +#include "thermal_hwmon.h"
> >>>
> >>> MODULE_AUTHOR("Zhang Rui");
> >>> MODULE_DESCRIPTION("Generic thermal management sysfs support");
> >>> @@ -859,260 +860,6 @@ thermal_cooling_device_trip_point_show(struct
> device
> >>> *dev,
> >>>
> >>> /* Device management */
> >>>
> >>> -#if defined(CONFIG_THERMAL_HWMON)
> >>> -
> >>> -/* hwmon sys I/F */
> >>> -#include <linux/hwmon.h>
> >>> -
> >>> -/* thermal zone devices with the same type share one hwmon device */
> >>> -struct thermal_hwmon_device {
> >>> - char type[THERMAL_NAME_LENGTH];
> >>> - struct device *device;
> >>> - int count;
> >>> - struct list_head tz_list;
> >>> - struct list_head node;
> >>> -};
> >>> -
> >>> -struct thermal_hwmon_attr {
> >>> - struct device_attribute attr;
> >>> - char name[16];
> >>> -};
> >>> -
> >>> -/* one temperature input for each thermal zone */
> >>> -struct thermal_hwmon_temp {
> >>> - struct list_head hwmon_node;
> >>> - struct thermal_zone_device *tz;
> >>> - struct thermal_hwmon_attr temp_input; /* hwmon sys attr */
> >>> - struct thermal_hwmon_attr temp_crit; /* hwmon sys attr */
> >>> -};
> >>> -
> >>> -static LIST_HEAD(thermal_hwmon_list);
> >>> -
> >>> -static ssize_t
> >>> -name_show(struct device *dev, struct device_attribute *attr, char *buf)
> >>> -{
> >>> - struct thermal_hwmon_device *hwmon = dev_get_drvdata(dev);
> >>> - return sprintf(buf, "%s\n", hwmon->type);
> >>> -}
> >>> -static DEVICE_ATTR(name, 0444, name_show, NULL);
> >>> -
> >>> -static ssize_t
> >>> -temp_input_show(struct device *dev, struct device_attribute *attr, char
> *buf)
> >>> -{
> >>> - long temperature;
> >>> - int ret;
> >>> - struct thermal_hwmon_attr *hwmon_attr
> >>> - = container_of(attr, struct thermal_hwmon_attr, attr);
> >>> - struct thermal_hwmon_temp *temp
> >>> - = container_of(hwmon_attr, struct
> >>> thermal_hwmon_temp,
> >>> - temp_input);
> >>> - struct thermal_zone_device *tz = temp->tz;
> >>> -
> >>> - ret = thermal_zone_get_temp(tz, &temperature);
> >>> -
> >>> - if (ret)
> >>> - return ret;
> >>> -
> >>> - return sprintf(buf, "%ld\n", temperature);
> >>> -}
> >>> -
> >>> -static ssize_t
> >>> -temp_crit_show(struct device *dev, struct device_attribute *attr,
> >>> - char *buf)
> >>> -{
> >>> - struct thermal_hwmon_attr *hwmon_attr
> >>> - = container_of(attr, struct thermal_hwmon_attr, attr);
> >>> - struct thermal_hwmon_temp *temp
> >>> - = container_of(hwmon_attr, struct
> >>> thermal_hwmon_temp,
> >>> - temp_crit);
> >>> - struct thermal_zone_device *tz = temp->tz;
> >>> - long temperature;
> >>> - int ret;
> >>> -
> >>> - ret = tz->ops->get_trip_temp(tz, 0, &temperature);
> >>> - if (ret)
> >>> - return ret;
> >>> -
> >>> - return sprintf(buf, "%ld\n", temperature);
> >>> -}
> >>> -
> >>> -
> >>> -static struct thermal_hwmon_device *
> >>> -thermal_hwmon_lookup_by_type(const struct thermal_zone_device *tz)
> >>> -{
> >>> - struct thermal_hwmon_device *hwmon;
> >>> -
> >>> - mutex_lock(&thermal_list_lock);
> >>> - list_for_each_entry(hwmon, &thermal_hwmon_list, node)
> >>> - if (!strcmp(hwmon->type, tz->type)) {
> >>> - mutex_unlock(&thermal_list_lock);
> >>> - return hwmon;
> >>> - }
> >>> - mutex_unlock(&thermal_list_lock);
> >>> -
> >>> - return NULL;
> >>> -}
> >>> -
> >>> -/* Find the temperature input matching a given thermal zone */
> >>> -static struct thermal_hwmon_temp *
> >>> -thermal_hwmon_lookup_temp(const struct thermal_hwmon_device
> *hwmon,
> >>> - const struct thermal_zone_device *tz)
> >>> -{
> >>> - struct thermal_hwmon_temp *temp;
> >>> -
> >>> - mutex_lock(&thermal_list_lock);
> >>> - list_for_each_entry(temp, &hwmon->tz_list, hwmon_node)
> >>> - if (temp->tz == tz) {
> >>> - mutex_unlock(&thermal_list_lock);
> >>> - return temp;
> >>> - }
> >>> - mutex_unlock(&thermal_list_lock);
> >>> -
> >>> - return NULL;
> >>> -}
> >>> -
> >>> -static int
> >>> -thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
> >>> -{
> >>> - struct thermal_hwmon_device *hwmon;
> >>> - struct thermal_hwmon_temp *temp;
> >>> - int new_hwmon_device = 1;
> >>> - int result;
> >>> -
> >>> - hwmon = thermal_hwmon_lookup_by_type(tz);
> >>> - if (hwmon) {
> >>> - new_hwmon_device = 0;
> >>> - goto register_sys_interface;
> >>> - }
> >>> -
> >>> - hwmon = kzalloc(sizeof(struct thermal_hwmon_device), GFP_KERNEL);
> >>> - if (!hwmon)
> >>> - return -ENOMEM;
> >>> -
> >>> - INIT_LIST_HEAD(&hwmon->tz_list);
> >>> - strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH);
> >>> - hwmon->device = hwmon_device_register(NULL);
> >>> - if (IS_ERR(hwmon->device)) {
> >>> - result = PTR_ERR(hwmon->device);
> >>> - goto free_mem;
> >>> - }
> >>> - dev_set_drvdata(hwmon->device, hwmon);
> >>> - result = device_create_file(hwmon->device, &dev_attr_name);
> >>> - if (result)
> >>> - goto free_mem;
> >>> -
> >>> - register_sys_interface:
> >>> - temp = kzalloc(sizeof(struct thermal_hwmon_temp), GFP_KERNEL);
> >>> - if (!temp) {
> >>> - result = -ENOMEM;
> >>> - goto unregister_name;
> >>> - }
> >>> -
> >>> - temp->tz = tz;
> >>> - hwmon->count++;
> >>> -
> >>> - snprintf(temp->temp_input.name, sizeof(temp->temp_input.name),
> >>> - "temp%d_input", hwmon->count);
> >>> - temp->temp_input.attr.attr.name = temp->temp_input.name;
> >>> - temp->temp_input.attr.attr.mode = 0444;
> >>> - temp->temp_input.attr.show = temp_input_show;
> >>> - sysfs_attr_init(&temp->temp_input.attr.attr);
> >>> - result = device_create_file(hwmon->device, &temp->temp_input.attr);
> >>> - if (result)
> >>> - goto free_temp_mem;
> >>> -
> >>> - if (tz->ops->get_crit_temp) {
> >>> - unsigned long temperature;
> >>> - if (!tz->ops->get_crit_temp(tz, &temperature)) {
> >>> - snprintf(temp->temp_crit.name,
> >>> - sizeof(temp->temp_crit.name),
> >>> - "temp%d_crit", hwmon->count);
> >>> - temp->temp_crit.attr.attr.name = temp-
> >>>> temp_crit.name;
> >>> - temp->temp_crit.attr.attr.mode = 0444;
> >>> - temp->temp_crit.attr.show = temp_crit_show;
> >>> - sysfs_attr_init(&temp->temp_crit.attr.attr);
> >>> - result = device_create_file(hwmon->device,
> >>> - &temp->temp_crit.attr);
> >>> - if (result)
> >>> - goto unregister_input;
> >>> - }
> >>> - }
> >>> -
> >>> - mutex_lock(&thermal_list_lock);
> >>> - if (new_hwmon_device)
> >>> - list_add_tail(&hwmon->node, &thermal_hwmon_list);
> >>> - list_add_tail(&temp->hwmon_node, &hwmon->tz_list);
> >>> - mutex_unlock(&thermal_list_lock);
> >>> -
> >>> - return 0;
> >>> -
> >>> - unregister_input:
> >>> - device_remove_file(hwmon->device, &temp->temp_input.attr);
> >>> - free_temp_mem:
> >>> - kfree(temp);
> >>> - unregister_name:
> >>> - if (new_hwmon_device) {
> >>> - device_remove_file(hwmon->device, &dev_attr_name);
> >>> - hwmon_device_unregister(hwmon->device);
> >>> - }
> >>> - free_mem:
> >>> - if (new_hwmon_device)
> >>> - kfree(hwmon);
> >>> -
> >>> - return result;
> >>> -}
> >>> -
> >>> -static void
> >>> -thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
> >>> -{
> >>> - struct thermal_hwmon_device *hwmon;
> >>> - struct thermal_hwmon_temp *temp;
> >>> -
> >>> - hwmon = thermal_hwmon_lookup_by_type(tz);
> >>> - if (unlikely(!hwmon)) {
> >>> - /* Should never happen... */
> >>> - dev_dbg(&tz->device, "hwmon device lookup failed!\n");
> >>> - return;
> >>> - }
> >>> -
> >>> - temp = thermal_hwmon_lookup_temp(hwmon, tz);
> >>> - if (unlikely(!temp)) {
> >>> - /* Should never happen... */
> >>> - dev_dbg(&tz->device, "temperature input lookup failed!\n");
> >>> - return;
> >>> - }
> >>> -
> >>> - device_remove_file(hwmon->device, &temp->temp_input.attr);
> >>> - if (tz->ops->get_crit_temp)
> >>> - device_remove_file(hwmon->device, &temp->temp_crit.attr);
> >>> -
> >>> - mutex_lock(&thermal_list_lock);
> >>> - list_del(&temp->hwmon_node);
> >>> - kfree(temp);
> >>> - if (!list_empty(&hwmon->tz_list)) {
> >>> - mutex_unlock(&thermal_list_lock);
> >>> - return;
> >>> - }
> >>> - list_del(&hwmon->node);
> >>> - mutex_unlock(&thermal_list_lock);
> >>> -
> >>> - device_remove_file(hwmon->device, &dev_attr_name);
> >>> - hwmon_device_unregister(hwmon->device);
> >>> - kfree(hwmon);
> >>> -}
> >>> -#else
> >>> -static int
> >>> -thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
> >>> -{
> >>> - return 0;
> >>> -}
> >>> -
> >>> -static void
> >>> -thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
> >>> -{
> >>> -}
> >>> -#endif
> >>> -
> >>> /**
> >>> * thermal_zone_bind_cooling_device() - bind a cooling device to a thermal
> zone
> >>> * @tz: pointer to struct thermal_zone_device
> >>> diff --git a/drivers/thermal/thermal_hwmon.c
> >>> b/drivers/thermal/thermal_hwmon.c
> >>> new file mode 100644
> >>> index 0000000..7c665c8
> >>> --- /dev/null
> >>> +++ b/drivers/thermal/thermal_hwmon.c
> >>> @@ -0,0 +1,268 @@
> >>> +/*
> >>> + * thermal_hwmon.c - Generic Thermal Management hwmon support.
> >>> + *
> >>> + * Code based on Intel thermal_core.c. Copyrights of the original code:
> >>> + * Copyright (C) 2008 Intel Corp
> >>> + * Copyright (C) 2008 Zhang Rui <rui.zhang@intel.com>
> >>> + * Copyright (C) 2008 Sujith Thomas <sujith.thomas@intel.com>
> >>> + *
> >>> + * Copyright (C) 2013 Texas Instruments
> >>> + * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
> >>> + *
> >>>
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >>> ~~~~~~~~~~~~
> >>> + *
> >>> + * This program is free software; you can redistribute it and/or modify
> >>> + * it under the terms of the GNU General Public License as published by
> >>> + * the Free Software Foundation; version 2 of the License.
> >>> + *
> >>> + * This program is distributed in the hope that it will be useful, but
> >>> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> >>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> GNU
> >>> + * General Public License for more details.
> >>> + *
> >>> + * You should have received a copy of the GNU General Public License
> along
> >>> + * with this program; if not, write to the Free Software Foundation, Inc.,
> >>> + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
> >>> + *
> >>> + *
> >>>
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >>> ~~~~~~~~~~~~
> >>> + */
> >>> +#include <linux/hwmon.h>
> >>> +#include <linux/thermal.h>
> >>> +#include <linux/slab.h>
> >>> +#include <linux/err.h>
> >>> +
> >>> +/* hwmon sys I/F */
> >>> +/* thermal zone devices with the same type share one hwmon device */
> >>> +struct thermal_hwmon_device {
> >>> + char type[THERMAL_NAME_LENGTH];
> >>> + struct device *device;
> >>> + int count;
> >>> + struct list_head tz_list;
> >>> + struct list_head node;
> >>> +};
> >>> +
> >>> +struct thermal_hwmon_attr {
> >>> + struct device_attribute attr;
> >>> + char name[16];
> >>> +};
> >>> +
> >>> +/* one temperature input for each thermal zone */
> >>> +struct thermal_hwmon_temp {
> >>> + struct list_head hwmon_node;
> >>> + struct thermal_zone_device *tz;
> >>> + struct thermal_hwmon_attr temp_input; /* hwmon sys attr */
> >>> + struct thermal_hwmon_attr temp_crit; /* hwmon sys attr */
> >>> +};
> >>> +
> >>> +static LIST_HEAD(thermal_hwmon_list);
> >>> +
> >>> +static DEFINE_MUTEX(thermal_hwmon_list_lock);
> >>> +
> >>> +static ssize_t
> >>> +name_show(struct device *dev, struct device_attribute *attr, char *buf)
> >>> +{
> >>> + struct thermal_hwmon_device *hwmon = dev_get_drvdata(dev);
> >>> + return sprintf(buf, "%s\n", hwmon->type);
> >>> +}
> >>> +static DEVICE_ATTR(name, 0444, name_show, NULL);
> >>> +
> >>> +static ssize_t
> >>> +temp_input_show(struct device *dev, struct device_attribute *attr, char
> *buf)
> >>> +{
> >>> + long temperature;
> >>> + int ret;
> >>> + struct thermal_hwmon_attr *hwmon_attr
> >>> + = container_of(attr, struct thermal_hwmon_attr, attr);
> >>> + struct thermal_hwmon_temp *temp
> >>> + = container_of(hwmon_attr, struct
> >>> thermal_hwmon_temp,
> >>> + temp_input);
> >>> + struct thermal_zone_device *tz = temp->tz;
> >>> +
> >>> + ret = thermal_zone_get_temp(tz, &temperature);
> >>> +
> >>> + if (ret)
> >>> + return ret;
> >>> +
> >>> + return sprintf(buf, "%ld\n", temperature);
> >>> +}
> >>> +
> >>> +static ssize_t
> >>> +temp_crit_show(struct device *dev, struct device_attribute *attr, char
> *buf)
> >>> +{
> >>> + struct thermal_hwmon_attr *hwmon_attr
> >>> + = container_of(attr, struct thermal_hwmon_attr, attr);
> >>> + struct thermal_hwmon_temp *temp
> >>> + = container_of(hwmon_attr, struct
> >>> thermal_hwmon_temp,
> >>> + temp_crit);
> >>> + struct thermal_zone_device *tz = temp->tz;
> >>> + long temperature;
> >>> + int ret;
> >>> +
> >>> + ret = tz->ops->get_trip_temp(tz, 0, &temperature);
> >>> + if (ret)
> >>> + return ret;
> >>> +
> >>> + return sprintf(buf, "%ld\n", temperature);
> >>> +}
> >>> +
> >>> +
> >>> +static struct thermal_hwmon_device *
> >>> +thermal_hwmon_lookup_by_type(const struct thermal_zone_device *tz)
> >>> +{
> >>> + struct thermal_hwmon_device *hwmon;
> >>> +
> >>> + mutex_lock(&thermal_hwmon_list_lock);
> >>> + list_for_each_entry(hwmon, &thermal_hwmon_list, node)
> >>> + if (!strcmp(hwmon->type, tz->type)) {
> >>> + mutex_unlock(&thermal_hwmon_list_lock);
> >>> + return hwmon;
> >>> + }
> >>> + mutex_unlock(&thermal_hwmon_list_lock);
> >>> +
> >>> + return NULL;
> >>> +}
> >>> +
> >>> +/* Find the temperature input matching a given thermal zone */
> >>> +static struct thermal_hwmon_temp *
> >>> +thermal_hwmon_lookup_temp(const struct thermal_hwmon_device
> *hwmon,
> >>> + const struct thermal_zone_device *tz)
> >>> +{
> >>> + struct thermal_hwmon_temp *temp;
> >>> +
> >>> + mutex_lock(&thermal_hwmon_list_lock);
> >>> + list_for_each_entry(temp, &hwmon->tz_list, hwmon_node)
> >>> + if (temp->tz == tz) {
> >>> + mutex_unlock(&thermal_hwmon_list_lock);
> >>> + return temp;
> >>> + }
> >>> + mutex_unlock(&thermal_hwmon_list_lock);
> >>> +
> >>> + return NULL;
> >>> +}
> >>> +
> >>> +int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
> >>> +{
> >>> + struct thermal_hwmon_device *hwmon;
> >>> + struct thermal_hwmon_temp *temp;
> >>> + int new_hwmon_device = 1;
> >>> + int result;
> >>> +
> >>> + hwmon = thermal_hwmon_lookup_by_type(tz);
> >>> + if (hwmon) {
> >>> + new_hwmon_device = 0;
> >>> + goto register_sys_interface;
> >>> + }
> >>> +
> >>> + hwmon = kzalloc(sizeof(struct thermal_hwmon_device), GFP_KERNEL);
> >>> + if (!hwmon)
> >>> + return -ENOMEM;
> >>> +
> >>> + INIT_LIST_HEAD(&hwmon->tz_list);
> >>> + strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH);
> >>> + hwmon->device = hwmon_device_register(NULL);
> >>> + if (IS_ERR(hwmon->device)) {
> >>> + result = PTR_ERR(hwmon->device);
> >>> + goto free_mem;
> >>> + }
> >>> + dev_set_drvdata(hwmon->device, hwmon);
> >>> + result = device_create_file(hwmon->device, &dev_attr_name);
> >>> + if (result)
> >>> + goto free_mem;
> >>> +
> >>> + register_sys_interface:
> >>> + temp = kzalloc(sizeof(struct thermal_hwmon_temp), GFP_KERNEL);
> >>> + if (!temp) {
> >>> + result = -ENOMEM;
> >>> + goto unregister_name;
> >>> + }
> >>> +
> >>> + temp->tz = tz;
> >>> + hwmon->count++;
> >>> +
> >>> + snprintf(temp->temp_input.name, sizeof(temp->temp_input.name),
> >>> + "temp%d_input", hwmon->count);
> >>> + temp->temp_input.attr.attr.name = temp->temp_input.name;
> >>> + temp->temp_input.attr.attr.mode = 0444;
> >>> + temp->temp_input.attr.show = temp_input_show;
> >>> + sysfs_attr_init(&temp->temp_input.attr.attr);
> >>> + result = device_create_file(hwmon->device, &temp->temp_input.attr);
> >>> + if (result)
> >>> + goto free_temp_mem;
> >>> +
> >>> + if (tz->ops->get_crit_temp) {
> >>> + unsigned long temperature;
> >>> + if (!tz->ops->get_crit_temp(tz, &temperature)) {
> >>> + snprintf(temp->temp_crit.name,
> >>> + sizeof(temp->temp_crit.name),
> >>> + "temp%d_crit", hwmon->count);
> >>> + temp->temp_crit.attr.attr.name = temp-
> >>>> temp_crit.name;
> >>> + temp->temp_crit.attr.attr.mode = 0444;
> >>> + temp->temp_crit.attr.show = temp_crit_show;
> >>> + sysfs_attr_init(&temp->temp_crit.attr.attr);
> >>> + result = device_create_file(hwmon->device,
> >>> + &temp->temp_crit.attr);
> >>> + if (result)
> >>> + goto unregister_input;
> >>> + }
> >>> + }
> >>> +
> >>> + mutex_lock(&thermal_hwmon_list_lock);
> >>> + if (new_hwmon_device)
> >>> + list_add_tail(&hwmon->node, &thermal_hwmon_list);
> >>> + list_add_tail(&temp->hwmon_node, &hwmon->tz_list);
> >>> + mutex_unlock(&thermal_hwmon_list_lock);
> >>> +
> >>> + return 0;
> >>> +
> >>> + unregister_input:
> >>> + device_remove_file(hwmon->device, &temp->temp_input.attr);
> >>> + free_temp_mem:
> >>> + kfree(temp);
> >>> + unregister_name:
> >>> + if (new_hwmon_device) {
> >>> + device_remove_file(hwmon->device, &dev_attr_name);
> >>> + hwmon_device_unregister(hwmon->device);
> >>> + }
> >>> + free_mem:
> >>> + if (new_hwmon_device)
> >>> + kfree(hwmon);
> >>> +
> >>> + return result;
> >>> +}
> >>> +
> >>> +void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
> >>> +{
> >>> + struct thermal_hwmon_device *hwmon;
> >>> + struct thermal_hwmon_temp *temp;
> >>> +
> >>> + hwmon = thermal_hwmon_lookup_by_type(tz);
> >>> + if (unlikely(!hwmon)) {
> >>> + /* Should never happen... */
> >>> + dev_dbg(&tz->device, "hwmon device lookup failed!\n");
> >>> + return;
> >>> + }
> >>> +
> >>> + temp = thermal_hwmon_lookup_temp(hwmon, tz);
> >>> + if (unlikely(!temp)) {
> >>> + /* Should never happen... */
> >>> + dev_dbg(&tz->device, "temperature input lookup failed!\n");
> >>> + return;
> >>> + }
> >>> +
> >>> + device_remove_file(hwmon->device, &temp->temp_input.attr);
> >>> + if (tz->ops->get_crit_temp)
> >>> + device_remove_file(hwmon->device, &temp->temp_crit.attr);
> >>> +
> >>> + mutex_lock(&thermal_hwmon_list_lock);
> >>> + list_del(&temp->hwmon_node);
> >>> + kfree(temp);
> >>> + if (!list_empty(&hwmon->tz_list)) {
> >>> + mutex_unlock(&thermal_hwmon_list_lock);
> >>> + return;
> >>> + }
> >>> + list_del(&hwmon->node);
> >>> + mutex_unlock(&thermal_hwmon_list_lock);
> >>> +
> >>> + device_remove_file(hwmon->device, &dev_attr_name);
> >>> + hwmon_device_unregister(hwmon->device);
> >>> + kfree(hwmon);
> >>> +}
> >>> diff --git a/drivers/thermal/thermal_hwmon.h
> >>> b/drivers/thermal/thermal_hwmon.h
> >>> new file mode 100644
> >>> index 0000000..c798fdb
> >>> --- /dev/null
> >>> +++ b/drivers/thermal/thermal_hwmon.h
> >>> @@ -0,0 +1,49 @@
> >>> +/*
> >>> + * thermal_hwmon.h - Generic Thermal Management hwmon support.
> >>> + *
> >>> + * Code based on Intel thermal_core.c. Copyrights of the original code:
> >>> + * Copyright (C) 2008 Intel Corp
> >>> + * Copyright (C) 2008 Zhang Rui <rui.zhang@intel.com>
> >>> + * Copyright (C) 2008 Sujith Thomas <sujith.thomas@intel.com>
> >>> + *
> >>> + * Copyright (C) 2013 Texas Instruments
> >>> + * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
> >>> + *
> >>>
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >>> ~~~~~~~~~~~~
> >>> + *
> >>> + * This program is free software; you can redistribute it and/or modify
> >>> + * it under the terms of the GNU General Public License as published by
> >>> + * the Free Software Foundation; version 2 of the License.
> >>> + *
> >>> + * This program is distributed in the hope that it will be useful, but
> >>> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> >>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> GNU
> >>> + * General Public License for more details.
> >>> + *
> >>> + * You should have received a copy of the GNU General Public License
> along
> >>> + * with this program; if not, write to the Free Software Foundation, Inc.,
> >>> + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
> >>> + *
> >>> + *
> >>>
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >>> ~~~~~~~~~~~~
> >>> + */
> >>> +#ifndef __THERMAL_HWMON_H__
> >>> +#define __THERMAL_HWMON_H__
> >>> +
> >>> +#include <linux/thermal.h>
> >>> +
> >>> +#ifdef CONFIG_THERMAL_HWMON
> >>> +int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz);
> >>> +void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz);
> >>> +#else
> >>> +static int
> >>> +thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
> >>> +{
> >>> + return 0;
> >>> +}
> >>> +
> >>> +static void
> >>> +thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
> >>> +{
> >>> +}
> >>> +#endif
> >>> +
> >>> +#endif /* __THERMAL_HWMON_H__ */
> >>> --
> >>> 1.8.2.1.342.gfa7285d
> >>>
> >>> --
> >>> To unsubscribe from this list: send the line "unsubscribe linux-pm" in
> >>> the body of a message to majordomo@vger.kernel.org
> >>> More majordomo info at http://vger.kernel.org/majordomo-info.html
> >>
> >>
> >
> >
> > --
> > You have got to be excited about what you are doing. (L. Lamport)
> >
> > Eduardo Valentin
> >
> >
> > * Eduardo Valentin <eduardo.valentin@ti.com>
> > * 0x75D0BCFD
> >
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [RFC PATCH 1/4] thermal: hwmon: move hwmon support to single file
2013-07-09 14:00 ` Eduardo Valentin
(?)
(?)
@ 2013-08-15 6:21 ` Zhang Rui
-1 siblings, 0 replies; 33+ messages in thread
From: Zhang Rui @ 2013-08-15 6:21 UTC (permalink / raw)
To: Eduardo Valentin; +Cc: linux-pm, durgadoss.r, amit.daniel, linux-kernel
Hi, Eduardo,
thanks for the patch, just one minor comments.
On 二, 2013-07-09 at 10:00 -0400, Eduardo Valentin wrote:
> diff --git a/drivers/thermal/thermal_hwmon.h b/drivers/thermal/thermal_hwmon.h
> new file mode 100644
> index 0000000..c798fdb
> --- /dev/null
> +++ b/drivers/thermal/thermal_hwmon.h
> @@ -0,0 +1,49 @@
> +/*
> + * thermal_hwmon.h - Generic Thermal Management hwmon support.
> + *
> + * Code based on Intel thermal_core.c. Copyrights of the original code:
> + * Copyright (C) 2008 Intel Corp
> + * Copyright (C) 2008 Zhang Rui <rui.zhang@intel.com>
> + * Copyright (C) 2008 Sujith Thomas <sujith.thomas@intel.com>
> + *
> + * Copyright (C) 2013 Texas Instruments
> + * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
> + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; version 2 of the License.
> + *
> + * This program is distributed in the hope that it will be useful, but
> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License along
> + * with this program; if not, write to the Free Software Foundation, Inc.,
> + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
> + *
> + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> + */
> +#ifndef __THERMAL_HWMON_H__
> +#define __THERMAL_HWMON_H__
> +
> +#include <linux/thermal.h>
> +
> +#ifdef CONFIG_THERMAL_HWMON
> +int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz);
> +void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz);
> +#else
> +static int
> +thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
> +{
> + return 0;
> +}
> +
> +static void
> +thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
> +{
> +}
> +#endif
> +
I'd prefer use "inline" here.
thanks,
rui
> +#endif /* __THERMAL_HWMON_H__ */
^ permalink raw reply [flat|nested] 33+ messages in thread
* [RFC PATCH 2/4] thermal: introduce device tree parser
2013-07-09 14:00 [RFC PATCH 0/4] thermal: introduce DT thermal builder Eduardo Valentin
@ 2013-07-09 14:00 ` Eduardo Valentin
2013-07-09 14:00 ` Eduardo Valentin
` (2 subsequent siblings)
3 siblings, 0 replies; 33+ messages in thread
From: Eduardo Valentin @ 2013-07-09 14:00 UTC (permalink / raw)
To: linux-pm, durgadoss.r, amit.daniel
Cc: rui.zhang, Eduardo Valentin, linux-kernel
In order to be able to build thermal policies
based on generic sensors, like I2C device, that
can be places in different points on different boards,
there is a need to have a way to feed board dependent
data into the thermal framework.
This patch introduces a thermal data parser for device
tree. The parsed data is used to build thermal zones
and thermal binding parameters. The output data
can then be used to deploy thermal policies.
This patch adds also documentation regarding this
API and how to define define tree nodes to use
this infrastructure.
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
---
.../devicetree/bindings/thermal/thermal.txt | 92 +++++
drivers/thermal/Kconfig | 13 +
drivers/thermal/Makefile | 1 +
drivers/thermal/thermal_dt.c | 412 +++++++++++++++++++++
drivers/thermal/thermal_dt.h | 44 +++
include/linux/thermal.h | 3 +
6 files changed, 565 insertions(+)
create mode 100644 Documentation/devicetree/bindings/thermal/thermal.txt
create mode 100644 drivers/thermal/thermal_dt.c
create mode 100644 drivers/thermal/thermal_dt.h
diff --git a/Documentation/devicetree/bindings/thermal/thermal.txt b/Documentation/devicetree/bindings/thermal/thermal.txt
new file mode 100644
index 0000000..2c25ab2
--- /dev/null
+++ b/Documentation/devicetree/bindings/thermal/thermal.txt
@@ -0,0 +1,92 @@
+----------------------------------------
+Thermal Framework Device Tree descriptor
+----------------------------------------
+
+This file describes how to define a thermal structure using device tree.
+A thermal structure includes thermal zones and their components, such
+as name, governor, trip points, polling intervals and cooling devices
+binding descriptors. A binding descriptor may contain information on
+how to react, with a cooling stepped action or a weight on a fair share.
+
+****
+trip
+****
+
+The trip node is a node to describe a point in the temperature domain
+in which the system takes an action. This node describes just the point,
+not the action.
+
+A node describing a trip must contain:
+- temperature: the trip temperature level, in milliCelsius.
+- hysteresis: a (low) hysteresis value on 'temperature'. This is a relative
+value, in milliCelsius.
+- type: the trip type. Here is the type mapping:
+ THERMAL_TRIP_ACTIVE = 0
+ THERMAL_TRIP_PASSIVE = 1
+ THERMAL_TRIP_HOT = 2
+ THERMAL_TRIP_CRITICAL = 3
+
+**********
+bind_param
+**********
+
+The bind_param node is a node to describe how cooling devices get assigned
+to trip points of the zone. The cooling devices are expected to be loaded
+in the target system.
+
+A node describing a bind_param must contain:
+- cooling_device: A string with the cooling device name.
+- weight: The 'influence' of a particular cooling device on this zone.
+ This is on a percentage scale. The sum of all these weights
+ (for a particular zone) cannot exceed 100.
+- trip_mask: This is a bit mask that gives the binding relation between
+ this thermal zone and cdev, for a particular trip point.
+ If nth bit is set, then the cdev and thermal zone are bound
+ for trip point n.
+
+************
+thermal_zone
+************
+
+The thermal_zone node is the node containing all the required info
+for describing a thermal zone, including its cdev bindings. The thermal_zone
+node must contain, apart from its own properties, one node containing
+trip nodes and one node containing all the zone bind parameters.
+
+Required properties:
+- type: this is a string containing the zone type. Say 'cpu', 'core', 'mem', etc.
+- mask: Bit string: If 'n'th bit is set, then trip point 'n' is writeable.
+
+- passive_delay: number of milliseconds to wait between polls when
+ performing passive cooling.
+- polling_delay: number of milliseconds to wait between polls when checking
+
+- governor: A string containing the default governor for this zone.
+
+Below is an example:
+thermal_zone {
+ type = "CPU";
+ mask = <0x03>; /* trips writability */
+ passive_delay = <250>; /* milliseconds */
+ polling_delay = <1000>; /* milliseconds */
+ governor = "step_wise";
+ trips {
+ alert@100000{
+ temperature = <100000>; /* milliCelsius */
+ hysteresis = <0>; /* milliCelsius */
+ type = <1>;
+ };
+ crit@125000{
+ temperature = <125000>; /* milliCelsius */
+ hysteresis = <0>; /* milliCelsius */
+ type = <3>;
+ };
+ };
+ bind_params {
+ action@0{
+ cooling_device = "thermal-cpufreq";
+ weight = <100>; /* percentage */
+ mask = <0x01>;
+ };
+ };
+};
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 7fb16bc..753f0dc 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -29,6 +29,19 @@ config THERMAL_HWMON
Say 'Y' here if you want all thermal sensors to
have hwmon sysfs interface too.
+config THERMAL_OF
+ bool
+ prompt "APIs to parse thermal data out of device tree"
+ depends on OF
+ default y
+ help
+ This options provides helpers to add the support to
+ read and parse thermal data definitions out of the
+ device tree blob.
+
+ Say 'Y' here if you need to build thermal infrastructure
+ based on device tree.
+
choice
prompt "Default Thermal governor"
default THERMAL_DEFAULT_GOV_STEP_WISE
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 24cb894..eedb273 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -7,6 +7,7 @@ thermal_sys-y += thermal_core.o
# interface to/from other layers providing sensors
thermal_sys-$(CONFIG_THERMAL_HWMON) += thermal_hwmon.o
+thermal_sys-$(CONFIG_THERMAL_OF) += thermal_dt.o
# governors
thermal_sys-$(CONFIG_THERMAL_GOV_FAIR_SHARE) += fair_share.o
diff --git a/drivers/thermal/thermal_dt.c b/drivers/thermal/thermal_dt.c
new file mode 100644
index 0000000..6553582
--- /dev/null
+++ b/drivers/thermal/thermal_dt.c
@@ -0,0 +1,412 @@
+/*
+ * thermal_dt.c - Generic Thermal Management device tree support.
+ *
+ * Copyright (C) 2013 Texas Instruments
+ * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+#include <linux/thermal.h>
+#include <linux/slab.h>
+#include <linux/of_device.h>
+#include <linux/of_platform.h>
+#include <linux/err.h>
+#include <linux/export.h>
+#include <linux/string.h>
+
+struct __thermal_bind_params {
+ char cooling_device[THERMAL_NAME_LENGTH];
+};
+
+static
+int thermal_of_match(struct thermal_zone_device *tz,
+ struct thermal_cooling_device *cdev);
+
+static int thermal_of_populate_bind_params(struct device *dev,
+ struct device_node *node,
+ struct __thermal_bind_params *__tbp,
+ struct thermal_bind_params *tbp)
+{
+ const char *cdev_name;
+ int ret;
+ u32 prop;
+
+ ret = of_property_read_u32(node, "weight", &prop);
+ if (ret < 0) {
+ dev_err(dev, "missing weight property\n");
+ return ret;
+ }
+ tbp->weight = prop;
+
+ ret = of_property_read_u32(node, "mask", &prop);
+ if (ret < 0) {
+ dev_err(dev, "missing mask property\n");
+ return ret;
+ }
+ tbp->trip_mask = prop;
+
+ /* this will allow us to bind with cooling devices */
+ tbp->match = thermal_of_match;
+
+ ret = of_property_read_string(node, "cooling_device", &cdev_name);
+ if (ret < 0) {
+ dev_err(dev, "missing cooling_device property\n");
+ return ret;
+ }
+ strncpy(__tbp->cooling_device, cdev_name,
+ sizeof(__tbp->cooling_device));
+
+ return 0;
+}
+
+struct __thermal_trip {
+ unsigned long int temperature;
+ unsigned long int hysteresis;
+ enum thermal_trip_type type;
+};
+
+static
+int thermal_of_populate_trip(struct device *dev,
+ struct device_node *node,
+ struct __thermal_trip *trip)
+{
+ int ret;
+ int prop;
+
+ ret = of_property_read_u32(node, "temperature", &prop);
+ if (ret < 0) {
+ dev_err(dev, "missing temperature property\n");
+ return ret;
+ }
+ trip->temperature = prop;
+
+ ret = of_property_read_u32(node, "hysteresis", &prop);
+ if (ret < 0) {
+ dev_err(dev, "missing hysteresis property\n");
+ return ret;
+ }
+ trip->hysteresis = prop;
+
+ ret = of_property_read_u32(node, "type", &prop);
+ if (ret < 0) {
+ dev_err(dev, "missing type property\n");
+ return ret;
+ }
+ trip->type = prop;
+
+ return 0;
+}
+
+struct __thermal_zone_device {
+ enum thermal_device_mode mode;
+ int passive_delay;
+ int polling_delay;
+ int mask;
+ int ntrips;
+ char type[THERMAL_NAME_LENGTH];
+ struct __thermal_trip *trips;
+ struct __thermal_bind_params *bind_params;
+ struct thermal_bind_params *tbps;
+ struct thermal_zone_params zone_params;
+ int (*get_temp)(void *, unsigned long *);
+ void *devdata;
+};
+
+static
+struct __thermal_zone_device *thermal_of_build_thermal_zone(struct device *dev)
+{
+ struct device_node *child, *gchild, *node;
+ struct __thermal_zone_device *tz;
+ const char *name;
+ int ret, i;
+ u32 prop;
+
+ node = dev->of_node;
+ if (!node)
+ return ERR_PTR(-EINVAL);
+
+ node = of_find_node_by_name(node, "thermal_zone");
+ if (!node) {
+ dev_err(dev, "no thermal_zone node found\n");
+ return ERR_PTR(-EINVAL);
+ }
+
+ tz = devm_kzalloc(dev, sizeof(*tz), GFP_KERNEL);
+ if (!tz) {
+ dev_err(dev, "not enough memory for thermal of zone\n");
+ return ERR_PTR(-ENOMEM);
+ }
+
+ ret = of_property_read_u32(node, "passive_delay", &prop);
+ if (ret < 0) {
+ dev_err(dev, "missing passive_delay property\n");
+ return ERR_PTR(ret);
+ }
+ tz->passive_delay = prop;
+
+ ret = of_property_read_u32(node, "polling_delay", &prop);
+ if (ret < 0) {
+ dev_err(dev, "missing polling_delay property\n");
+ return ERR_PTR(ret);
+ }
+ tz->polling_delay = prop;
+
+ ret = of_property_read_u32(node, "mask", &prop);
+ if (ret < 0) {
+ dev_err(dev, "missing mask property\n");
+ return ERR_PTR(ret);
+ }
+ tz->mask = prop;
+
+ ret = of_property_read_string(node, "type", &name);
+ if (ret < 0) {
+ dev_err(dev, "missing type property\n");
+ return ERR_PTR(ret);
+ }
+ strncpy(tz->type, name, sizeof(tz->type));
+
+ ret = of_property_read_string(node, "governor", &name);
+ if (ret < 0) {
+ dev_err(dev, "missing governor property\n");
+ return ERR_PTR(ret);
+ }
+ strncpy(tz->zone_params.governor_name, name,
+ sizeof(tz->zone_params.governor_name));
+
+ /* trips */
+ child = of_find_node_by_name(node, "trips");
+ tz->ntrips = of_get_child_count(child);
+ tz->trips = devm_kzalloc(dev, tz->ntrips * sizeof(*tz->trips),
+ GFP_KERNEL);
+ if (!tz->trips)
+ return ERR_PTR(-ENOMEM);
+ i = 0;
+ for_each_child_of_node(child, gchild)
+ thermal_of_populate_trip(dev, gchild, &tz->trips[i++]);
+
+ /* bind_params */
+ child = of_find_node_by_name(node, "bind_params");
+ tz->zone_params.num_tbps = of_get_child_count(child);
+ tz->bind_params = devm_kzalloc(dev,
+ tz->zone_params.num_tbps *
+ sizeof(*tz->bind_params),
+ GFP_KERNEL);
+ if (!tz->bind_params)
+ return ERR_PTR(-ENOMEM);
+ tz->zone_params.tbp = devm_kzalloc(dev,
+ tz->zone_params.num_tbps *
+ sizeof(*tz->zone_params.tbp),
+ GFP_KERNEL);
+ if (!tz->zone_params.tbp)
+ return ERR_PTR(-ENOMEM);
+ i = 0;
+ for_each_child_of_node(child, gchild) {
+ thermal_of_populate_bind_params(dev, gchild,
+ &tz->bind_params[i],
+ &tz->zone_params.tbp[i]);
+ i++;
+ }
+ tz->mode = THERMAL_DEVICE_ENABLED;
+
+ return tz;
+}
+
+static
+int thermal_of_match(struct thermal_zone_device *tz,
+ struct thermal_cooling_device *cdev)
+{
+ struct __thermal_zone_device *data = tz->devdata;
+ int i;
+
+ for (i = 0; i < data->zone_params.num_tbps; i++) {
+ if (!strncmp(data->bind_params[i].cooling_device,
+ cdev->type,
+ strlen(data->bind_params[i].cooling_device)) &&
+ (data->zone_params.tbp[i].trip_mask & (1 << i)))
+ return 0;
+ }
+
+ return -EINVAL;
+}
+
+static
+int of_thermal_get_temp(struct thermal_zone_device *tz,
+ unsigned long *temp)
+{
+ struct __thermal_zone_device *data = tz->devdata;
+
+ return data->get_temp(data->devdata, temp);
+}
+
+static
+int of_thermal_get_mode(struct thermal_zone_device *tz,
+ enum thermal_device_mode *mode)
+{
+ struct __thermal_zone_device *data = tz->devdata;
+
+ *mode = data->mode;
+
+ return 0;
+}
+
+static
+int of_thermal_set_mode(struct thermal_zone_device *tz,
+ enum thermal_device_mode mode)
+{
+ struct __thermal_zone_device *data = tz->devdata;
+
+ mutex_lock(&tz->lock);
+
+ if (mode == THERMAL_DEVICE_ENABLED)
+ tz->polling_delay = data->polling_delay;
+ else
+ tz->polling_delay = 0;
+
+ mutex_unlock(&tz->lock);
+
+ data->mode = mode;
+ thermal_zone_device_update(tz);
+
+ return 0;
+}
+
+static
+int of_thermal_get_trip_type(struct thermal_zone_device *tz, int trip,
+ enum thermal_trip_type *type)
+{
+ struct __thermal_zone_device *data = tz->devdata;
+
+ if (trip >= data->ntrips || trip < 0)
+ return -ERANGE;
+
+ *type = data->trips[trip].type;
+
+ return 0;
+}
+
+static
+int of_thermal_get_trip_temp(struct thermal_zone_device *tz, int trip,
+ unsigned long *temp)
+{
+ struct __thermal_zone_device *data = tz->devdata;
+
+ if (trip >= data->ntrips || trip < 0)
+ return -ERANGE;
+
+ *temp = data->trips[trip].temperature;
+
+ return 0;
+}
+
+static
+int of_thermal_set_trip_temp(struct thermal_zone_device *tz, int trip,
+ unsigned long temp)
+{
+ struct __thermal_zone_device *data = tz->devdata;
+
+ if (trip >= data->ntrips || trip < 0)
+ return -ERANGE;
+
+ /* thermal fw should take care of data->mask & (1 << trip) */
+ data->trips[trip].temperature = temp;
+
+ return 0;
+}
+
+static
+int of_thermal_get_trip_hyst(struct thermal_zone_device *tz, int trip,
+ unsigned long *hyst)
+{
+ struct __thermal_zone_device *data = tz->devdata;
+
+ if (trip >= data->ntrips || trip < 0)
+ return -ERANGE;
+
+ *hyst = data->trips[trip].hysteresis;
+
+ return 0;
+}
+
+static
+int of_thermal_set_trip_hyst(struct thermal_zone_device *tz, int trip,
+ unsigned long hyst)
+{
+ struct __thermal_zone_device *data = tz->devdata;
+
+ if (trip >= data->ntrips || trip < 0)
+ return -ERANGE;
+
+ /* thermal fw should take care of data->mask & (1 << trip) */
+ data->trips[trip].hysteresis = hyst;
+
+ return 0;
+}
+
+static int
+of_thermal_get_crit_temp(struct thermal_zone_device *tz, unsigned long *temp)
+{
+ struct __thermal_zone_device *data = tz->devdata;
+ int i;
+
+ for (i = 0; i < data->ntrips; i++)
+ if (data->trips[i].type == THERMAL_TRIP_CRITICAL) {
+ *temp = data->trips[i].temperature;
+ return 0;
+ }
+
+ return -EINVAL;
+}
+
+static const
+struct thermal_zone_device_ops of_thermal_ops = {
+ .get_temp = of_thermal_get_temp,
+ .get_mode = of_thermal_get_mode,
+ .set_mode = of_thermal_set_mode,
+ .get_trip_type = of_thermal_get_trip_type,
+ .get_trip_temp = of_thermal_get_trip_temp,
+ .set_trip_temp = of_thermal_set_trip_temp,
+ .get_trip_hyst = of_thermal_get_trip_hyst,
+ .set_trip_hyst = of_thermal_set_trip_hyst,
+ .get_crit_temp = of_thermal_get_crit_temp,
+};
+
+struct thermal_zone_device *thermal_zone_of_device_register(struct device *dev,
+ void *data, int (*get_temp)(void *, unsigned long *))
+{
+ struct __thermal_zone_device *tz;
+ struct thermal_zone_device_ops *ops;
+
+ tz = thermal_of_build_thermal_zone(dev);
+ if (IS_ERR(tz)) {
+ dev_err(dev, "failed to build thermal zone\n");
+ return NULL;
+ }
+ ops = devm_kzalloc(dev, sizeof(*ops), GFP_KERNEL);
+ if (!ops) {
+ dev_err(dev, "no memory available for thermal ops\n");
+ return NULL;
+ }
+ memcpy(ops, &of_thermal_ops, sizeof(*ops));
+ tz->get_temp = get_temp;
+ tz->devdata = data;
+
+ return thermal_zone_device_register(tz->type, tz->ntrips, tz->mask, tz,
+ ops, &tz->zone_params,
+ tz->passive_delay,
+ tz->polling_delay);
+}
+EXPORT_SYMBOL_GPL(thermal_zone_of_device_register);
diff --git a/drivers/thermal/thermal_dt.h b/drivers/thermal/thermal_dt.h
new file mode 100644
index 0000000..5491d19
--- /dev/null
+++ b/drivers/thermal/thermal_dt.h
@@ -0,0 +1,44 @@
+/*
+ * thermal_dt.h - Generic Thermal Management device tree support.
+ *
+ * Copyright (C) 2013 Texas Instruments
+ * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+#ifndef __THERMAL_DT_H__
+#define __THERMAL_DT_H__
+#include <linux/device.h>
+
+#ifdef CONFIG_THERMAL_OF
+struct thermal_bind_params *thermal_of_build_bind_params(struct device *dev);
+struct thermal_zone_device *thermal_of_build_thermal_zone(struct device *dev);
+#else
+static
+struct thermal_bind_params *thermal_of_build_bind_params(struct device *dev)
+{
+ return NULL;
+}
+
+static
+struct thermal_zone_device *thermal_of_build_thermal_zone(struct device *dev)
+{
+ return NULL;
+}
+#endif
+
+#endif /* __THERMAL_DT_H__ */
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index a386a1c..a62ada0 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -224,6 +224,9 @@ struct thermal_genl_event {
};
/* Function declarations */
+struct thermal_zone_device
+*thermal_zone_of_device_register(struct device *, void *data,
+ int (*get_temp) (void *, unsigned long *));
struct thermal_zone_device *thermal_zone_device_register(const char *, int, int,
void *, const struct thermal_zone_device_ops *,
const struct thermal_zone_params *, int, int);
--
1.8.2.1.342.gfa7285d
^ permalink raw reply related [flat|nested] 33+ messages in thread* [RFC PATCH 2/4] thermal: introduce device tree parser
@ 2013-07-09 14:00 ` Eduardo Valentin
0 siblings, 0 replies; 33+ messages in thread
From: Eduardo Valentin @ 2013-07-09 14:00 UTC (permalink / raw)
To: linux-pm, durgadoss.r, amit.daniel
Cc: rui.zhang, Eduardo Valentin, linux-kernel
In order to be able to build thermal policies
based on generic sensors, like I2C device, that
can be places in different points on different boards,
there is a need to have a way to feed board dependent
data into the thermal framework.
This patch introduces a thermal data parser for device
tree. The parsed data is used to build thermal zones
and thermal binding parameters. The output data
can then be used to deploy thermal policies.
This patch adds also documentation regarding this
API and how to define define tree nodes to use
this infrastructure.
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
---
.../devicetree/bindings/thermal/thermal.txt | 92 +++++
drivers/thermal/Kconfig | 13 +
drivers/thermal/Makefile | 1 +
drivers/thermal/thermal_dt.c | 412 +++++++++++++++++++++
drivers/thermal/thermal_dt.h | 44 +++
include/linux/thermal.h | 3 +
6 files changed, 565 insertions(+)
create mode 100644 Documentation/devicetree/bindings/thermal/thermal.txt
create mode 100644 drivers/thermal/thermal_dt.c
create mode 100644 drivers/thermal/thermal_dt.h
diff --git a/Documentation/devicetree/bindings/thermal/thermal.txt b/Documentation/devicetree/bindings/thermal/thermal.txt
new file mode 100644
index 0000000..2c25ab2
--- /dev/null
+++ b/Documentation/devicetree/bindings/thermal/thermal.txt
@@ -0,0 +1,92 @@
+----------------------------------------
+Thermal Framework Device Tree descriptor
+----------------------------------------
+
+This file describes how to define a thermal structure using device tree.
+A thermal structure includes thermal zones and their components, such
+as name, governor, trip points, polling intervals and cooling devices
+binding descriptors. A binding descriptor may contain information on
+how to react, with a cooling stepped action or a weight on a fair share.
+
+****
+trip
+****
+
+The trip node is a node to describe a point in the temperature domain
+in which the system takes an action. This node describes just the point,
+not the action.
+
+A node describing a trip must contain:
+- temperature: the trip temperature level, in milliCelsius.
+- hysteresis: a (low) hysteresis value on 'temperature'. This is a relative
+value, in milliCelsius.
+- type: the trip type. Here is the type mapping:
+ THERMAL_TRIP_ACTIVE = 0
+ THERMAL_TRIP_PASSIVE = 1
+ THERMAL_TRIP_HOT = 2
+ THERMAL_TRIP_CRITICAL = 3
+
+**********
+bind_param
+**********
+
+The bind_param node is a node to describe how cooling devices get assigned
+to trip points of the zone. The cooling devices are expected to be loaded
+in the target system.
+
+A node describing a bind_param must contain:
+- cooling_device: A string with the cooling device name.
+- weight: The 'influence' of a particular cooling device on this zone.
+ This is on a percentage scale. The sum of all these weights
+ (for a particular zone) cannot exceed 100.
+- trip_mask: This is a bit mask that gives the binding relation between
+ this thermal zone and cdev, for a particular trip point.
+ If nth bit is set, then the cdev and thermal zone are bound
+ for trip point n.
+
+************
+thermal_zone
+************
+
+The thermal_zone node is the node containing all the required info
+for describing a thermal zone, including its cdev bindings. The thermal_zone
+node must contain, apart from its own properties, one node containing
+trip nodes and one node containing all the zone bind parameters.
+
+Required properties:
+- type: this is a string containing the zone type. Say 'cpu', 'core', 'mem', etc.
+- mask: Bit string: If 'n'th bit is set, then trip point 'n' is writeable.
+
+- passive_delay: number of milliseconds to wait between polls when
+ performing passive cooling.
+- polling_delay: number of milliseconds to wait between polls when checking
+
+- governor: A string containing the default governor for this zone.
+
+Below is an example:
+thermal_zone {
+ type = "CPU";
+ mask = <0x03>; /* trips writability */
+ passive_delay = <250>; /* milliseconds */
+ polling_delay = <1000>; /* milliseconds */
+ governor = "step_wise";
+ trips {
+ alert@100000{
+ temperature = <100000>; /* milliCelsius */
+ hysteresis = <0>; /* milliCelsius */
+ type = <1>;
+ };
+ crit@125000{
+ temperature = <125000>; /* milliCelsius */
+ hysteresis = <0>; /* milliCelsius */
+ type = <3>;
+ };
+ };
+ bind_params {
+ action@0{
+ cooling_device = "thermal-cpufreq";
+ weight = <100>; /* percentage */
+ mask = <0x01>;
+ };
+ };
+};
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 7fb16bc..753f0dc 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -29,6 +29,19 @@ config THERMAL_HWMON
Say 'Y' here if you want all thermal sensors to
have hwmon sysfs interface too.
+config THERMAL_OF
+ bool
+ prompt "APIs to parse thermal data out of device tree"
+ depends on OF
+ default y
+ help
+ This options provides helpers to add the support to
+ read and parse thermal data definitions out of the
+ device tree blob.
+
+ Say 'Y' here if you need to build thermal infrastructure
+ based on device tree.
+
choice
prompt "Default Thermal governor"
default THERMAL_DEFAULT_GOV_STEP_WISE
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 24cb894..eedb273 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -7,6 +7,7 @@ thermal_sys-y += thermal_core.o
# interface to/from other layers providing sensors
thermal_sys-$(CONFIG_THERMAL_HWMON) += thermal_hwmon.o
+thermal_sys-$(CONFIG_THERMAL_OF) += thermal_dt.o
# governors
thermal_sys-$(CONFIG_THERMAL_GOV_FAIR_SHARE) += fair_share.o
diff --git a/drivers/thermal/thermal_dt.c b/drivers/thermal/thermal_dt.c
new file mode 100644
index 0000000..6553582
--- /dev/null
+++ b/drivers/thermal/thermal_dt.c
@@ -0,0 +1,412 @@
+/*
+ * thermal_dt.c - Generic Thermal Management device tree support.
+ *
+ * Copyright (C) 2013 Texas Instruments
+ * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+#include <linux/thermal.h>
+#include <linux/slab.h>
+#include <linux/of_device.h>
+#include <linux/of_platform.h>
+#include <linux/err.h>
+#include <linux/export.h>
+#include <linux/string.h>
+
+struct __thermal_bind_params {
+ char cooling_device[THERMAL_NAME_LENGTH];
+};
+
+static
+int thermal_of_match(struct thermal_zone_device *tz,
+ struct thermal_cooling_device *cdev);
+
+static int thermal_of_populate_bind_params(struct device *dev,
+ struct device_node *node,
+ struct __thermal_bind_params *__tbp,
+ struct thermal_bind_params *tbp)
+{
+ const char *cdev_name;
+ int ret;
+ u32 prop;
+
+ ret = of_property_read_u32(node, "weight", &prop);
+ if (ret < 0) {
+ dev_err(dev, "missing weight property\n");
+ return ret;
+ }
+ tbp->weight = prop;
+
+ ret = of_property_read_u32(node, "mask", &prop);
+ if (ret < 0) {
+ dev_err(dev, "missing mask property\n");
+ return ret;
+ }
+ tbp->trip_mask = prop;
+
+ /* this will allow us to bind with cooling devices */
+ tbp->match = thermal_of_match;
+
+ ret = of_property_read_string(node, "cooling_device", &cdev_name);
+ if (ret < 0) {
+ dev_err(dev, "missing cooling_device property\n");
+ return ret;
+ }
+ strncpy(__tbp->cooling_device, cdev_name,
+ sizeof(__tbp->cooling_device));
+
+ return 0;
+}
+
+struct __thermal_trip {
+ unsigned long int temperature;
+ unsigned long int hysteresis;
+ enum thermal_trip_type type;
+};
+
+static
+int thermal_of_populate_trip(struct device *dev,
+ struct device_node *node,
+ struct __thermal_trip *trip)
+{
+ int ret;
+ int prop;
+
+ ret = of_property_read_u32(node, "temperature", &prop);
+ if (ret < 0) {
+ dev_err(dev, "missing temperature property\n");
+ return ret;
+ }
+ trip->temperature = prop;
+
+ ret = of_property_read_u32(node, "hysteresis", &prop);
+ if (ret < 0) {
+ dev_err(dev, "missing hysteresis property\n");
+ return ret;
+ }
+ trip->hysteresis = prop;
+
+ ret = of_property_read_u32(node, "type", &prop);
+ if (ret < 0) {
+ dev_err(dev, "missing type property\n");
+ return ret;
+ }
+ trip->type = prop;
+
+ return 0;
+}
+
+struct __thermal_zone_device {
+ enum thermal_device_mode mode;
+ int passive_delay;
+ int polling_delay;
+ int mask;
+ int ntrips;
+ char type[THERMAL_NAME_LENGTH];
+ struct __thermal_trip *trips;
+ struct __thermal_bind_params *bind_params;
+ struct thermal_bind_params *tbps;
+ struct thermal_zone_params zone_params;
+ int (*get_temp)(void *, unsigned long *);
+ void *devdata;
+};
+
+static
+struct __thermal_zone_device *thermal_of_build_thermal_zone(struct device *dev)
+{
+ struct device_node *child, *gchild, *node;
+ struct __thermal_zone_device *tz;
+ const char *name;
+ int ret, i;
+ u32 prop;
+
+ node = dev->of_node;
+ if (!node)
+ return ERR_PTR(-EINVAL);
+
+ node = of_find_node_by_name(node, "thermal_zone");
+ if (!node) {
+ dev_err(dev, "no thermal_zone node found\n");
+ return ERR_PTR(-EINVAL);
+ }
+
+ tz = devm_kzalloc(dev, sizeof(*tz), GFP_KERNEL);
+ if (!tz) {
+ dev_err(dev, "not enough memory for thermal of zone\n");
+ return ERR_PTR(-ENOMEM);
+ }
+
+ ret = of_property_read_u32(node, "passive_delay", &prop);
+ if (ret < 0) {
+ dev_err(dev, "missing passive_delay property\n");
+ return ERR_PTR(ret);
+ }
+ tz->passive_delay = prop;
+
+ ret = of_property_read_u32(node, "polling_delay", &prop);
+ if (ret < 0) {
+ dev_err(dev, "missing polling_delay property\n");
+ return ERR_PTR(ret);
+ }
+ tz->polling_delay = prop;
+
+ ret = of_property_read_u32(node, "mask", &prop);
+ if (ret < 0) {
+ dev_err(dev, "missing mask property\n");
+ return ERR_PTR(ret);
+ }
+ tz->mask = prop;
+
+ ret = of_property_read_string(node, "type", &name);
+ if (ret < 0) {
+ dev_err(dev, "missing type property\n");
+ return ERR_PTR(ret);
+ }
+ strncpy(tz->type, name, sizeof(tz->type));
+
+ ret = of_property_read_string(node, "governor", &name);
+ if (ret < 0) {
+ dev_err(dev, "missing governor property\n");
+ return ERR_PTR(ret);
+ }
+ strncpy(tz->zone_params.governor_name, name,
+ sizeof(tz->zone_params.governor_name));
+
+ /* trips */
+ child = of_find_node_by_name(node, "trips");
+ tz->ntrips = of_get_child_count(child);
+ tz->trips = devm_kzalloc(dev, tz->ntrips * sizeof(*tz->trips),
+ GFP_KERNEL);
+ if (!tz->trips)
+ return ERR_PTR(-ENOMEM);
+ i = 0;
+ for_each_child_of_node(child, gchild)
+ thermal_of_populate_trip(dev, gchild, &tz->trips[i++]);
+
+ /* bind_params */
+ child = of_find_node_by_name(node, "bind_params");
+ tz->zone_params.num_tbps = of_get_child_count(child);
+ tz->bind_params = devm_kzalloc(dev,
+ tz->zone_params.num_tbps *
+ sizeof(*tz->bind_params),
+ GFP_KERNEL);
+ if (!tz->bind_params)
+ return ERR_PTR(-ENOMEM);
+ tz->zone_params.tbp = devm_kzalloc(dev,
+ tz->zone_params.num_tbps *
+ sizeof(*tz->zone_params.tbp),
+ GFP_KERNEL);
+ if (!tz->zone_params.tbp)
+ return ERR_PTR(-ENOMEM);
+ i = 0;
+ for_each_child_of_node(child, gchild) {
+ thermal_of_populate_bind_params(dev, gchild,
+ &tz->bind_params[i],
+ &tz->zone_params.tbp[i]);
+ i++;
+ }
+ tz->mode = THERMAL_DEVICE_ENABLED;
+
+ return tz;
+}
+
+static
+int thermal_of_match(struct thermal_zone_device *tz,
+ struct thermal_cooling_device *cdev)
+{
+ struct __thermal_zone_device *data = tz->devdata;
+ int i;
+
+ for (i = 0; i < data->zone_params.num_tbps; i++) {
+ if (!strncmp(data->bind_params[i].cooling_device,
+ cdev->type,
+ strlen(data->bind_params[i].cooling_device)) &&
+ (data->zone_params.tbp[i].trip_mask & (1 << i)))
+ return 0;
+ }
+
+ return -EINVAL;
+}
+
+static
+int of_thermal_get_temp(struct thermal_zone_device *tz,
+ unsigned long *temp)
+{
+ struct __thermal_zone_device *data = tz->devdata;
+
+ return data->get_temp(data->devdata, temp);
+}
+
+static
+int of_thermal_get_mode(struct thermal_zone_device *tz,
+ enum thermal_device_mode *mode)
+{
+ struct __thermal_zone_device *data = tz->devdata;
+
+ *mode = data->mode;
+
+ return 0;
+}
+
+static
+int of_thermal_set_mode(struct thermal_zone_device *tz,
+ enum thermal_device_mode mode)
+{
+ struct __thermal_zone_device *data = tz->devdata;
+
+ mutex_lock(&tz->lock);
+
+ if (mode == THERMAL_DEVICE_ENABLED)
+ tz->polling_delay = data->polling_delay;
+ else
+ tz->polling_delay = 0;
+
+ mutex_unlock(&tz->lock);
+
+ data->mode = mode;
+ thermal_zone_device_update(tz);
+
+ return 0;
+}
+
+static
+int of_thermal_get_trip_type(struct thermal_zone_device *tz, int trip,
+ enum thermal_trip_type *type)
+{
+ struct __thermal_zone_device *data = tz->devdata;
+
+ if (trip >= data->ntrips || trip < 0)
+ return -ERANGE;
+
+ *type = data->trips[trip].type;
+
+ return 0;
+}
+
+static
+int of_thermal_get_trip_temp(struct thermal_zone_device *tz, int trip,
+ unsigned long *temp)
+{
+ struct __thermal_zone_device *data = tz->devdata;
+
+ if (trip >= data->ntrips || trip < 0)
+ return -ERANGE;
+
+ *temp = data->trips[trip].temperature;
+
+ return 0;
+}
+
+static
+int of_thermal_set_trip_temp(struct thermal_zone_device *tz, int trip,
+ unsigned long temp)
+{
+ struct __thermal_zone_device *data = tz->devdata;
+
+ if (trip >= data->ntrips || trip < 0)
+ return -ERANGE;
+
+ /* thermal fw should take care of data->mask & (1 << trip) */
+ data->trips[trip].temperature = temp;
+
+ return 0;
+}
+
+static
+int of_thermal_get_trip_hyst(struct thermal_zone_device *tz, int trip,
+ unsigned long *hyst)
+{
+ struct __thermal_zone_device *data = tz->devdata;
+
+ if (trip >= data->ntrips || trip < 0)
+ return -ERANGE;
+
+ *hyst = data->trips[trip].hysteresis;
+
+ return 0;
+}
+
+static
+int of_thermal_set_trip_hyst(struct thermal_zone_device *tz, int trip,
+ unsigned long hyst)
+{
+ struct __thermal_zone_device *data = tz->devdata;
+
+ if (trip >= data->ntrips || trip < 0)
+ return -ERANGE;
+
+ /* thermal fw should take care of data->mask & (1 << trip) */
+ data->trips[trip].hysteresis = hyst;
+
+ return 0;
+}
+
+static int
+of_thermal_get_crit_temp(struct thermal_zone_device *tz, unsigned long *temp)
+{
+ struct __thermal_zone_device *data = tz->devdata;
+ int i;
+
+ for (i = 0; i < data->ntrips; i++)
+ if (data->trips[i].type == THERMAL_TRIP_CRITICAL) {
+ *temp = data->trips[i].temperature;
+ return 0;
+ }
+
+ return -EINVAL;
+}
+
+static const
+struct thermal_zone_device_ops of_thermal_ops = {
+ .get_temp = of_thermal_get_temp,
+ .get_mode = of_thermal_get_mode,
+ .set_mode = of_thermal_set_mode,
+ .get_trip_type = of_thermal_get_trip_type,
+ .get_trip_temp = of_thermal_get_trip_temp,
+ .set_trip_temp = of_thermal_set_trip_temp,
+ .get_trip_hyst = of_thermal_get_trip_hyst,
+ .set_trip_hyst = of_thermal_set_trip_hyst,
+ .get_crit_temp = of_thermal_get_crit_temp,
+};
+
+struct thermal_zone_device *thermal_zone_of_device_register(struct device *dev,
+ void *data, int (*get_temp)(void *, unsigned long *))
+{
+ struct __thermal_zone_device *tz;
+ struct thermal_zone_device_ops *ops;
+
+ tz = thermal_of_build_thermal_zone(dev);
+ if (IS_ERR(tz)) {
+ dev_err(dev, "failed to build thermal zone\n");
+ return NULL;
+ }
+ ops = devm_kzalloc(dev, sizeof(*ops), GFP_KERNEL);
+ if (!ops) {
+ dev_err(dev, "no memory available for thermal ops\n");
+ return NULL;
+ }
+ memcpy(ops, &of_thermal_ops, sizeof(*ops));
+ tz->get_temp = get_temp;
+ tz->devdata = data;
+
+ return thermal_zone_device_register(tz->type, tz->ntrips, tz->mask, tz,
+ ops, &tz->zone_params,
+ tz->passive_delay,
+ tz->polling_delay);
+}
+EXPORT_SYMBOL_GPL(thermal_zone_of_device_register);
diff --git a/drivers/thermal/thermal_dt.h b/drivers/thermal/thermal_dt.h
new file mode 100644
index 0000000..5491d19
--- /dev/null
+++ b/drivers/thermal/thermal_dt.h
@@ -0,0 +1,44 @@
+/*
+ * thermal_dt.h - Generic Thermal Management device tree support.
+ *
+ * Copyright (C) 2013 Texas Instruments
+ * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+#ifndef __THERMAL_DT_H__
+#define __THERMAL_DT_H__
+#include <linux/device.h>
+
+#ifdef CONFIG_THERMAL_OF
+struct thermal_bind_params *thermal_of_build_bind_params(struct device *dev);
+struct thermal_zone_device *thermal_of_build_thermal_zone(struct device *dev);
+#else
+static
+struct thermal_bind_params *thermal_of_build_bind_params(struct device *dev)
+{
+ return NULL;
+}
+
+static
+struct thermal_zone_device *thermal_of_build_thermal_zone(struct device *dev)
+{
+ return NULL;
+}
+#endif
+
+#endif /* __THERMAL_DT_H__ */
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index a386a1c..a62ada0 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -224,6 +224,9 @@ struct thermal_genl_event {
};
/* Function declarations */
+struct thermal_zone_device
+*thermal_zone_of_device_register(struct device *, void *data,
+ int (*get_temp) (void *, unsigned long *));
struct thermal_zone_device *thermal_zone_device_register(const char *, int, int,
void *, const struct thermal_zone_device_ops *,
const struct thermal_zone_params *, int, int);
--
1.8.2.1.342.gfa7285d
^ permalink raw reply related [flat|nested] 33+ messages in thread* RE: [RFC PATCH 2/4] thermal: introduce device tree parser
2013-07-09 14:00 ` Eduardo Valentin
(?)
@ 2013-07-09 16:14 ` R, Durgadoss
2013-07-17 14:51 ` Eduardo Valentin
-1 siblings, 1 reply; 33+ messages in thread
From: R, Durgadoss @ 2013-07-09 16:14 UTC (permalink / raw)
To: Eduardo Valentin, linux-pm, amit.daniel; +Cc: Zhang, Rui, linux-kernel
Hi Eduardo,
> -----Original Message-----
> From: Eduardo Valentin [mailto:eduardo.valentin@ti.com]
> Sent: Tuesday, July 09, 2013 7:30 PM
> To: linux-pm@vger.kernel.org; R, Durgadoss; amit.daniel@samsung.com
> Cc: Zhang, Rui; Eduardo Valentin; linux-kernel@vger.kernel.org
> Subject: [RFC PATCH 2/4] thermal: introduce device tree parser
>
> In order to be able to build thermal policies
> based on generic sensors, like I2C device, that
> can be places in different points on different boards,
> there is a need to have a way to feed board dependent
> data into the thermal framework.
>
> This patch introduces a thermal data parser for device
> tree. The parsed data is used to build thermal zones
> and thermal binding parameters. The output data
> can then be used to deploy thermal policies.
>
> This patch adds also documentation regarding this
> API and how to define define tree nodes to use
> this infrastructure.
>
> Cc: Zhang Rui <rui.zhang@intel.com>
> Cc: linux-pm@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
> ---
I looked at the Documentation part of this. And it looks good.
At some places you are using ERANGE. Technically, this represents
'Math result not representable'. May be should be use EINVAL
itself ? I would leave it up to you ;)
Thanks,
Durga
> .../devicetree/bindings/thermal/thermal.txt | 92 +++++
> drivers/thermal/Kconfig | 13 +
> drivers/thermal/Makefile | 1 +
> drivers/thermal/thermal_dt.c | 412 +++++++++++++++++++++
> drivers/thermal/thermal_dt.h | 44 +++
> include/linux/thermal.h | 3 +
> 6 files changed, 565 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/thermal/thermal.txt
> create mode 100644 drivers/thermal/thermal_dt.c
> create mode 100644 drivers/thermal/thermal_dt.h
>
> diff --git a/Documentation/devicetree/bindings/thermal/thermal.txt
> b/Documentation/devicetree/bindings/thermal/thermal.txt
> new file mode 100644
> index 0000000..2c25ab2
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/thermal/thermal.txt
> @@ -0,0 +1,92 @@
> +----------------------------------------
> +Thermal Framework Device Tree descriptor
> +----------------------------------------
> +
> +This file describes how to define a thermal structure using device tree.
> +A thermal structure includes thermal zones and their components, such
> +as name, governor, trip points, polling intervals and cooling devices
> +binding descriptors. A binding descriptor may contain information on
> +how to react, with a cooling stepped action or a weight on a fair share.
> +
> +****
> +trip
> +****
> +
> +The trip node is a node to describe a point in the temperature domain
> +in which the system takes an action. This node describes just the point,
> +not the action.
> +
> +A node describing a trip must contain:
> +- temperature: the trip temperature level, in milliCelsius.
> +- hysteresis: a (low) hysteresis value on 'temperature'. This is a relative
> +value, in milliCelsius.
> +- type: the trip type. Here is the type mapping:
> + THERMAL_TRIP_ACTIVE = 0
> + THERMAL_TRIP_PASSIVE = 1
> + THERMAL_TRIP_HOT = 2
> + THERMAL_TRIP_CRITICAL = 3
> +
> +**********
> +bind_param
> +**********
> +
> +The bind_param node is a node to describe how cooling devices get assigned
> +to trip points of the zone. The cooling devices are expected to be loaded
> +in the target system.
> +
> +A node describing a bind_param must contain:
> +- cooling_device: A string with the cooling device name.
> +- weight: The 'influence' of a particular cooling device on this zone.
> + This is on a percentage scale. The sum of all these weights
> + (for a particular zone) cannot exceed 100.
> +- trip_mask: This is a bit mask that gives the binding relation between
> + this thermal zone and cdev, for a particular trip point.
> + If nth bit is set, then the cdev and thermal zone are bound
> + for trip point n.
> +
> +************
> +thermal_zone
> +************
> +
> +The thermal_zone node is the node containing all the required info
> +for describing a thermal zone, including its cdev bindings. The thermal_zone
> +node must contain, apart from its own properties, one node containing
> +trip nodes and one node containing all the zone bind parameters.
> +
> +Required properties:
> +- type: this is a string containing the zone type. Say 'cpu', 'core', 'mem', etc.
> +- mask: Bit string: If 'n'th bit is set, then trip point 'n' is writeable.
> +
> +- passive_delay: number of milliseconds to wait between polls when
> + performing passive cooling.
> +- polling_delay: number of milliseconds to wait between polls when checking
> +
> +- governor: A string containing the default governor for this zone.
> +
> +Below is an example:
> +thermal_zone {
> + type = "CPU";
> + mask = <0x03>; /* trips writability */
> + passive_delay = <250>; /* milliseconds */
> + polling_delay = <1000>; /* milliseconds */
> + governor = "step_wise";
> + trips {
> + alert@100000{
> + temperature = <100000>; /* milliCelsius */
> + hysteresis = <0>; /* milliCelsius */
> + type = <1>;
> + };
> + crit@125000{
> + temperature = <125000>; /* milliCelsius */
> + hysteresis = <0>; /* milliCelsius */
> + type = <3>;
> + };
> + };
> + bind_params {
> + action@0{
> + cooling_device = "thermal-cpufreq";
> + weight = <100>; /* percentage */
> + mask = <0x01>;
> + };
> + };
> +};
> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> index 7fb16bc..753f0dc 100644
> --- a/drivers/thermal/Kconfig
> +++ b/drivers/thermal/Kconfig
> @@ -29,6 +29,19 @@ config THERMAL_HWMON
> Say 'Y' here if you want all thermal sensors to
> have hwmon sysfs interface too.
>
> +config THERMAL_OF
> + bool
> + prompt "APIs to parse thermal data out of device tree"
> + depends on OF
> + default y
> + help
> + This options provides helpers to add the support to
> + read and parse thermal data definitions out of the
> + device tree blob.
> +
> + Say 'Y' here if you need to build thermal infrastructure
> + based on device tree.
> +
> choice
> prompt "Default Thermal governor"
> default THERMAL_DEFAULT_GOV_STEP_WISE
> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> index 24cb894..eedb273 100644
> --- a/drivers/thermal/Makefile
> +++ b/drivers/thermal/Makefile
> @@ -7,6 +7,7 @@ thermal_sys-y += thermal_core.o
>
> # interface to/from other layers providing sensors
> thermal_sys-$(CONFIG_THERMAL_HWMON) += thermal_hwmon.o
> +thermal_sys-$(CONFIG_THERMAL_OF) += thermal_dt.o
>
> # governors
> thermal_sys-$(CONFIG_THERMAL_GOV_FAIR_SHARE) += fair_share.o
> diff --git a/drivers/thermal/thermal_dt.c b/drivers/thermal/thermal_dt.c
> new file mode 100644
> index 0000000..6553582
> --- /dev/null
> +++ b/drivers/thermal/thermal_dt.c
> @@ -0,0 +1,412 @@
> +/*
> + * thermal_dt.c - Generic Thermal Management device tree support.
> + *
> + * Copyright (C) 2013 Texas Instruments
> + * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
> + *
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ~~~~~~~~~~~~
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; version 2 of the License.
> + *
> + * This program is distributed in the hope that it will be useful, but
> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License along
> + * with this program; if not, write to the Free Software Foundation, Inc.,
> + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
> + *
> + *
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ~~~~~~~~~~~~
> + */
> +#include <linux/thermal.h>
> +#include <linux/slab.h>
> +#include <linux/of_device.h>
> +#include <linux/of_platform.h>
> +#include <linux/err.h>
> +#include <linux/export.h>
> +#include <linux/string.h>
> +
> +struct __thermal_bind_params {
> + char cooling_device[THERMAL_NAME_LENGTH];
> +};
> +
> +static
> +int thermal_of_match(struct thermal_zone_device *tz,
> + struct thermal_cooling_device *cdev);
> +
> +static int thermal_of_populate_bind_params(struct device *dev,
> + struct device_node *node,
> + struct __thermal_bind_params *__tbp,
> + struct thermal_bind_params *tbp)
> +{
> + const char *cdev_name;
> + int ret;
> + u32 prop;
> +
> + ret = of_property_read_u32(node, "weight", &prop);
> + if (ret < 0) {
> + dev_err(dev, "missing weight property\n");
> + return ret;
> + }
> + tbp->weight = prop;
> +
> + ret = of_property_read_u32(node, "mask", &prop);
> + if (ret < 0) {
> + dev_err(dev, "missing mask property\n");
> + return ret;
> + }
> + tbp->trip_mask = prop;
> +
> + /* this will allow us to bind with cooling devices */
> + tbp->match = thermal_of_match;
> +
> + ret = of_property_read_string(node, "cooling_device", &cdev_name);
> + if (ret < 0) {
> + dev_err(dev, "missing cooling_device property\n");
> + return ret;
> + }
> + strncpy(__tbp->cooling_device, cdev_name,
> + sizeof(__tbp->cooling_device));
> +
> + return 0;
> +}
> +
> +struct __thermal_trip {
> + unsigned long int temperature;
> + unsigned long int hysteresis;
> + enum thermal_trip_type type;
> +};
> +
> +static
> +int thermal_of_populate_trip(struct device *dev,
> + struct device_node *node,
> + struct __thermal_trip *trip)
> +{
> + int ret;
> + int prop;
> +
> + ret = of_property_read_u32(node, "temperature", &prop);
> + if (ret < 0) {
> + dev_err(dev, "missing temperature property\n");
> + return ret;
> + }
> + trip->temperature = prop;
> +
> + ret = of_property_read_u32(node, "hysteresis", &prop);
> + if (ret < 0) {
> + dev_err(dev, "missing hysteresis property\n");
> + return ret;
> + }
> + trip->hysteresis = prop;
> +
> + ret = of_property_read_u32(node, "type", &prop);
> + if (ret < 0) {
> + dev_err(dev, "missing type property\n");
> + return ret;
> + }
> + trip->type = prop;
> +
> + return 0;
> +}
> +
> +struct __thermal_zone_device {
> + enum thermal_device_mode mode;
> + int passive_delay;
> + int polling_delay;
> + int mask;
> + int ntrips;
> + char type[THERMAL_NAME_LENGTH];
> + struct __thermal_trip *trips;
> + struct __thermal_bind_params *bind_params;
> + struct thermal_bind_params *tbps;
> + struct thermal_zone_params zone_params;
> + int (*get_temp)(void *, unsigned long *);
> + void *devdata;
> +};
> +
> +static
> +struct __thermal_zone_device *thermal_of_build_thermal_zone(struct device
> *dev)
> +{
> + struct device_node *child, *gchild, *node;
> + struct __thermal_zone_device *tz;
> + const char *name;
> + int ret, i;
> + u32 prop;
> +
> + node = dev->of_node;
> + if (!node)
> + return ERR_PTR(-EINVAL);
> +
> + node = of_find_node_by_name(node, "thermal_zone");
> + if (!node) {
> + dev_err(dev, "no thermal_zone node found\n");
> + return ERR_PTR(-EINVAL);
> + }
> +
> + tz = devm_kzalloc(dev, sizeof(*tz), GFP_KERNEL);
> + if (!tz) {
> + dev_err(dev, "not enough memory for thermal of zone\n");
> + return ERR_PTR(-ENOMEM);
> + }
> +
> + ret = of_property_read_u32(node, "passive_delay", &prop);
> + if (ret < 0) {
> + dev_err(dev, "missing passive_delay property\n");
> + return ERR_PTR(ret);
> + }
> + tz->passive_delay = prop;
> +
> + ret = of_property_read_u32(node, "polling_delay", &prop);
> + if (ret < 0) {
> + dev_err(dev, "missing polling_delay property\n");
> + return ERR_PTR(ret);
> + }
> + tz->polling_delay = prop;
> +
> + ret = of_property_read_u32(node, "mask", &prop);
> + if (ret < 0) {
> + dev_err(dev, "missing mask property\n");
> + return ERR_PTR(ret);
> + }
> + tz->mask = prop;
> +
> + ret = of_property_read_string(node, "type", &name);
> + if (ret < 0) {
> + dev_err(dev, "missing type property\n");
> + return ERR_PTR(ret);
> + }
> + strncpy(tz->type, name, sizeof(tz->type));
> +
> + ret = of_property_read_string(node, "governor", &name);
> + if (ret < 0) {
> + dev_err(dev, "missing governor property\n");
> + return ERR_PTR(ret);
> + }
> + strncpy(tz->zone_params.governor_name, name,
> + sizeof(tz->zone_params.governor_name));
> +
> + /* trips */
> + child = of_find_node_by_name(node, "trips");
> + tz->ntrips = of_get_child_count(child);
> + tz->trips = devm_kzalloc(dev, tz->ntrips * sizeof(*tz->trips),
> + GFP_KERNEL);
> + if (!tz->trips)
> + return ERR_PTR(-ENOMEM);
> + i = 0;
> + for_each_child_of_node(child, gchild)
> + thermal_of_populate_trip(dev, gchild, &tz->trips[i++]);
> +
> + /* bind_params */
> + child = of_find_node_by_name(node, "bind_params");
> + tz->zone_params.num_tbps = of_get_child_count(child);
> + tz->bind_params = devm_kzalloc(dev,
> + tz->zone_params.num_tbps *
> + sizeof(*tz->bind_params),
> + GFP_KERNEL);
> + if (!tz->bind_params)
> + return ERR_PTR(-ENOMEM);
> + tz->zone_params.tbp = devm_kzalloc(dev,
> + tz->zone_params.num_tbps *
> + sizeof(*tz->zone_params.tbp),
> + GFP_KERNEL);
> + if (!tz->zone_params.tbp)
> + return ERR_PTR(-ENOMEM);
> + i = 0;
> + for_each_child_of_node(child, gchild) {
> + thermal_of_populate_bind_params(dev, gchild,
> + &tz->bind_params[i],
> + &tz->zone_params.tbp[i]);
> + i++;
> + }
> + tz->mode = THERMAL_DEVICE_ENABLED;
> +
> + return tz;
> +}
> +
> +static
> +int thermal_of_match(struct thermal_zone_device *tz,
> + struct thermal_cooling_device *cdev)
> +{
> + struct __thermal_zone_device *data = tz->devdata;
> + int i;
> +
> + for (i = 0; i < data->zone_params.num_tbps; i++) {
> + if (!strncmp(data->bind_params[i].cooling_device,
> + cdev->type,
> + strlen(data->bind_params[i].cooling_device)) &&
> + (data->zone_params.tbp[i].trip_mask & (1 << i)))
> + return 0;
> + }
> +
> + return -EINVAL;
> +}
> +
> +static
> +int of_thermal_get_temp(struct thermal_zone_device *tz,
> + unsigned long *temp)
> +{
> + struct __thermal_zone_device *data = tz->devdata;
> +
> + return data->get_temp(data->devdata, temp);
> +}
> +
> +static
> +int of_thermal_get_mode(struct thermal_zone_device *tz,
> + enum thermal_device_mode *mode)
> +{
> + struct __thermal_zone_device *data = tz->devdata;
> +
> + *mode = data->mode;
> +
> + return 0;
> +}
> +
> +static
> +int of_thermal_set_mode(struct thermal_zone_device *tz,
> + enum thermal_device_mode mode)
> +{
> + struct __thermal_zone_device *data = tz->devdata;
> +
> + mutex_lock(&tz->lock);
> +
> + if (mode == THERMAL_DEVICE_ENABLED)
> + tz->polling_delay = data->polling_delay;
> + else
> + tz->polling_delay = 0;
> +
> + mutex_unlock(&tz->lock);
> +
> + data->mode = mode;
> + thermal_zone_device_update(tz);
> +
> + return 0;
> +}
> +
> +static
> +int of_thermal_get_trip_type(struct thermal_zone_device *tz, int trip,
> + enum thermal_trip_type *type)
> +{
> + struct __thermal_zone_device *data = tz->devdata;
> +
> + if (trip >= data->ntrips || trip < 0)
> + return -ERANGE;
> +
> + *type = data->trips[trip].type;
> +
> + return 0;
> +}
> +
> +static
> +int of_thermal_get_trip_temp(struct thermal_zone_device *tz, int trip,
> + unsigned long *temp)
> +{
> + struct __thermal_zone_device *data = tz->devdata;
> +
> + if (trip >= data->ntrips || trip < 0)
> + return -ERANGE;
> +
> + *temp = data->trips[trip].temperature;
> +
> + return 0;
> +}
> +
> +static
> +int of_thermal_set_trip_temp(struct thermal_zone_device *tz, int trip,
> + unsigned long temp)
> +{
> + struct __thermal_zone_device *data = tz->devdata;
> +
> + if (trip >= data->ntrips || trip < 0)
> + return -ERANGE;
> +
> + /* thermal fw should take care of data->mask & (1 << trip) */
> + data->trips[trip].temperature = temp;
> +
> + return 0;
> +}
> +
> +static
> +int of_thermal_get_trip_hyst(struct thermal_zone_device *tz, int trip,
> + unsigned long *hyst)
> +{
> + struct __thermal_zone_device *data = tz->devdata;
> +
> + if (trip >= data->ntrips || trip < 0)
> + return -ERANGE;
> +
> + *hyst = data->trips[trip].hysteresis;
> +
> + return 0;
> +}
> +
> +static
> +int of_thermal_set_trip_hyst(struct thermal_zone_device *tz, int trip,
> + unsigned long hyst)
> +{
> + struct __thermal_zone_device *data = tz->devdata;
> +
> + if (trip >= data->ntrips || trip < 0)
> + return -ERANGE;
> +
> + /* thermal fw should take care of data->mask & (1 << trip) */
> + data->trips[trip].hysteresis = hyst;
> +
> + return 0;
> +}
> +
> +static int
> +of_thermal_get_crit_temp(struct thermal_zone_device *tz, unsigned long
> *temp)
> +{
> + struct __thermal_zone_device *data = tz->devdata;
> + int i;
> +
> + for (i = 0; i < data->ntrips; i++)
> + if (data->trips[i].type == THERMAL_TRIP_CRITICAL) {
> + *temp = data->trips[i].temperature;
> + return 0;
> + }
> +
> + return -EINVAL;
> +}
> +
> +static const
> +struct thermal_zone_device_ops of_thermal_ops = {
> + .get_temp = of_thermal_get_temp,
> + .get_mode = of_thermal_get_mode,
> + .set_mode = of_thermal_set_mode,
> + .get_trip_type = of_thermal_get_trip_type,
> + .get_trip_temp = of_thermal_get_trip_temp,
> + .set_trip_temp = of_thermal_set_trip_temp,
> + .get_trip_hyst = of_thermal_get_trip_hyst,
> + .set_trip_hyst = of_thermal_set_trip_hyst,
> + .get_crit_temp = of_thermal_get_crit_temp,
> +};
> +
> +struct thermal_zone_device *thermal_zone_of_device_register(struct device
> *dev,
> + void *data, int (*get_temp)(void *, unsigned long *))
> +{
> + struct __thermal_zone_device *tz;
> + struct thermal_zone_device_ops *ops;
> +
> + tz = thermal_of_build_thermal_zone(dev);
> + if (IS_ERR(tz)) {
> + dev_err(dev, "failed to build thermal zone\n");
> + return NULL;
> + }
> + ops = devm_kzalloc(dev, sizeof(*ops), GFP_KERNEL);
> + if (!ops) {
> + dev_err(dev, "no memory available for thermal ops\n");
> + return NULL;
> + }
> + memcpy(ops, &of_thermal_ops, sizeof(*ops));
> + tz->get_temp = get_temp;
> + tz->devdata = data;
> +
> + return thermal_zone_device_register(tz->type, tz->ntrips, tz->mask, tz,
> + ops, &tz->zone_params,
> + tz->passive_delay,
> + tz->polling_delay);
> +}
> +EXPORT_SYMBOL_GPL(thermal_zone_of_device_register);
> diff --git a/drivers/thermal/thermal_dt.h b/drivers/thermal/thermal_dt.h
> new file mode 100644
> index 0000000..5491d19
> --- /dev/null
> +++ b/drivers/thermal/thermal_dt.h
> @@ -0,0 +1,44 @@
> +/*
> + * thermal_dt.h - Generic Thermal Management device tree support.
> + *
> + * Copyright (C) 2013 Texas Instruments
> + * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
> + *
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ~~~~~~~~~~~~
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; version 2 of the License.
> + *
> + * This program is distributed in the hope that it will be useful, but
> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License along
> + * with this program; if not, write to the Free Software Foundation, Inc.,
> + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
> + *
> + *
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ~~~~~~~~~~~~
> + */
> +#ifndef __THERMAL_DT_H__
> +#define __THERMAL_DT_H__
> +#include <linux/device.h>
> +
> +#ifdef CONFIG_THERMAL_OF
> +struct thermal_bind_params *thermal_of_build_bind_params(struct device
> *dev);
> +struct thermal_zone_device *thermal_of_build_thermal_zone(struct device
> *dev);
> +#else
> +static
> +struct thermal_bind_params *thermal_of_build_bind_params(struct device
> *dev)
> +{
> + return NULL;
> +}
> +
> +static
> +struct thermal_zone_device *thermal_of_build_thermal_zone(struct device
> *dev)
> +{
> + return NULL;
> +}
> +#endif
> +
> +#endif /* __THERMAL_DT_H__ */
> diff --git a/include/linux/thermal.h b/include/linux/thermal.h
> index a386a1c..a62ada0 100644
> --- a/include/linux/thermal.h
> +++ b/include/linux/thermal.h
> @@ -224,6 +224,9 @@ struct thermal_genl_event {
> };
>
> /* Function declarations */
> +struct thermal_zone_device
> +*thermal_zone_of_device_register(struct device *, void *data,
> + int (*get_temp) (void *, unsigned long *));
> struct thermal_zone_device *thermal_zone_device_register(const char *, int,
> int,
> void *, const struct thermal_zone_device_ops *,
> const struct thermal_zone_params *, int, int);
> --
> 1.8.2.1.342.gfa7285d
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [RFC PATCH 2/4] thermal: introduce device tree parser
2013-07-09 16:14 ` R, Durgadoss
@ 2013-07-17 14:51 ` Eduardo Valentin
0 siblings, 0 replies; 33+ messages in thread
From: Eduardo Valentin @ 2013-07-17 14:51 UTC (permalink / raw)
To: R, Durgadoss
Cc: Eduardo Valentin, linux-pm, amit.daniel, Zhang, Rui, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 22950 bytes --]
On 09-07-2013 12:14, R, Durgadoss wrote:
> Hi Eduardo,
>
>> -----Original Message-----
>> From: Eduardo Valentin [mailto:eduardo.valentin@ti.com]
>> Sent: Tuesday, July 09, 2013 7:30 PM
>> To: linux-pm@vger.kernel.org; R, Durgadoss; amit.daniel@samsung.com
>> Cc: Zhang, Rui; Eduardo Valentin; linux-kernel@vger.kernel.org
>> Subject: [RFC PATCH 2/4] thermal: introduce device tree parser
>>
>> In order to be able to build thermal policies
>> based on generic sensors, like I2C device, that
>> can be places in different points on different boards,
>> there is a need to have a way to feed board dependent
>> data into the thermal framework.
>>
>> This patch introduces a thermal data parser for device
>> tree. The parsed data is used to build thermal zones
>> and thermal binding parameters. The output data
>> can then be used to deploy thermal policies.
>>
>> This patch adds also documentation regarding this
>> API and how to define define tree nodes to use
>> this infrastructure.
>>
>> Cc: Zhang Rui <rui.zhang@intel.com>
>> Cc: linux-pm@vger.kernel.org
>> Cc: linux-kernel@vger.kernel.org
>> Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
>> ---
>
> I looked at the Documentation part of this. And it looks good.
>
> At some places you are using ERANGE. Technically, this represents
> 'Math result not representable'. May be should be use EINVAL
> itself ? I would leave it up to you ;)
I will be using EDOM in next version, tks
>
> Thanks,
> Durga
>
>> .../devicetree/bindings/thermal/thermal.txt | 92 +++++
>> drivers/thermal/Kconfig | 13 +
>> drivers/thermal/Makefile | 1 +
>> drivers/thermal/thermal_dt.c | 412 +++++++++++++++++++++
>> drivers/thermal/thermal_dt.h | 44 +++
>> include/linux/thermal.h | 3 +
>> 6 files changed, 565 insertions(+)
>> create mode 100644 Documentation/devicetree/bindings/thermal/thermal.txt
>> create mode 100644 drivers/thermal/thermal_dt.c
>> create mode 100644 drivers/thermal/thermal_dt.h
>>
>> diff --git a/Documentation/devicetree/bindings/thermal/thermal.txt
>> b/Documentation/devicetree/bindings/thermal/thermal.txt
>> new file mode 100644
>> index 0000000..2c25ab2
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/thermal/thermal.txt
>> @@ -0,0 +1,92 @@
>> +----------------------------------------
>> +Thermal Framework Device Tree descriptor
>> +----------------------------------------
>> +
>> +This file describes how to define a thermal structure using device tree.
>> +A thermal structure includes thermal zones and their components, such
>> +as name, governor, trip points, polling intervals and cooling devices
>> +binding descriptors. A binding descriptor may contain information on
>> +how to react, with a cooling stepped action or a weight on a fair share.
>> +
>> +****
>> +trip
>> +****
>> +
>> +The trip node is a node to describe a point in the temperature domain
>> +in which the system takes an action. This node describes just the point,
>> +not the action.
>> +
>> +A node describing a trip must contain:
>> +- temperature: the trip temperature level, in milliCelsius.
>> +- hysteresis: a (low) hysteresis value on 'temperature'. This is a relative
>> +value, in milliCelsius.
>> +- type: the trip type. Here is the type mapping:
>> + THERMAL_TRIP_ACTIVE = 0
>> + THERMAL_TRIP_PASSIVE = 1
>> + THERMAL_TRIP_HOT = 2
>> + THERMAL_TRIP_CRITICAL = 3
>> +
>> +**********
>> +bind_param
>> +**********
>> +
>> +The bind_param node is a node to describe how cooling devices get assigned
>> +to trip points of the zone. The cooling devices are expected to be loaded
>> +in the target system.
>> +
>> +A node describing a bind_param must contain:
>> +- cooling_device: A string with the cooling device name.
>> +- weight: The 'influence' of a particular cooling device on this zone.
>> + This is on a percentage scale. The sum of all these weights
>> + (for a particular zone) cannot exceed 100.
>> +- trip_mask: This is a bit mask that gives the binding relation between
>> + this thermal zone and cdev, for a particular trip point.
>> + If nth bit is set, then the cdev and thermal zone are bound
>> + for trip point n.
>> +
>> +************
>> +thermal_zone
>> +************
>> +
>> +The thermal_zone node is the node containing all the required info
>> +for describing a thermal zone, including its cdev bindings. The thermal_zone
>> +node must contain, apart from its own properties, one node containing
>> +trip nodes and one node containing all the zone bind parameters.
>> +
>> +Required properties:
>> +- type: this is a string containing the zone type. Say 'cpu', 'core', 'mem', etc.
>> +- mask: Bit string: If 'n'th bit is set, then trip point 'n' is writeable.
>> +
>> +- passive_delay: number of milliseconds to wait between polls when
>> + performing passive cooling.
>> +- polling_delay: number of milliseconds to wait between polls when checking
>> +
>> +- governor: A string containing the default governor for this zone.
>> +
>> +Below is an example:
>> +thermal_zone {
>> + type = "CPU";
>> + mask = <0x03>; /* trips writability */
>> + passive_delay = <250>; /* milliseconds */
>> + polling_delay = <1000>; /* milliseconds */
>> + governor = "step_wise";
>> + trips {
>> + alert@100000{
>> + temperature = <100000>; /* milliCelsius */
>> + hysteresis = <0>; /* milliCelsius */
>> + type = <1>;
>> + };
>> + crit@125000{
>> + temperature = <125000>; /* milliCelsius */
>> + hysteresis = <0>; /* milliCelsius */
>> + type = <3>;
>> + };
>> + };
>> + bind_params {
>> + action@0{
>> + cooling_device = "thermal-cpufreq";
>> + weight = <100>; /* percentage */
>> + mask = <0x01>;
>> + };
>> + };
>> +};
>> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
>> index 7fb16bc..753f0dc 100644
>> --- a/drivers/thermal/Kconfig
>> +++ b/drivers/thermal/Kconfig
>> @@ -29,6 +29,19 @@ config THERMAL_HWMON
>> Say 'Y' here if you want all thermal sensors to
>> have hwmon sysfs interface too.
>>
>> +config THERMAL_OF
>> + bool
>> + prompt "APIs to parse thermal data out of device tree"
>> + depends on OF
>> + default y
>> + help
>> + This options provides helpers to add the support to
>> + read and parse thermal data definitions out of the
>> + device tree blob.
>> +
>> + Say 'Y' here if you need to build thermal infrastructure
>> + based on device tree.
>> +
>> choice
>> prompt "Default Thermal governor"
>> default THERMAL_DEFAULT_GOV_STEP_WISE
>> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
>> index 24cb894..eedb273 100644
>> --- a/drivers/thermal/Makefile
>> +++ b/drivers/thermal/Makefile
>> @@ -7,6 +7,7 @@ thermal_sys-y += thermal_core.o
>>
>> # interface to/from other layers providing sensors
>> thermal_sys-$(CONFIG_THERMAL_HWMON) += thermal_hwmon.o
>> +thermal_sys-$(CONFIG_THERMAL_OF) += thermal_dt.o
>>
>> # governors
>> thermal_sys-$(CONFIG_THERMAL_GOV_FAIR_SHARE) += fair_share.o
>> diff --git a/drivers/thermal/thermal_dt.c b/drivers/thermal/thermal_dt.c
>> new file mode 100644
>> index 0000000..6553582
>> --- /dev/null
>> +++ b/drivers/thermal/thermal_dt.c
>> @@ -0,0 +1,412 @@
>> +/*
>> + * thermal_dt.c - Generic Thermal Management device tree support.
>> + *
>> + * Copyright (C) 2013 Texas Instruments
>> + * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
>> + *
>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> ~~~~~~~~~~~~
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License as published by
>> + * the Free Software Foundation; version 2 of the License.
>> + *
>> + * This program is distributed in the hope that it will be useful, but
>> + * WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>> + * General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU General Public License along
>> + * with this program; if not, write to the Free Software Foundation, Inc.,
>> + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
>> + *
>> + *
>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> ~~~~~~~~~~~~
>> + */
>> +#include <linux/thermal.h>
>> +#include <linux/slab.h>
>> +#include <linux/of_device.h>
>> +#include <linux/of_platform.h>
>> +#include <linux/err.h>
>> +#include <linux/export.h>
>> +#include <linux/string.h>
>> +
>> +struct __thermal_bind_params {
>> + char cooling_device[THERMAL_NAME_LENGTH];
>> +};
>> +
>> +static
>> +int thermal_of_match(struct thermal_zone_device *tz,
>> + struct thermal_cooling_device *cdev);
>> +
>> +static int thermal_of_populate_bind_params(struct device *dev,
>> + struct device_node *node,
>> + struct __thermal_bind_params *__tbp,
>> + struct thermal_bind_params *tbp)
>> +{
>> + const char *cdev_name;
>> + int ret;
>> + u32 prop;
>> +
>> + ret = of_property_read_u32(node, "weight", &prop);
>> + if (ret < 0) {
>> + dev_err(dev, "missing weight property\n");
>> + return ret;
>> + }
>> + tbp->weight = prop;
>> +
>> + ret = of_property_read_u32(node, "mask", &prop);
>> + if (ret < 0) {
>> + dev_err(dev, "missing mask property\n");
>> + return ret;
>> + }
>> + tbp->trip_mask = prop;
>> +
>> + /* this will allow us to bind with cooling devices */
>> + tbp->match = thermal_of_match;
>> +
>> + ret = of_property_read_string(node, "cooling_device", &cdev_name);
>> + if (ret < 0) {
>> + dev_err(dev, "missing cooling_device property\n");
>> + return ret;
>> + }
>> + strncpy(__tbp->cooling_device, cdev_name,
>> + sizeof(__tbp->cooling_device));
>> +
>> + return 0;
>> +}
>> +
>> +struct __thermal_trip {
>> + unsigned long int temperature;
>> + unsigned long int hysteresis;
>> + enum thermal_trip_type type;
>> +};
>> +
>> +static
>> +int thermal_of_populate_trip(struct device *dev,
>> + struct device_node *node,
>> + struct __thermal_trip *trip)
>> +{
>> + int ret;
>> + int prop;
>> +
>> + ret = of_property_read_u32(node, "temperature", &prop);
>> + if (ret < 0) {
>> + dev_err(dev, "missing temperature property\n");
>> + return ret;
>> + }
>> + trip->temperature = prop;
>> +
>> + ret = of_property_read_u32(node, "hysteresis", &prop);
>> + if (ret < 0) {
>> + dev_err(dev, "missing hysteresis property\n");
>> + return ret;
>> + }
>> + trip->hysteresis = prop;
>> +
>> + ret = of_property_read_u32(node, "type", &prop);
>> + if (ret < 0) {
>> + dev_err(dev, "missing type property\n");
>> + return ret;
>> + }
>> + trip->type = prop;
>> +
>> + return 0;
>> +}
>> +
>> +struct __thermal_zone_device {
>> + enum thermal_device_mode mode;
>> + int passive_delay;
>> + int polling_delay;
>> + int mask;
>> + int ntrips;
>> + char type[THERMAL_NAME_LENGTH];
>> + struct __thermal_trip *trips;
>> + struct __thermal_bind_params *bind_params;
>> + struct thermal_bind_params *tbps;
>> + struct thermal_zone_params zone_params;
>> + int (*get_temp)(void *, unsigned long *);
>> + void *devdata;
>> +};
>> +
>> +static
>> +struct __thermal_zone_device *thermal_of_build_thermal_zone(struct device
>> *dev)
>> +{
>> + struct device_node *child, *gchild, *node;
>> + struct __thermal_zone_device *tz;
>> + const char *name;
>> + int ret, i;
>> + u32 prop;
>> +
>> + node = dev->of_node;
>> + if (!node)
>> + return ERR_PTR(-EINVAL);
>> +
>> + node = of_find_node_by_name(node, "thermal_zone");
>> + if (!node) {
>> + dev_err(dev, "no thermal_zone node found\n");
>> + return ERR_PTR(-EINVAL);
>> + }
>> +
>> + tz = devm_kzalloc(dev, sizeof(*tz), GFP_KERNEL);
>> + if (!tz) {
>> + dev_err(dev, "not enough memory for thermal of zone\n");
>> + return ERR_PTR(-ENOMEM);
>> + }
>> +
>> + ret = of_property_read_u32(node, "passive_delay", &prop);
>> + if (ret < 0) {
>> + dev_err(dev, "missing passive_delay property\n");
>> + return ERR_PTR(ret);
>> + }
>> + tz->passive_delay = prop;
>> +
>> + ret = of_property_read_u32(node, "polling_delay", &prop);
>> + if (ret < 0) {
>> + dev_err(dev, "missing polling_delay property\n");
>> + return ERR_PTR(ret);
>> + }
>> + tz->polling_delay = prop;
>> +
>> + ret = of_property_read_u32(node, "mask", &prop);
>> + if (ret < 0) {
>> + dev_err(dev, "missing mask property\n");
>> + return ERR_PTR(ret);
>> + }
>> + tz->mask = prop;
>> +
>> + ret = of_property_read_string(node, "type", &name);
>> + if (ret < 0) {
>> + dev_err(dev, "missing type property\n");
>> + return ERR_PTR(ret);
>> + }
>> + strncpy(tz->type, name, sizeof(tz->type));
>> +
>> + ret = of_property_read_string(node, "governor", &name);
>> + if (ret < 0) {
>> + dev_err(dev, "missing governor property\n");
>> + return ERR_PTR(ret);
>> + }
>> + strncpy(tz->zone_params.governor_name, name,
>> + sizeof(tz->zone_params.governor_name));
>> +
>> + /* trips */
>> + child = of_find_node_by_name(node, "trips");
>> + tz->ntrips = of_get_child_count(child);
>> + tz->trips = devm_kzalloc(dev, tz->ntrips * sizeof(*tz->trips),
>> + GFP_KERNEL);
>> + if (!tz->trips)
>> + return ERR_PTR(-ENOMEM);
>> + i = 0;
>> + for_each_child_of_node(child, gchild)
>> + thermal_of_populate_trip(dev, gchild, &tz->trips[i++]);
>> +
>> + /* bind_params */
>> + child = of_find_node_by_name(node, "bind_params");
>> + tz->zone_params.num_tbps = of_get_child_count(child);
>> + tz->bind_params = devm_kzalloc(dev,
>> + tz->zone_params.num_tbps *
>> + sizeof(*tz->bind_params),
>> + GFP_KERNEL);
>> + if (!tz->bind_params)
>> + return ERR_PTR(-ENOMEM);
>> + tz->zone_params.tbp = devm_kzalloc(dev,
>> + tz->zone_params.num_tbps *
>> + sizeof(*tz->zone_params.tbp),
>> + GFP_KERNEL);
>> + if (!tz->zone_params.tbp)
>> + return ERR_PTR(-ENOMEM);
>> + i = 0;
>> + for_each_child_of_node(child, gchild) {
>> + thermal_of_populate_bind_params(dev, gchild,
>> + &tz->bind_params[i],
>> + &tz->zone_params.tbp[i]);
>> + i++;
>> + }
>> + tz->mode = THERMAL_DEVICE_ENABLED;
>> +
>> + return tz;
>> +}
>> +
>> +static
>> +int thermal_of_match(struct thermal_zone_device *tz,
>> + struct thermal_cooling_device *cdev)
>> +{
>> + struct __thermal_zone_device *data = tz->devdata;
>> + int i;
>> +
>> + for (i = 0; i < data->zone_params.num_tbps; i++) {
>> + if (!strncmp(data->bind_params[i].cooling_device,
>> + cdev->type,
>> + strlen(data->bind_params[i].cooling_device)) &&
>> + (data->zone_params.tbp[i].trip_mask & (1 << i)))
>> + return 0;
>> + }
>> +
>> + return -EINVAL;
>> +}
>> +
>> +static
>> +int of_thermal_get_temp(struct thermal_zone_device *tz,
>> + unsigned long *temp)
>> +{
>> + struct __thermal_zone_device *data = tz->devdata;
>> +
>> + return data->get_temp(data->devdata, temp);
>> +}
>> +
>> +static
>> +int of_thermal_get_mode(struct thermal_zone_device *tz,
>> + enum thermal_device_mode *mode)
>> +{
>> + struct __thermal_zone_device *data = tz->devdata;
>> +
>> + *mode = data->mode;
>> +
>> + return 0;
>> +}
>> +
>> +static
>> +int of_thermal_set_mode(struct thermal_zone_device *tz,
>> + enum thermal_device_mode mode)
>> +{
>> + struct __thermal_zone_device *data = tz->devdata;
>> +
>> + mutex_lock(&tz->lock);
>> +
>> + if (mode == THERMAL_DEVICE_ENABLED)
>> + tz->polling_delay = data->polling_delay;
>> + else
>> + tz->polling_delay = 0;
>> +
>> + mutex_unlock(&tz->lock);
>> +
>> + data->mode = mode;
>> + thermal_zone_device_update(tz);
>> +
>> + return 0;
>> +}
>> +
>> +static
>> +int of_thermal_get_trip_type(struct thermal_zone_device *tz, int trip,
>> + enum thermal_trip_type *type)
>> +{
>> + struct __thermal_zone_device *data = tz->devdata;
>> +
>> + if (trip >= data->ntrips || trip < 0)
>> + return -ERANGE;
>> +
>> + *type = data->trips[trip].type;
>> +
>> + return 0;
>> +}
>> +
>> +static
>> +int of_thermal_get_trip_temp(struct thermal_zone_device *tz, int trip,
>> + unsigned long *temp)
>> +{
>> + struct __thermal_zone_device *data = tz->devdata;
>> +
>> + if (trip >= data->ntrips || trip < 0)
>> + return -ERANGE;
>> +
>> + *temp = data->trips[trip].temperature;
>> +
>> + return 0;
>> +}
>> +
>> +static
>> +int of_thermal_set_trip_temp(struct thermal_zone_device *tz, int trip,
>> + unsigned long temp)
>> +{
>> + struct __thermal_zone_device *data = tz->devdata;
>> +
>> + if (trip >= data->ntrips || trip < 0)
>> + return -ERANGE;
>> +
>> + /* thermal fw should take care of data->mask & (1 << trip) */
>> + data->trips[trip].temperature = temp;
>> +
>> + return 0;
>> +}
>> +
>> +static
>> +int of_thermal_get_trip_hyst(struct thermal_zone_device *tz, int trip,
>> + unsigned long *hyst)
>> +{
>> + struct __thermal_zone_device *data = tz->devdata;
>> +
>> + if (trip >= data->ntrips || trip < 0)
>> + return -ERANGE;
>> +
>> + *hyst = data->trips[trip].hysteresis;
>> +
>> + return 0;
>> +}
>> +
>> +static
>> +int of_thermal_set_trip_hyst(struct thermal_zone_device *tz, int trip,
>> + unsigned long hyst)
>> +{
>> + struct __thermal_zone_device *data = tz->devdata;
>> +
>> + if (trip >= data->ntrips || trip < 0)
>> + return -ERANGE;
>> +
>> + /* thermal fw should take care of data->mask & (1 << trip) */
>> + data->trips[trip].hysteresis = hyst;
>> +
>> + return 0;
>> +}
>> +
>> +static int
>> +of_thermal_get_crit_temp(struct thermal_zone_device *tz, unsigned long
>> *temp)
>> +{
>> + struct __thermal_zone_device *data = tz->devdata;
>> + int i;
>> +
>> + for (i = 0; i < data->ntrips; i++)
>> + if (data->trips[i].type == THERMAL_TRIP_CRITICAL) {
>> + *temp = data->trips[i].temperature;
>> + return 0;
>> + }
>> +
>> + return -EINVAL;
>> +}
>> +
>> +static const
>> +struct thermal_zone_device_ops of_thermal_ops = {
>> + .get_temp = of_thermal_get_temp,
>> + .get_mode = of_thermal_get_mode,
>> + .set_mode = of_thermal_set_mode,
>> + .get_trip_type = of_thermal_get_trip_type,
>> + .get_trip_temp = of_thermal_get_trip_temp,
>> + .set_trip_temp = of_thermal_set_trip_temp,
>> + .get_trip_hyst = of_thermal_get_trip_hyst,
>> + .set_trip_hyst = of_thermal_set_trip_hyst,
>> + .get_crit_temp = of_thermal_get_crit_temp,
>> +};
>> +
>> +struct thermal_zone_device *thermal_zone_of_device_register(struct device
>> *dev,
>> + void *data, int (*get_temp)(void *, unsigned long *))
>> +{
>> + struct __thermal_zone_device *tz;
>> + struct thermal_zone_device_ops *ops;
>> +
>> + tz = thermal_of_build_thermal_zone(dev);
>> + if (IS_ERR(tz)) {
>> + dev_err(dev, "failed to build thermal zone\n");
>> + return NULL;
>> + }
>> + ops = devm_kzalloc(dev, sizeof(*ops), GFP_KERNEL);
>> + if (!ops) {
>> + dev_err(dev, "no memory available for thermal ops\n");
>> + return NULL;
>> + }
>> + memcpy(ops, &of_thermal_ops, sizeof(*ops));
>> + tz->get_temp = get_temp;
>> + tz->devdata = data;
>> +
>> + return thermal_zone_device_register(tz->type, tz->ntrips, tz->mask, tz,
>> + ops, &tz->zone_params,
>> + tz->passive_delay,
>> + tz->polling_delay);
>> +}
>> +EXPORT_SYMBOL_GPL(thermal_zone_of_device_register);
>> diff --git a/drivers/thermal/thermal_dt.h b/drivers/thermal/thermal_dt.h
>> new file mode 100644
>> index 0000000..5491d19
>> --- /dev/null
>> +++ b/drivers/thermal/thermal_dt.h
>> @@ -0,0 +1,44 @@
>> +/*
>> + * thermal_dt.h - Generic Thermal Management device tree support.
>> + *
>> + * Copyright (C) 2013 Texas Instruments
>> + * Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.com>
>> + *
>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> ~~~~~~~~~~~~
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License as published by
>> + * the Free Software Foundation; version 2 of the License.
>> + *
>> + * This program is distributed in the hope that it will be useful, but
>> + * WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>> + * General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU General Public License along
>> + * with this program; if not, write to the Free Software Foundation, Inc.,
>> + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
>> + *
>> + *
>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> ~~~~~~~~~~~~
>> + */
>> +#ifndef __THERMAL_DT_H__
>> +#define __THERMAL_DT_H__
>> +#include <linux/device.h>
>> +
>> +#ifdef CONFIG_THERMAL_OF
>> +struct thermal_bind_params *thermal_of_build_bind_params(struct device
>> *dev);
>> +struct thermal_zone_device *thermal_of_build_thermal_zone(struct device
>> *dev);
>> +#else
>> +static
>> +struct thermal_bind_params *thermal_of_build_bind_params(struct device
>> *dev)
>> +{
>> + return NULL;
>> +}
>> +
>> +static
>> +struct thermal_zone_device *thermal_of_build_thermal_zone(struct device
>> *dev)
>> +{
>> + return NULL;
>> +}
>> +#endif
>> +
>> +#endif /* __THERMAL_DT_H__ */
>> diff --git a/include/linux/thermal.h b/include/linux/thermal.h
>> index a386a1c..a62ada0 100644
>> --- a/include/linux/thermal.h
>> +++ b/include/linux/thermal.h
>> @@ -224,6 +224,9 @@ struct thermal_genl_event {
>> };
>>
>> /* Function declarations */
>> +struct thermal_zone_device
>> +*thermal_zone_of_device_register(struct device *, void *data,
>> + int (*get_temp) (void *, unsigned long *));
>> struct thermal_zone_device *thermal_zone_device_register(const char *, int,
>> int,
>> void *, const struct thermal_zone_device_ops *,
>> const struct thermal_zone_params *, int, int);
>> --
>> 1.8.2.1.342.gfa7285d
>
>
>
--
You have got to be excited about what you are doing. (L. Lamport)
Eduardo Valentin
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 295 bytes --]
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [RFC PATCH 2/4] thermal: introduce device tree parser
2013-07-09 14:00 ` Eduardo Valentin
(?)
(?)
@ 2013-07-10 6:48 ` Wei Ni
2013-07-10 15:16 ` Stephen Warren
2013-07-15 11:54 ` Eduardo Valentin
-1 siblings, 2 replies; 33+ messages in thread
From: Wei Ni @ 2013-07-10 6:48 UTC (permalink / raw)
To: Eduardo Valentin
Cc: linux-pm, durgadoss.r, amit.daniel, rui.zhang, linux-kernel
On 07/09/2013 10:00 PM, Eduardo Valentin wrote:
> In order to be able to build thermal policies
> based on generic sensors, like I2C device, that
> can be places in different points on different boards,
> there is a need to have a way to feed board dependent
> data into the thermal framework.
>
> This patch introduces a thermal data parser for device
> tree. The parsed data is used to build thermal zones
> and thermal binding parameters. The output data
> can then be used to deploy thermal policies.
>
> This patch adds also documentation regarding this
> API and how to define define tree nodes to use
> this infrastructure.
It looks good, with this infrastructure, we can add generic sensor
driver into the thermal fw easily.
> +
> +Below is an example:
> +thermal_zone {
> + type = "CPU";
> + mask = <0x03>; /* trips writability */
> + passive_delay = <250>; /* milliseconds */
> + polling_delay = <1000>; /* milliseconds */
> + governor = "step_wise";
> + trips {
> + alert@100000{
> + temperature = <100000>; /* milliCelsius */
> + hysteresis = <0>; /* milliCelsius */
> + type = <1>;
how about to use the trip type name directly, such as named as
"passive-trip;", I think it's more readable. for example:
trip0 {
....
passive-trip;
}
trip1 {
....
active-trip;
}
> + };
> + crit@125000{
> + temperature = <125000>; /* milliCelsius */
> + hysteresis = <0>; /* milliCelsius */
> + type = <3>;
> + };
> + };
> + bind_params {
> + action@0{
> + cooling_device = "thermal-cpufreq";
> + weight = <100>; /* percentage */
> + mask = <0x01>;
> + };
> + };
> +};
as we know, thermal_zone_bind_cooling_device() will set the upper/lower
in the thermal_instance. In the default .bind function, it just set to
THERMAL_NO_LIMIT, but for some platform, it need to set these
upper/lower values for different cooling device and trips, how to pass
these values in DT? how about to set:
action@0 {
...
mask = <0x03>; //or you can remove this property;
trip0 = <&alert 1 2>; //1 is lower value, 2 is upper value;
trip1 = <&crit 3 4>;
}
Thanks.
Wei.
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [RFC PATCH 2/4] thermal: introduce device tree parser
2013-07-10 6:48 ` Wei Ni
@ 2013-07-10 15:16 ` Stephen Warren
2013-07-15 14:30 ` Eduardo Valentin
2013-07-15 11:54 ` Eduardo Valentin
1 sibling, 1 reply; 33+ messages in thread
From: Stephen Warren @ 2013-07-10 15:16 UTC (permalink / raw)
To: Wei Ni
Cc: Eduardo Valentin, linux-pm, durgadoss.r, amit.daniel, rui.zhang,
linux-kernel
On 07/10/2013 12:48 AM, Wei Ni wrote:
> On 07/09/2013 10:00 PM, Eduardo Valentin wrote:
>> In order to be able to build thermal policies
>> based on generic sensors, like I2C device, that
>> can be places in different points on different boards,
>> there is a need to have a way to feed board dependent
>> data into the thermal framework.
>>
>> This patch introduces a thermal data parser for device
>> tree. The parsed data is used to build thermal zones
>> and thermal binding parameters. The output data
>> can then be used to deploy thermal policies.
>>
>> This patch adds also documentation regarding this
>> API and how to define define tree nodes to use
>> this infrastructure.
>
> It looks good, with this infrastructure, we can add generic sensor
> driver into the thermal fw easily.
>
>
>> +
>> +Below is an example:
>> +thermal_zone {
>> + type = "CPU";
>> + mask = <0x03>; /* trips writability */
>> + passive_delay = <250>; /* milliseconds */
>> + polling_delay = <1000>; /* milliseconds */
>> + governor = "step_wise";
>> + trips {
>> + alert@100000{
>> + temperature = <100000>; /* milliCelsius */
>> + hysteresis = <0>; /* milliCelsius */
>> + type = <1>;
>
> how about to use the trip type name directly, such as named as
> "passive-trip;", I think it's more readable. for example:
> trip0 {
> ....
> passive-trip;
> }
> trip1 {
> ....
> active-trip;
> }
You can always use the C pre-processor in DT now to define named constants:
include/dt-bindings/..../....h
#define THERMAL_PASSIVE_TRIP 0
#define THERMAL_ACTIVE_TRIP 1
*.dts:
type = <THERMAL_PASSIVE_TRIP>;
Having a single 'property = value;' rather than n different Boolean
property names seems better, irrespective of whether value is an integer
or string; parsing and error-checking will be simpler.
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [RFC PATCH 2/4] thermal: introduce device tree parser
2013-07-10 15:16 ` Stephen Warren
@ 2013-07-15 14:30 ` Eduardo Valentin
0 siblings, 0 replies; 33+ messages in thread
From: Eduardo Valentin @ 2013-07-15 14:30 UTC (permalink / raw)
To: Stephen Warren
Cc: Wei Ni, Eduardo Valentin, linux-pm, durgadoss.r, amit.daniel,
rui.zhang, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 2357 bytes --]
On 10-07-2013 11:16, Stephen Warren wrote:
> On 07/10/2013 12:48 AM, Wei Ni wrote:
>> On 07/09/2013 10:00 PM, Eduardo Valentin wrote:
>>> In order to be able to build thermal policies
>>> based on generic sensors, like I2C device, that
>>> can be places in different points on different boards,
>>> there is a need to have a way to feed board dependent
>>> data into the thermal framework.
>>>
>>> This patch introduces a thermal data parser for device
>>> tree. The parsed data is used to build thermal zones
>>> and thermal binding parameters. The output data
>>> can then be used to deploy thermal policies.
>>>
>>> This patch adds also documentation regarding this
>>> API and how to define define tree nodes to use
>>> this infrastructure.
>>
>> It looks good, with this infrastructure, we can add generic sensor
>> driver into the thermal fw easily.
>>
>>
>>> +
>>> +Below is an example:
>>> +thermal_zone {
>>> + type = "CPU";
>>> + mask = <0x03>; /* trips writability */
>>> + passive_delay = <250>; /* milliseconds */
>>> + polling_delay = <1000>; /* milliseconds */
>>> + governor = "step_wise";
>>> + trips {
>>> + alert@100000{
>>> + temperature = <100000>; /* milliCelsius */
>>> + hysteresis = <0>; /* milliCelsius */
>>> + type = <1>;
>>
>> how about to use the trip type name directly, such as named as
>> "passive-trip;", I think it's more readable. for example:
>> trip0 {
>> ....
>> passive-trip;
>> }
>> trip1 {
>> ....
>> active-trip;
>> }
>
> You can always use the C pre-processor in DT now to define named constants:
>
> include/dt-bindings/..../....h
>
> #define THERMAL_PASSIVE_TRIP 0
> #define THERMAL_ACTIVE_TRIP 1
>
> *.dts:
>
> type = <THERMAL_PASSIVE_TRIP>;
>
> Having a single 'property = value;' rather than n different Boolean
> property names seems better, irrespective of whether value is an integer
> or string; parsing and error-checking will be simpler.
agreed here. I will amend with the above suggestions. makes the dt file
much more readable. thanks Stephen and Wei.
>
>
--
You have got to be excited about what you are doing. (L. Lamport)
Eduardo Valentin
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 295 bytes --]
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [RFC PATCH 2/4] thermal: introduce device tree parser
2013-07-10 6:48 ` Wei Ni
2013-07-10 15:16 ` Stephen Warren
@ 2013-07-15 11:54 ` Eduardo Valentin
2013-07-15 17:03 ` R, Durgadoss
1 sibling, 1 reply; 33+ messages in thread
From: Eduardo Valentin @ 2013-07-15 11:54 UTC (permalink / raw)
To: Wei Ni
Cc: Eduardo Valentin, linux-pm, durgadoss.r, amit.daniel, rui.zhang,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 3656 bytes --]
On 10-07-2013 02:48, Wei Ni wrote:
> On 07/09/2013 10:00 PM, Eduardo Valentin wrote:
>> In order to be able to build thermal policies
>> based on generic sensors, like I2C device, that
>> can be places in different points on different boards,
>> there is a need to have a way to feed board dependent
>> data into the thermal framework.
>>
>> This patch introduces a thermal data parser for device
>> tree. The parsed data is used to build thermal zones
>> and thermal binding parameters. The output data
>> can then be used to deploy thermal policies.
>>
>> This patch adds also documentation regarding this
>> API and how to define define tree nodes to use
>> this infrastructure.
>
> It looks good, with this infrastructure, we can add generic sensor
> driver into the thermal fw easily.
>
>
>> +
>> +Below is an example:
>> +thermal_zone {
>> + type = "CPU";
>> + mask = <0x03>; /* trips writability */
>> + passive_delay = <250>; /* milliseconds */
>> + polling_delay = <1000>; /* milliseconds */
>> + governor = "step_wise";
>> + trips {
>> + alert@100000{
>> + temperature = <100000>; /* milliCelsius */
>> + hysteresis = <0>; /* milliCelsius */
>> + type = <1>;
>
> how about to use the trip type name directly, such as named as
> "passive-trip;", I think it's more readable. for example:
> trip0 {
> ....
> passive-trip;
> }
> trip1 {
> ....
> active-trip;
> }
>
>> + };
>> + crit@125000{
>> + temperature = <125000>; /* milliCelsius */
>> + hysteresis = <0>; /* milliCelsius */
>> + type = <3>;
>> + };
>> + };
>> + bind_params {
>> + action@0{
>> + cooling_device = "thermal-cpufreq";
>> + weight = <100>; /* percentage */
>> + mask = <0x01>;
>> + };
>> + };
>> +};
>
> as we know, thermal_zone_bind_cooling_device() will set the upper/lower
> in the thermal_instance. In the default .bind function, it just set to
> THERMAL_NO_LIMIT, but for some platform, it need to set these
> upper/lower values for different cooling device and trips, how to pass
> these values in DT? how about to set:
> action@0 {
> ...
> mask = <0x03>; //or you can remove this property;
Well, this has been added accordingly to current API needs.
> trip0 = <&alert 1 2>; //1 is lower value, 2 is upper value;
> trip1 = <&crit 3 4>;
I suppose the first item in you 3-tuple is the trip point.
> }
Yeah, I also noticed that I was missing the upper and lower limits. But
unfortunately this is a limitation on the thermal FW API too!
If one passes a bind params, the structure which represents platform
info, then it won't be able to pass the upper and lower limits. But by
passing a .bind callback, then you have the opportunity to match it
using these two values.
I believe we would need to change the data structures and the API to
support upper and lower limits via platform representation. We could
simply use the .bind callback of the dt thermal zone, but I believe that
would abusing the API, assuming that .match is for platform binding.
Durga, what do you think?
>
>
> Thanks.
> Wei.
>
>
>
--
You have got to be excited about what you are doing. (L. Lamport)
Eduardo Valentin
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 295 bytes --]
^ permalink raw reply [flat|nested] 33+ messages in thread* RE: [RFC PATCH 2/4] thermal: introduce device tree parser
2013-07-15 11:54 ` Eduardo Valentin
@ 2013-07-15 17:03 ` R, Durgadoss
2013-07-15 17:16 ` Eduardo Valentin
0 siblings, 1 reply; 33+ messages in thread
From: R, Durgadoss @ 2013-07-15 17:03 UTC (permalink / raw)
To: Eduardo Valentin, Wei Ni; +Cc: linux-pm, amit.daniel, Zhang, Rui, linux-kernel
> -----Original Message-----
> From: linux-pm-owner@vger.kernel.org [mailto:linux-pm-
> owner@vger.kernel.org] On Behalf Of Eduardo Valentin
> Sent: Monday, July 15, 2013 5:25 PM
> To: Wei Ni
> Cc: Eduardo Valentin; linux-pm@vger.kernel.org; R, Durgadoss;
> amit.daniel@samsung.com; Zhang, Rui; linux-kernel@vger.kernel.org
> Subject: Re: [RFC PATCH 2/4] thermal: introduce device tree parser
>
> On 10-07-2013 02:48, Wei Ni wrote:
> > On 07/09/2013 10:00 PM, Eduardo Valentin wrote:
> >> In order to be able to build thermal policies
> >> based on generic sensors, like I2C device, that
> >> can be places in different points on different boards,
> >> there is a need to have a way to feed board dependent
> >> data into the thermal framework.
> >>
> >> This patch introduces a thermal data parser for device
> >> tree. The parsed data is used to build thermal zones
> >> and thermal binding parameters. The output data
> >> can then be used to deploy thermal policies.
> >>
> >> This patch adds also documentation regarding this
> >> API and how to define define tree nodes to use
> >> this infrastructure.
> >
> > It looks good, with this infrastructure, we can add generic sensor
> > driver into the thermal fw easily.
> >
> >
> >> +
> >> +Below is an example:
> >> +thermal_zone {
> >> + type = "CPU";
> >> + mask = <0x03>; /* trips writability */
> >> + passive_delay = <250>; /* milliseconds */
> >> + polling_delay = <1000>; /* milliseconds */
> >> + governor = "step_wise";
> >> + trips {
> >> + alert@100000{
> >> + temperature = <100000>; /* milliCelsius */
> >> + hysteresis = <0>; /* milliCelsius */
> >> + type = <1>;
> >
> > how about to use the trip type name directly, such as named as
> > "passive-trip;", I think it's more readable. for example:
> > trip0 {
> > ....
> > passive-trip;
> > }
> > trip1 {
> > ....
> > active-trip;
> > }
> >
> >> + };
> >> + crit@125000{
> >> + temperature = <125000>; /* milliCelsius */
> >> + hysteresis = <0>; /* milliCelsius */
> >> + type = <3>;
> >> + };
> >> + };
> >> + bind_params {
> >> + action@0{
> >> + cooling_device = "thermal-cpufreq";
> >> + weight = <100>; /* percentage */
> >> + mask = <0x01>;
> >> + };
> >> + };
> >> +};
> >
> > as we know, thermal_zone_bind_cooling_device() will set the upper/lower
> > in the thermal_instance. In the default .bind function, it just set to
> > THERMAL_NO_LIMIT, but for some platform, it need to set these
> > upper/lower values for different cooling device and trips, how to pass
> > these values in DT? how about to set:
> > action@0 {
> > ...
> > mask = <0x03>; //or you can remove this property;
>
> Well, this has been added accordingly to current API needs.
>
> > trip0 = <&alert 1 2>; //1 is lower value, 2 is upper value;
> > trip1 = <&crit 3 4>;
>
> I suppose the first item in you 3-tuple is the trip point.
>
> > }
>
> Yeah, I also noticed that I was missing the upper and lower limits. But
> unfortunately this is a limitation on the thermal FW API too!
>
> If one passes a bind params, the structure which represents platform
> info, then it won't be able to pass the upper and lower limits. But by
> passing a .bind callback, then you have the opportunity to match it
> using these two values.
>
> I believe we would need to change the data structures and the API to
> support upper and lower limits via platform representation. We could
> simply use the .bind callback of the dt thermal zone, but I believe that
> would abusing the API, assuming that .match is for platform binding.
> Durga, what do you think?
okay, I see.. Two approaches I could think of:
1. Introduce two arrays (size = number of trips in the tz) named
upper/lower_limits[size] in the 'thermal_bind_params' structure.
This way we don't need any API change. We can slightly change the
implementation inside '__bind' function in thermal_core.c to get this
working.
2. Pass 3 more parameters in the .match function:
.match(tz, cdev, trip, &lower, &upper). The platform layer
then determines whether there is a match; and if so,
provides sane values for lower and upper variables.
At this point of time, I think I prefer method 1 ;)
Let me know your thoughts.
Thanks,
Durga
>
>
> >
> >
> > Thanks.
> > Wei.
> >
> >
> >
>
>
> --
> You have got to be excited about what you are doing. (L. Lamport)
>
> Eduardo Valentin
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [RFC PATCH 2/4] thermal: introduce device tree parser
2013-07-15 17:03 ` R, Durgadoss
@ 2013-07-15 17:16 ` Eduardo Valentin
0 siblings, 0 replies; 33+ messages in thread
From: Eduardo Valentin @ 2013-07-15 17:16 UTC (permalink / raw)
To: R, Durgadoss
Cc: Eduardo Valentin, Wei Ni, linux-pm, amit.daniel, Zhang, Rui,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 5224 bytes --]
On 15-07-2013 13:03, R, Durgadoss wrote:
>> -----Original Message-----
>> From: linux-pm-owner@vger.kernel.org [mailto:linux-pm-
>> owner@vger.kernel.org] On Behalf Of Eduardo Valentin
>> Sent: Monday, July 15, 2013 5:25 PM
>> To: Wei Ni
>> Cc: Eduardo Valentin; linux-pm@vger.kernel.org; R, Durgadoss;
>> amit.daniel@samsung.com; Zhang, Rui; linux-kernel@vger.kernel.org
>> Subject: Re: [RFC PATCH 2/4] thermal: introduce device tree parser
>>
>> On 10-07-2013 02:48, Wei Ni wrote:
>>> On 07/09/2013 10:00 PM, Eduardo Valentin wrote:
>>>> In order to be able to build thermal policies
>>>> based on generic sensors, like I2C device, that
>>>> can be places in different points on different boards,
>>>> there is a need to have a way to feed board dependent
>>>> data into the thermal framework.
>>>>
>>>> This patch introduces a thermal data parser for device
>>>> tree. The parsed data is used to build thermal zones
>>>> and thermal binding parameters. The output data
>>>> can then be used to deploy thermal policies.
>>>>
>>>> This patch adds also documentation regarding this
>>>> API and how to define define tree nodes to use
>>>> this infrastructure.
>>>
>>> It looks good, with this infrastructure, we can add generic sensor
>>> driver into the thermal fw easily.
>>>
>>>
>>>> +
>>>> +Below is an example:
>>>> +thermal_zone {
>>>> + type = "CPU";
>>>> + mask = <0x03>; /* trips writability */
>>>> + passive_delay = <250>; /* milliseconds */
>>>> + polling_delay = <1000>; /* milliseconds */
>>>> + governor = "step_wise";
>>>> + trips {
>>>> + alert@100000{
>>>> + temperature = <100000>; /* milliCelsius */
>>>> + hysteresis = <0>; /* milliCelsius */
>>>> + type = <1>;
>>>
>>> how about to use the trip type name directly, such as named as
>>> "passive-trip;", I think it's more readable. for example:
>>> trip0 {
>>> ....
>>> passive-trip;
>>> }
>>> trip1 {
>>> ....
>>> active-trip;
>>> }
>>>
>>>> + };
>>>> + crit@125000{
>>>> + temperature = <125000>; /* milliCelsius */
>>>> + hysteresis = <0>; /* milliCelsius */
>>>> + type = <3>;
>>>> + };
>>>> + };
>>>> + bind_params {
>>>> + action@0{
>>>> + cooling_device = "thermal-cpufreq";
>>>> + weight = <100>; /* percentage */
>>>> + mask = <0x01>;
>>>> + };
>>>> + };
>>>> +};
>>>
>>> as we know, thermal_zone_bind_cooling_device() will set the upper/lower
>>> in the thermal_instance. In the default .bind function, it just set to
>>> THERMAL_NO_LIMIT, but for some platform, it need to set these
>>> upper/lower values for different cooling device and trips, how to pass
>>> these values in DT? how about to set:
>>> action@0 {
>>> ...
>>> mask = <0x03>; //or you can remove this property;
>>
>> Well, this has been added accordingly to current API needs.
>>
>>> trip0 = <&alert 1 2>; //1 is lower value, 2 is upper value;
>>> trip1 = <&crit 3 4>;
>>
>> I suppose the first item in you 3-tuple is the trip point.
>>
>>> }
>>
>> Yeah, I also noticed that I was missing the upper and lower limits. But
>> unfortunately this is a limitation on the thermal FW API too!
>>
>> If one passes a bind params, the structure which represents platform
>> info, then it won't be able to pass the upper and lower limits. But by
>> passing a .bind callback, then you have the opportunity to match it
>> using these two values.
>>
>> I believe we would need to change the data structures and the API to
>> support upper and lower limits via platform representation. We could
>> simply use the .bind callback of the dt thermal zone, but I believe that
>> would abusing the API, assuming that .match is for platform binding.
>> Durga, what do you think?
>
> okay, I see.. Two approaches I could think of:
> 1. Introduce two arrays (size = number of trips in the tz) named
> upper/lower_limits[size] in the 'thermal_bind_params' structure.
> This way we don't need any API change. We can slightly change the
> implementation inside '__bind' function in thermal_core.c to get this
> working.
>
> 2. Pass 3 more parameters in the .match function:
> .match(tz, cdev, trip, &lower, &upper). The platform layer
> then determines whether there is a match; and if so,
> provides sane values for lower and upper variables.
>
> At this point of time, I think I prefer method 1 ;)
> Let me know your thoughts.
>
Yeah, I agree that (1) is likely to scale. I will cook something with it
for next version.
> Thanks,
> Durga
>>
>>
>>>
>>>
>>> Thanks.
>>> Wei.
>>>
>>>
>>>
>>
>>
>> --
>> You have got to be excited about what you are doing. (L. Lamport)
>>
>> Eduardo Valentin
>
>
>
--
You have got to be excited about what you are doing. (L. Lamport)
Eduardo Valentin
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 295 bytes --]
^ permalink raw reply [flat|nested] 33+ messages in thread
* [RFC PATCH 3/4] thermal: ti-soc-thermal: use thermal DT infrastructure
2013-07-09 14:00 [RFC PATCH 0/4] thermal: introduce DT thermal builder Eduardo Valentin
2013-07-09 14:00 ` Eduardo Valentin
2013-07-09 14:00 ` Eduardo Valentin
@ 2013-07-09 14:00 ` Eduardo Valentin
2013-07-15 12:12 ` Lucas Stach
2013-07-09 14:00 ` [RFC PATCH 4/4] arm: dts: add omap4430 thermal data Eduardo Valentin
3 siblings, 1 reply; 33+ messages in thread
From: Eduardo Valentin @ 2013-07-09 14:00 UTC (permalink / raw)
To: linux-pm, durgadoss.r, amit.daniel; +Cc: rui.zhang, Eduardo Valentin
This patch improves the ti-soc-thermal driver by adding the
support to build the thermal zones based on DT nodes.
The driver will have two options now to build the thermal
zones. The first option is the zones originally coded
in this driver. So, the driver behavior will be same
if there is no DT node describing the zones. The second
option, when it is found a DT node with thermal data,
will used the common infrastructure to build the thermal
zone and bind its cooling devices.
In either case, this driver still adds to the system
a cpufreq cooling device.
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
---
drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 35 +++++++++++++++-------
1 file changed, 25 insertions(+), 10 deletions(-)
diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
index 4c5f55c37..213a883 100644
--- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
+++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
@@ -31,6 +31,7 @@
#include <linux/cpufreq.h>
#include <linux/cpumask.h>
#include <linux/cpu_cooling.h>
+#include <linux/of.h>
#include "ti-thermal.h"
#include "ti-bandgap.h"
@@ -75,11 +76,10 @@ static inline int ti_thermal_hotspot_temperature(int t, int s, int c)
/* thermal zone ops */
/* Get temperature callback function for thermal zone*/
-static inline int ti_thermal_get_temp(struct thermal_zone_device *thermal,
- unsigned long *temp)
+static inline int __ti_thermal_get_temp(void *devdata, unsigned long *temp)
{
struct thermal_zone_device *pcb_tz = NULL;
- struct ti_thermal_data *data = thermal->devdata;
+ struct ti_thermal_data *data = devdata;
struct ti_bandgap *bgp;
const struct ti_temp_sensor *s;
int ret, tmp, slope, constant;
@@ -117,6 +117,14 @@ static inline int ti_thermal_get_temp(struct thermal_zone_device *thermal,
return ret;
}
+static inline int ti_thermal_get_temp(struct thermal_zone_device *thermal,
+ unsigned long *temp)
+{
+ struct ti_thermal_data *data = thermal->devdata;
+
+ return __ti_thermal_get_temp(data, temp);
+}
+
/* Bind callback functions for thermal zone */
static int ti_thermal_bind(struct thermal_zone_device *thermal,
struct thermal_cooling_device *cdev)
@@ -302,17 +310,24 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id,
if (!data)
return -EINVAL;
- /* Create thermal zone */
- data->ti_thermal = thermal_zone_device_register(domain,
+ /* in case this is specified by DT */
+ if (of_find_node_by_name(bgp->dev->of_node, "thermal_zone")) {
+ data->ti_thermal = thermal_zone_of_device_register(bgp->dev,
+ data, __ti_thermal_get_temp);
+ /* TODO: return */
+ } else {
+ /* Create thermal zone */
+ data->ti_thermal = thermal_zone_device_register(domain,
OMAP_TRIP_NUMBER, 0, data, &ti_thermal_ops,
NULL, FAST_TEMP_MONITORING_RATE,
FAST_TEMP_MONITORING_RATE);
- if (IS_ERR(data->ti_thermal)) {
- dev_err(bgp->dev, "thermal zone device is NULL\n");
- return PTR_ERR(data->ti_thermal);
+ if (IS_ERR(data->ti_thermal)) {
+ dev_err(bgp->dev, "thermal zone device is NULL\n");
+ return PTR_ERR(data->ti_thermal);
+ }
+ data->ti_thermal->polling_delay = FAST_TEMP_MONITORING_RATE;
+ ti_bandgap_set_sensor_data(bgp, id, data);
}
- data->ti_thermal->polling_delay = FAST_TEMP_MONITORING_RATE;
- ti_bandgap_set_sensor_data(bgp, id, data);
return 0;
}
--
1.8.2.1.342.gfa7285d
^ permalink raw reply related [flat|nested] 33+ messages in thread* Re: [RFC PATCH 3/4] thermal: ti-soc-thermal: use thermal DT infrastructure
2013-07-09 14:00 ` [RFC PATCH 3/4] thermal: ti-soc-thermal: use thermal DT infrastructure Eduardo Valentin
@ 2013-07-15 12:12 ` Lucas Stach
2013-07-15 12:33 ` Eduardo Valentin
0 siblings, 1 reply; 33+ messages in thread
From: Lucas Stach @ 2013-07-15 12:12 UTC (permalink / raw)
To: linux-pm
Hi Eduardo and others,
Eduardo Valentin <eduardo.valentin <at> ti.com> writes:
>
> This patch improves the ti-soc-thermal driver by adding the
> support to build the thermal zones based on DT nodes.
>
> The driver will have two options now to build the thermal
> zones. The first option is the zones originally coded
> in this driver. So, the driver behavior will be same
> if there is no DT node describing the zones. The second
> option, when it is found a DT node with thermal data,
> will used the common infrastructure to build the thermal
> zone and bind its cooling devices.
>
> In either case, this driver still adds to the system
> a cpufreq cooling device.
>
I really like the idea to configure thermal zones using devicetree, it's a
step in the right direction. We might follow suit with the i.MX6 tempmon
driver to use this infrastructure.
What I strongly dislike is the notion of the sensor drivers instantiating
the cooling devices and the resulting devicetree binding. This seems really
backward to me.
I would rather see the drivers associated with the cooling devices (like
cpufreq and the respective gpu drivers) to instantiate the cooling devices
and the thermal zone referring to them through phandles. I think it
shouldn't be too much work to go in that direction.
The current method might be enough to work with the current thermal platform
drivers, but if you want to go down the route to eventually use plain i2c
devices (likely with an existing hwmon driver) you have to get away from the
sensor devices instantiating the cooling devices.
Regards,
Lucas
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [RFC PATCH 3/4] thermal: ti-soc-thermal: use thermal DT infrastructure
2013-07-15 12:12 ` Lucas Stach
@ 2013-07-15 12:33 ` Eduardo Valentin
2013-07-15 12:59 ` Lucas Stach
0 siblings, 1 reply; 33+ messages in thread
From: Eduardo Valentin @ 2013-07-15 12:33 UTC (permalink / raw)
To: Lucas Stach; +Cc: linux-pm, eduardo.valentin
[-- Attachment #1: Type: text/plain, Size: 2786 bytes --]
On 15-07-2013 08:12, Lucas Stach wrote:
> Hi Eduardo and others,
>
> Eduardo Valentin <eduardo.valentin <at> ti.com> writes:
>
>>
>> This patch improves the ti-soc-thermal driver by adding the
>> support to build the thermal zones based on DT nodes.
>>
>> The driver will have two options now to build the thermal
>> zones. The first option is the zones originally coded
>> in this driver. So, the driver behavior will be same
>> if there is no DT node describing the zones. The second
>> option, when it is found a DT node with thermal data,
>> will used the common infrastructure to build the thermal
>> zone and bind its cooling devices.
>>
>> In either case, this driver still adds to the system
>> a cpufreq cooling device.
>>
>
> I really like the idea to configure thermal zones using devicetree, it's a
> step in the right direction. We might follow suit with the i.MX6 tempmon
> driver to use this infrastructure.
>
> What I strongly dislike is the notion of the sensor drivers instantiating
> the cooling devices and the resulting devicetree binding. This seems really
> backward to me.
> I would rather see the drivers associated with the cooling devices (like
> cpufreq and the respective gpu drivers) to instantiate the cooling devices
> and the thermal zone referring to them through phandles. I think it
> shouldn't be too much work to go in that direction.
> The current method might be enough to work with the current thermal platform
> drivers, but if you want to go down the route to eventually use plain i2c
> devices (likely with an existing hwmon driver) you have to get away from the
> sensor devices instantiating the cooling devices.
I agree with you. While implementing the RFC, it looks awkward that the
ti-soc-thermal driver had to do the job to load the cpufreq-cooling
device. Problem is that a cooling device is not really a real device,
and might get flamed while represented as a device tree node.
I could try to push something following the same idea as the one I am
trying to sell with this series for sensor devices. For instance, in a
sensor node I am attaching a phandle to describe how thermal fw must
behave. Then the sensor driver it is supposed to load the thermal data
into the thermal fw. Same could apply for instance for cpufreq cooling
device. at the cpu node we could have a 'cooling_device' node at the cpu
node, while loading cpufreq-cpu0.
>
> Regards,
> Lucas
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
--
You have got to be excited about what you are doing. (L. Lamport)
Eduardo Valentin
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 295 bytes --]
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [RFC PATCH 3/4] thermal: ti-soc-thermal: use thermal DT infrastructure
2013-07-15 12:33 ` Eduardo Valentin
@ 2013-07-15 12:59 ` Lucas Stach
2013-07-15 13:25 ` Eduardo Valentin
0 siblings, 1 reply; 33+ messages in thread
From: Lucas Stach @ 2013-07-15 12:59 UTC (permalink / raw)
To: Eduardo Valentin; +Cc: linux-pm
Am Montag, den 15.07.2013, 08:33 -0400 schrieb Eduardo Valentin:
> On 15-07-2013 08:12, Lucas Stach wrote:
> > Hi Eduardo and others,
> >
> > Eduardo Valentin <eduardo.valentin <at> ti.com> writes:
> >
> >>
> >> This patch improves the ti-soc-thermal driver by adding the
> >> support to build the thermal zones based on DT nodes.
> >>
> >> The driver will have two options now to build the thermal
> >> zones. The first option is the zones originally coded
> >> in this driver. So, the driver behavior will be same
> >> if there is no DT node describing the zones. The second
> >> option, when it is found a DT node with thermal data,
> >> will used the common infrastructure to build the thermal
> >> zone and bind its cooling devices.
> >>
> >> In either case, this driver still adds to the system
> >> a cpufreq cooling device.
> >>
> >
> > I really like the idea to configure thermal zones using devicetree, it's a
> > step in the right direction. We might follow suit with the i.MX6 tempmon
> > driver to use this infrastructure.
> >
> > What I strongly dislike is the notion of the sensor drivers instantiating
> > the cooling devices and the resulting devicetree binding. This seems really
> > backward to me.
> > I would rather see the drivers associated with the cooling devices (like
> > cpufreq and the respective gpu drivers) to instantiate the cooling devices
> > and the thermal zone referring to them through phandles. I think it
> > shouldn't be too much work to go in that direction.
> > The current method might be enough to work with the current thermal platform
> > drivers, but if you want to go down the route to eventually use plain i2c
> > devices (likely with an existing hwmon driver) you have to get away from the
> > sensor devices instantiating the cooling devices.
>
> I agree with you. While implementing the RFC, it looks awkward that the
> ti-soc-thermal driver had to do the job to load the cpufreq-cooling
> device. Problem is that a cooling device is not really a real device,
> and might get flamed while represented as a device tree node.
>
I don't think we even need to represent this into the device tree. We
already have the CPU nodes there and the cpu-freq driver is already
linked to those. It should be easy to have a global list of registered
thermal devices in the thermal framework together with their associated
devices, so one could look up cooling devices through the thermal
framework when we only have a phandle to the cpu node.
> I could try to push something following the same idea as the one I am
> trying to sell with this series for sensor devices. For instance, in a
> sensor node I am attaching a phandle to describe how thermal fw must
> behave. Then the sensor driver it is supposed to load the thermal data
> into the thermal fw. Same could apply for instance for cpufreq cooling
> device. at the cpu node we could have a 'cooling_device' node at the cpu
> node, while loading cpufreq-cpu0.
I think a separate cooling_device node may be only necessary if we stuff
additional info in there. If it's just a plain cooling device I think it
is reasonable for the cpufreq driver to just register a cooling device
if the thermal framework is there.
I would really like the information about a thermal zone to hang off one
dt node rather than being scattered over several nodes. This way it may
be easy to reference a cooling device in different thermal zones with
different weight, etc. As long as we define a thermal zone to always be
defined by a single sensor the right place seems to be the proposed
subnode to the sensor. If we want a zone to have more than one sensor,
we might even want a separate dt node for the thermal zone, referencing
both sensors and cooling devices through phandles.
Regards,
Lucas
--
Pengutronix e.K. | Lucas Stach |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-5076 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [RFC PATCH 3/4] thermal: ti-soc-thermal: use thermal DT infrastructure
2013-07-15 12:59 ` Lucas Stach
@ 2013-07-15 13:25 ` Eduardo Valentin
2013-07-15 13:36 ` Eduardo Valentin
2013-07-15 13:53 ` Lucas Stach
0 siblings, 2 replies; 33+ messages in thread
From: Eduardo Valentin @ 2013-07-15 13:25 UTC (permalink / raw)
To: Lucas Stach; +Cc: Eduardo Valentin, linux-pm
[-- Attachment #1: Type: text/plain, Size: 5688 bytes --]
On 15-07-2013 08:59, Lucas Stach wrote:
> Am Montag, den 15.07.2013, 08:33 -0400 schrieb Eduardo Valentin:
>> On 15-07-2013 08:12, Lucas Stach wrote:
>>> Hi Eduardo and others,
>>>
>>> Eduardo Valentin <eduardo.valentin <at> ti.com> writes:
>>>
>>>>
>>>> This patch improves the ti-soc-thermal driver by adding the
>>>> support to build the thermal zones based on DT nodes.
>>>>
>>>> The driver will have two options now to build the thermal
>>>> zones. The first option is the zones originally coded
>>>> in this driver. So, the driver behavior will be same
>>>> if there is no DT node describing the zones. The second
>>>> option, when it is found a DT node with thermal data,
>>>> will used the common infrastructure to build the thermal
>>>> zone and bind its cooling devices.
>>>>
>>>> In either case, this driver still adds to the system
>>>> a cpufreq cooling device.
>>>>
>>>
>>> I really like the idea to configure thermal zones using devicetree, it's a
>>> step in the right direction. We might follow suit with the i.MX6 tempmon
>>> driver to use this infrastructure.
>>>
>>> What I strongly dislike is the notion of the sensor drivers instantiating
>>> the cooling devices and the resulting devicetree binding. This seems really
>>> backward to me.
>>> I would rather see the drivers associated with the cooling devices (like
>>> cpufreq and the respective gpu drivers) to instantiate the cooling devices
>>> and the thermal zone referring to them through phandles. I think it
>>> shouldn't be too much work to go in that direction.
>>> The current method might be enough to work with the current thermal platform
>>> drivers, but if you want to go down the route to eventually use plain i2c
>>> devices (likely with an existing hwmon driver) you have to get away from the
>>> sensor devices instantiating the cooling devices.
>>
>> I agree with you. While implementing the RFC, it looks awkward that the
>> ti-soc-thermal driver had to do the job to load the cpufreq-cooling
>> device. Problem is that a cooling device is not really a real device,
>> and might get flamed while represented as a device tree node.
>>
> I don't think we even need to represent this into the device tree. We
> already have the CPU nodes there and the cpu-freq driver is already
> linked to those. It should be easy to have a global list of registered
> thermal devices in the thermal framework together with their associated
> devices, so one could look up cooling devices through the thermal
> framework when we only have a phandle to the cpu node.
Well, we do have a list of thermal cooling devices associated with its
corresponding struct device. That is private data to the thermal
framework. However, one needs to load the cooling device in order to its
data structure appear in this list. The framework can not be proactive
here. Some other entity needs to see the need and inform the thermal
framework of it.
For instance, assuming that all systems will need a cpufreq cooling
device is a flaw, because that is not the case. Thus, it makes sense to
have a property, say at the cpu node, to determine that it needs
cooling. However, that won't be saying how it would cool off.
>
>> I could try to push something following the same idea as the one I am
>> trying to sell with this series for sensor devices. For instance, in a
>> sensor node I am attaching a phandle to describe how thermal fw must
>> behave. Then the sensor driver it is supposed to load the thermal data
>> into the thermal fw. Same could apply for instance for cpufreq cooling
>> device. at the cpu node we could have a 'cooling_device' node at the cpu
>> node, while loading cpufreq-cpu0.
>
> I think a separate cooling_device node may be only necessary if we stuff
> additional info in there. If it's just a plain cooling device I think it
> is reasonable for the cpufreq driver to just register a cooling device
> if the thermal framework is there.
no, I think this is not what we want, because, as I said, not all cpus
will need cooling. Just because the thermal framework is there does not
mean your cpu needs cooling. As you can see, the thermal framework is
not only for cpu cooling. It can be used for any other thermal need.
Besides one needs to cover for the case where you are building for
multiple platform support. Assuming system needs based on Kconfig setup
is not very likely to scale in this case.
>
> I would really like the information about a thermal zone to hang off one
> dt node rather than being scattered over several nodes. This way it may
Again, thermal framework is not about only cpu(freq) cooling. Thermal
zone info can (and will) be hanged off in one dt node. But please don't
mix concepts. Just because a cooling device is part of a thermal zone,
it does not mean it is only used there and that it can be defined there.
One can use a cooling device in different thermal zones.
> be easy to reference a cooling device in different thermal zones with
> different weight, etc. As long as we define a thermal zone to always be
> defined by a single sensor the right place seems to be the proposed
> subnode to the sensor. If we want a zone to have more than one sensor,
> we might even want a separate dt node for the thermal zone, referencing
> both sensors and cooling devices through phandles.
I still don't get why and how defining a thermal zone inside a sensor
phandle can prevent us defining a cooling device in different device
phandle.
>
> Regards,
> Lucas
>
--
You have got to be excited about what you are doing. (L. Lamport)
Eduardo Valentin
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 295 bytes --]
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [RFC PATCH 3/4] thermal: ti-soc-thermal: use thermal DT infrastructure
2013-07-15 13:25 ` Eduardo Valentin
@ 2013-07-15 13:36 ` Eduardo Valentin
2013-07-15 13:38 ` Eduardo Valentin
2013-07-15 14:05 ` Lucas Stach
2013-07-15 13:53 ` Lucas Stach
1 sibling, 2 replies; 33+ messages in thread
From: Eduardo Valentin @ 2013-07-15 13:36 UTC (permalink / raw)
To: Eduardo Valentin; +Cc: Lucas Stach, linux-pm
[-- Attachment #1: Type: text/plain, Size: 8929 bytes --]
On 15-07-2013 09:25, Eduardo Valentin wrote:
> On 15-07-2013 08:59, Lucas Stach wrote:
>> Am Montag, den 15.07.2013, 08:33 -0400 schrieb Eduardo Valentin:
>>> On 15-07-2013 08:12, Lucas Stach wrote:
>>>> Hi Eduardo and others,
>>>>
>>>> Eduardo Valentin <eduardo.valentin <at> ti.com> writes:
>>>>
>>>>>
>>>>> This patch improves the ti-soc-thermal driver by adding the
>>>>> support to build the thermal zones based on DT nodes.
>>>>>
>>>>> The driver will have two options now to build the thermal
>>>>> zones. The first option is the zones originally coded
>>>>> in this driver. So, the driver behavior will be same
>>>>> if there is no DT node describing the zones. The second
>>>>> option, when it is found a DT node with thermal data,
>>>>> will used the common infrastructure to build the thermal
>>>>> zone and bind its cooling devices.
>>>>>
>>>>> In either case, this driver still adds to the system
>>>>> a cpufreq cooling device.
>>>>>
>>>>
>>>> I really like the idea to configure thermal zones using devicetree, it's a
>>>> step in the right direction. We might follow suit with the i.MX6 tempmon
>>>> driver to use this infrastructure.
>>>>
>>>> What I strongly dislike is the notion of the sensor drivers instantiating
>>>> the cooling devices and the resulting devicetree binding. This seems really
>>>> backward to me.
>>>> I would rather see the drivers associated with the cooling devices (like
>>>> cpufreq and the respective gpu drivers) to instantiate the cooling devices
>>>> and the thermal zone referring to them through phandles. I think it
>>>> shouldn't be too much work to go in that direction.
>>>> The current method might be enough to work with the current thermal platform
>>>> drivers, but if you want to go down the route to eventually use plain i2c
>>>> devices (likely with an existing hwmon driver) you have to get away from the
>>>> sensor devices instantiating the cooling devices.
>>>
>>> I agree with you. While implementing the RFC, it looks awkward that the
>>> ti-soc-thermal driver had to do the job to load the cpufreq-cooling
>>> device. Problem is that a cooling device is not really a real device,
>>> and might get flamed while represented as a device tree node.
>>>
>> I don't think we even need to represent this into the device tree. We
>> already have the CPU nodes there and the cpu-freq driver is already
>> linked to those. It should be easy to have a global list of registered
>> thermal devices in the thermal framework together with their associated
>> devices, so one could look up cooling devices through the thermal
>> framework when we only have a phandle to the cpu node.
>
> Well, we do have a list of thermal cooling devices associated with its
> corresponding struct device. That is private data to the thermal
> framework. However, one needs to load the cooling device in order to its
> data structure appear in this list. The framework can not be proactive
> here. Some other entity needs to see the need and inform the thermal
> framework of it.
>
as simple as the following:
diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c
index 3ab8294..486881c 100644
--- a/drivers/cpufreq/cpufreq-cpu0.c
+++ b/drivers/cpufreq/cpufreq-cpu0.c
@@ -20,6 +20,9 @@
#include <linux/platform_device.h>
#include <linux/regulator/consumer.h>
#include <linux/slab.h>
+#include <linux/thermal.h>
+#include <linux/cpu_cooling.h>
+#include <linux/cpumask.h>
static unsigned int transition_latency;
static unsigned int voltage_tolerance; /* in percentage */
@@ -28,6 +31,7 @@ static struct device *cpu_dev;
static struct clk *cpu_clk;
static struct regulator *cpu_reg;
static struct cpufreq_frequency_table *freq_table;
+static struct thermal_cooling_device *cdev;
static int cpu0_verify_speed(struct cpufreq_policy *policy)
{
@@ -256,6 +260,9 @@ static int cpu0_cpufreq_probe(struct platform_device
*pdev)
goto out_free_table;
}
+ if (!of_property_read_bool(np, "needs-cooling"))
+ cdev = cpufreq_cooling_register(cpu_present_mask);
+
of_node_put(np);
of_node_put(parent);
return 0;
@@ -269,6 +276,7 @@ out_put_node:
static int cpu0_cpufreq_remove(struct platform_device *pdev)
{
+ cpufreq_cooling_unregister(cdev);
cpufreq_unregister_driver(&cpu0_cpufreq_driver);
opp_free_cpufreq_table(cpu_dev, &freq_table);
> For instance, assuming that all systems will need a cpufreq cooling
> device is a flaw, because that is not the case. Thus, it makes sense to
> have a property, say at the cpu node, to determine that it needs
> cooling. However, that won't be saying how it would cool off.
Then you would define your cpu0 node as:
cpu@0 {
/* OMAP443x variants OPP50-OPPNT */
operating-points = <
/* kHz uV */
300000 1025000
600000 1200000
800000 1313000
1008000 1375000
>;
clock-latency = <300000>; /* From legacy driver */
needs-cooling; /* make sure we have cpufreq-cooling */
};
Because in that system we actually need to take care of the cpu thermal.
>
>
>>
>>> I could try to push something following the same idea as the one I am
>>> trying to sell with this series for sensor devices. For instance, in a
>>> sensor node I am attaching a phandle to describe how thermal fw must
>>> behave. Then the sensor driver it is supposed to load the thermal data
>>> into the thermal fw. Same could apply for instance for cpufreq cooling
>>> device. at the cpu node we could have a 'cooling_device' node at the cpu
>>> node, while loading cpufreq-cpu0.
>>
>> I think a separate cooling_device node may be only necessary if we stuff
>> additional info in there. If it's just a plain cooling device I think it
>> is reasonable for the cpufreq driver to just register a cooling device
>> if the thermal framework is there.
>
> no, I think this is not what we want, because, as I said, not all cpus
> will need cooling. Just because the thermal framework is there does not
> mean your cpu needs cooling. As you can see, the thermal framework is
> not only for cpu cooling. It can be used for any other thermal need.
> Besides one needs to cover for the case where you are building for
> multiple platform support. Assuming system needs based on Kconfig setup
> is not very likely to scale in this case.
>
>>
>> I would really like the information about a thermal zone to hang off one
>> dt node rather than being scattered over several nodes. This way it may
>
> Again, thermal framework is not about only cpu(freq) cooling. Thermal
> zone info can (and will) be hanged off in one dt node. But please don't
> mix concepts. Just because a cooling device is part of a thermal zone,
> it does not mean it is only used there and that it can be defined there.
> One can use a cooling device in different thermal zones.
>
>> be easy to reference a cooling device in different thermal zones with
>> different weight, etc. As long as we define a thermal zone to always be
>> defined by a single sensor the right place seems to be the proposed
>> subnode to the sensor. If we want a zone to have more than one sensor,
>> we might even want a separate dt node for the thermal zone, referencing
>> both sensors and cooling devices through phandles.
>
> I still don't get why and how defining a thermal zone inside a sensor
> phandle can prevent us defining a cooling device in different device
> phandle.
Then you can keep everything about your thermal zone in one single
phandle, as follows, but remember, this is is the info about the thermal
zone, not about a cooling device. For instance, that is the zone built
on top of a bandgap sensor:
bandgap {
reg = <0x4a002260 0x4 0x4a00232C 0x4>;
compatible = "ti,omap4430-bandgap";
thermal_zone {
type = "CPU";
mask = <0x03>; /* trips writability */
passive_delay = <250>; /* milliseconds */
polling_delay = <1000>; /* milliseconds */
governor = "step_wise";
trips {
alert@100000{
temperature = <100000>;
hysteresis = <0>;
type = <1>;
};
crit@125000{
temperature = <125000>;
hysteresis = <0>;
type = <3>;
};
};
bind_params {
action@0{
cooling_device = "thermal-cpufreq";
weight = <100>; /* percentage */
mask = <0x01>;
};
};
};
};
And you see that, in this case, the bandgap sensor driver does not need
to worry about loading the cpufreq cooling device anymore. Who is
responsible of doing that is the cpufreq driver, with the above
proposal, when it makes sense and when there is a need.
>
>>
>> Regards,
>> Lucas
>>
>
>
--
You have got to be excited about what you are doing. (L. Lamport)
Eduardo Valentin
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 295 bytes --]
^ permalink raw reply related [flat|nested] 33+ messages in thread* Re: [RFC PATCH 3/4] thermal: ti-soc-thermal: use thermal DT infrastructure
2013-07-15 13:36 ` Eduardo Valentin
@ 2013-07-15 13:38 ` Eduardo Valentin
2013-07-15 14:05 ` Lucas Stach
1 sibling, 0 replies; 33+ messages in thread
From: Eduardo Valentin @ 2013-07-15 13:38 UTC (permalink / raw)
To: Eduardo Valentin; +Cc: Lucas Stach, linux-pm
[-- Attachment #1: Type: text/plain, Size: 9404 bytes --]
On 15-07-2013 09:36, Eduardo Valentin wrote:
> On 15-07-2013 09:25, Eduardo Valentin wrote:
>> On 15-07-2013 08:59, Lucas Stach wrote:
>>> Am Montag, den 15.07.2013, 08:33 -0400 schrieb Eduardo Valentin:
>>>> On 15-07-2013 08:12, Lucas Stach wrote:
>>>>> Hi Eduardo and others,
>>>>>
>>>>> Eduardo Valentin <eduardo.valentin <at> ti.com> writes:
>>>>>
>>>>>>
>>>>>> This patch improves the ti-soc-thermal driver by adding the
>>>>>> support to build the thermal zones based on DT nodes.
>>>>>>
>>>>>> The driver will have two options now to build the thermal
>>>>>> zones. The first option is the zones originally coded
>>>>>> in this driver. So, the driver behavior will be same
>>>>>> if there is no DT node describing the zones. The second
>>>>>> option, when it is found a DT node with thermal data,
>>>>>> will used the common infrastructure to build the thermal
>>>>>> zone and bind its cooling devices.
>>>>>>
>>>>>> In either case, this driver still adds to the system
>>>>>> a cpufreq cooling device.
>>>>>>
>>>>>
>>>>> I really like the idea to configure thermal zones using devicetree, it's a
>>>>> step in the right direction. We might follow suit with the i.MX6 tempmon
>>>>> driver to use this infrastructure.
>>>>>
>>>>> What I strongly dislike is the notion of the sensor drivers instantiating
>>>>> the cooling devices and the resulting devicetree binding. This seems really
>>>>> backward to me.
>>>>> I would rather see the drivers associated with the cooling devices (like
>>>>> cpufreq and the respective gpu drivers) to instantiate the cooling devices
>>>>> and the thermal zone referring to them through phandles. I think it
>>>>> shouldn't be too much work to go in that direction.
>>>>> The current method might be enough to work with the current thermal platform
>>>>> drivers, but if you want to go down the route to eventually use plain i2c
>>>>> devices (likely with an existing hwmon driver) you have to get away from the
>>>>> sensor devices instantiating the cooling devices.
>>>>
>>>> I agree with you. While implementing the RFC, it looks awkward that the
>>>> ti-soc-thermal driver had to do the job to load the cpufreq-cooling
>>>> device. Problem is that a cooling device is not really a real device,
>>>> and might get flamed while represented as a device tree node.
>>>>
>>> I don't think we even need to represent this into the device tree. We
>>> already have the CPU nodes there and the cpu-freq driver is already
>>> linked to those. It should be easy to have a global list of registered
>>> thermal devices in the thermal framework together with their associated
>>> devices, so one could look up cooling devices through the thermal
>>> framework when we only have a phandle to the cpu node.
>>
>> Well, we do have a list of thermal cooling devices associated with its
>> corresponding struct device. That is private data to the thermal
>> framework. However, one needs to load the cooling device in order to its
>> data structure appear in this list. The framework can not be proactive
>> here. Some other entity needs to see the need and inform the thermal
>> framework of it.
>>
>
>
>
> as simple as the following:
> diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c
> index 3ab8294..486881c 100644
> --- a/drivers/cpufreq/cpufreq-cpu0.c
> +++ b/drivers/cpufreq/cpufreq-cpu0.c
> @@ -20,6 +20,9 @@
> #include <linux/platform_device.h>
> #include <linux/regulator/consumer.h>
> #include <linux/slab.h>
> +#include <linux/thermal.h>
> +#include <linux/cpu_cooling.h>
> +#include <linux/cpumask.h>
>
> static unsigned int transition_latency;
> static unsigned int voltage_tolerance; /* in percentage */
> @@ -28,6 +31,7 @@ static struct device *cpu_dev;
> static struct clk *cpu_clk;
> static struct regulator *cpu_reg;
> static struct cpufreq_frequency_table *freq_table;
> +static struct thermal_cooling_device *cdev;
>
> static int cpu0_verify_speed(struct cpufreq_policy *policy)
> {
> @@ -256,6 +260,9 @@ static int cpu0_cpufreq_probe(struct platform_device
> *pdev)
> goto out_free_table;
> }
>
> + if (!of_property_read_bool(np, "needs-cooling"))
This is obviously supposed to be
+ if (of_property_read_bool(np, "needs-cooling"))
> + cdev = cpufreq_cooling_register(cpu_present_mask);
> +
> of_node_put(np);
> of_node_put(parent);
> return 0;
> @@ -269,6 +276,7 @@ out_put_node:
>
> static int cpu0_cpufreq_remove(struct platform_device *pdev)
> {
> + cpufreq_cooling_unregister(cdev);
> cpufreq_unregister_driver(&cpu0_cpufreq_driver);
> opp_free_cpufreq_table(cpu_dev, &freq_table);
>
>> For instance, assuming that all systems will need a cpufreq cooling
>> device is a flaw, because that is not the case. Thus, it makes sense to
>> have a property, say at the cpu node, to determine that it needs
>> cooling. However, that won't be saying how it would cool off.
>
>
> Then you would define your cpu0 node as:
>
> cpu@0 {
> /* OMAP443x variants OPP50-OPPNT */
> operating-points = <
> /* kHz uV */
> 300000 1025000
> 600000 1200000
> 800000 1313000
> 1008000 1375000
> >;
> clock-latency = <300000>; /* From legacy driver */
> needs-cooling; /* make sure we have cpufreq-cooling */
> };
>
> Because in that system we actually need to take care of the cpu thermal.
>
>
>>
>>
>>>
>>>> I could try to push something following the same idea as the one I am
>>>> trying to sell with this series for sensor devices. For instance, in a
>>>> sensor node I am attaching a phandle to describe how thermal fw must
>>>> behave. Then the sensor driver it is supposed to load the thermal data
>>>> into the thermal fw. Same could apply for instance for cpufreq cooling
>>>> device. at the cpu node we could have a 'cooling_device' node at the cpu
>>>> node, while loading cpufreq-cpu0.
>>>
>>> I think a separate cooling_device node may be only necessary if we stuff
>>> additional info in there. If it's just a plain cooling device I think it
>>> is reasonable for the cpufreq driver to just register a cooling device
>>> if the thermal framework is there.
>>
>> no, I think this is not what we want, because, as I said, not all cpus
>> will need cooling. Just because the thermal framework is there does not
>> mean your cpu needs cooling. As you can see, the thermal framework is
>> not only for cpu cooling. It can be used for any other thermal need.
>> Besides one needs to cover for the case where you are building for
>> multiple platform support. Assuming system needs based on Kconfig setup
>> is not very likely to scale in this case.
>>
>>>
>>> I would really like the information about a thermal zone to hang off one
>>> dt node rather than being scattered over several nodes. This way it may
>>
>> Again, thermal framework is not about only cpu(freq) cooling. Thermal
>> zone info can (and will) be hanged off in one dt node. But please don't
>> mix concepts. Just because a cooling device is part of a thermal zone,
>> it does not mean it is only used there and that it can be defined there.
>> One can use a cooling device in different thermal zones.
>>
>>> be easy to reference a cooling device in different thermal zones with
>>> different weight, etc. As long as we define a thermal zone to always be
>>> defined by a single sensor the right place seems to be the proposed
>>> subnode to the sensor. If we want a zone to have more than one sensor,
>>> we might even want a separate dt node for the thermal zone, referencing
>>> both sensors and cooling devices through phandles.
>>
>> I still don't get why and how defining a thermal zone inside a sensor
>> phandle can prevent us defining a cooling device in different device
>> phandle.
>
>
> Then you can keep everything about your thermal zone in one single
> phandle, as follows, but remember, this is is the info about the thermal
> zone, not about a cooling device. For instance, that is the zone built
> on top of a bandgap sensor:
> bandgap {
> reg = <0x4a002260 0x4 0x4a00232C 0x4>;
> compatible = "ti,omap4430-bandgap";
> thermal_zone {
> type = "CPU";
> mask = <0x03>; /* trips writability */
> passive_delay = <250>; /* milliseconds */
> polling_delay = <1000>; /* milliseconds */
> governor = "step_wise";
> trips {
> alert@100000{
> temperature = <100000>;
> hysteresis = <0>;
> type = <1>;
> };
> crit@125000{
> temperature = <125000>;
> hysteresis = <0>;
> type = <3>;
> };
> };
> bind_params {
> action@0{
> cooling_device = "thermal-cpufreq";
> weight = <100>; /* percentage */
> mask = <0x01>;
> };
> };
> };
> };
>
>
> And you see that, in this case, the bandgap sensor driver does not need
> to worry about loading the cpufreq cooling device anymore. Who is
> responsible of doing that is the cpufreq driver, with the above
> proposal, when it makes sense and when there is a need.
>
>
>
>>
>>>
>>> Regards,
>>> Lucas
>>>
>>
>>
>
>
--
You have got to be excited about what you are doing. (L. Lamport)
Eduardo Valentin
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 295 bytes --]
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [RFC PATCH 3/4] thermal: ti-soc-thermal: use thermal DT infrastructure
2013-07-15 13:36 ` Eduardo Valentin
2013-07-15 13:38 ` Eduardo Valentin
@ 2013-07-15 14:05 ` Lucas Stach
2013-07-15 14:14 ` Eduardo Valentin
1 sibling, 1 reply; 33+ messages in thread
From: Lucas Stach @ 2013-07-15 14:05 UTC (permalink / raw)
To: Eduardo Valentin; +Cc: linux-pm
Am Montag, den 15.07.2013, 09:36 -0400 schrieb Eduardo Valentin:
[...]
>
>
> as simple as the following:
> diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c
> index 3ab8294..486881c 100644
> --- a/drivers/cpufreq/cpufreq-cpu0.c
> +++ b/drivers/cpufreq/cpufreq-cpu0.c
> @@ -20,6 +20,9 @@
> #include <linux/platform_device.h>
> #include <linux/regulator/consumer.h>
> #include <linux/slab.h>
> +#include <linux/thermal.h>
> +#include <linux/cpu_cooling.h>
> +#include <linux/cpumask.h>
>
> static unsigned int transition_latency;
> static unsigned int voltage_tolerance; /* in percentage */
> @@ -28,6 +31,7 @@ static struct device *cpu_dev;
> static struct clk *cpu_clk;
> static struct regulator *cpu_reg;
> static struct cpufreq_frequency_table *freq_table;
> +static struct thermal_cooling_device *cdev;
>
> static int cpu0_verify_speed(struct cpufreq_policy *policy)
> {
> @@ -256,6 +260,9 @@ static int cpu0_cpufreq_probe(struct platform_device
> *pdev)
> goto out_free_table;
> }
>
> + if (!of_property_read_bool(np, "needs-cooling"))
> + cdev = cpufreq_cooling_register(cpu_present_mask);
> +
> of_node_put(np);
> of_node_put(parent);
> return 0;
> @@ -269,6 +276,7 @@ out_put_node:
>
> static int cpu0_cpufreq_remove(struct platform_device *pdev)
> {
> + cpufreq_cooling_unregister(cdev);
> cpufreq_unregister_driver(&cpu0_cpufreq_driver);
> opp_free_cpufreq_table(cpu_dev, &freq_table);
>
> > For instance, assuming that all systems will need a cpufreq cooling
> > device is a flaw, because that is not the case. Thus, it makes sense to
> > have a property, say at the cpu node, to determine that it needs
> > cooling. However, that won't be saying how it would cool off.
>
>
> Then you would define your cpu0 node as:
>
> cpu@0 {
> /* OMAP443x variants OPP50-OPPNT */
> operating-points = <
> /* kHz uV */
> 300000 1025000
> 600000 1200000
> 800000 1313000
> 1008000 1375000
> >;
> clock-latency = <300000>; /* From legacy driver */
> needs-cooling; /* make sure we have cpufreq-cooling */
> };
>
> Because in that system we actually need to take care of the cpu thermal.
>
I don't see what not registering the cooling device is buying us (aside
from a small resource saving). The cpu is one potential source of heat
in a system, so we may want to reference it in a thermal zone, so to me
it makes sense to always register the cooling device.
>
> >
> >
> >>
> >>> I could try to push something following the same idea as the one I am
> >>> trying to sell with this series for sensor devices. For instance, in a
> >>> sensor node I am attaching a phandle to describe how thermal fw must
> >>> behave. Then the sensor driver it is supposed to load the thermal data
> >>> into the thermal fw. Same could apply for instance for cpufreq cooling
> >>> device. at the cpu node we could have a 'cooling_device' node at the cpu
> >>> node, while loading cpufreq-cpu0.
> >>
> >> I think a separate cooling_device node may be only necessary if we stuff
> >> additional info in there. If it's just a plain cooling device I think it
> >> is reasonable for the cpufreq driver to just register a cooling device
> >> if the thermal framework is there.
> >
> > no, I think this is not what we want, because, as I said, not all cpus
> > will need cooling. Just because the thermal framework is there does not
> > mean your cpu needs cooling. As you can see, the thermal framework is
> > not only for cpu cooling. It can be used for any other thermal need.
> > Besides one needs to cover for the case where you are building for
> > multiple platform support. Assuming system needs based on Kconfig setup
> > is not very likely to scale in this case.
> >
> >>
> >> I would really like the information about a thermal zone to hang off one
> >> dt node rather than being scattered over several nodes. This way it may
> >
> > Again, thermal framework is not about only cpu(freq) cooling. Thermal
> > zone info can (and will) be hanged off in one dt node. But please don't
> > mix concepts. Just because a cooling device is part of a thermal zone,
> > it does not mean it is only used there and that it can be defined there.
> > One can use a cooling device in different thermal zones.
> >
> >> be easy to reference a cooling device in different thermal zones with
> >> different weight, etc. As long as we define a thermal zone to always be
> >> defined by a single sensor the right place seems to be the proposed
> >> subnode to the sensor. If we want a zone to have more than one sensor,
> >> we might even want a separate dt node for the thermal zone, referencing
> >> both sensors and cooling devices through phandles.
> >
> > I still don't get why and how defining a thermal zone inside a sensor
> > phandle can prevent us defining a cooling device in different device
> > phandle.
>
>
> Then you can keep everything about your thermal zone in one single
> phandle, as follows, but remember, this is is the info about the thermal
> zone, not about a cooling device. For instance, that is the zone built
> on top of a bandgap sensor:
> bandgap {
> reg = <0x4a002260 0x4 0x4a00232C 0x4>;
> compatible = "ti,omap4430-bandgap";
> thermal_zone {
> type = "CPU";
> mask = <0x03>; /* trips writability */
> passive_delay = <250>; /* milliseconds */
> polling_delay = <1000>; /* milliseconds */
> governor = "step_wise";
> trips {
> alert@100000{
> temperature = <100000>;
> hysteresis = <0>;
> type = <1>;
> };
> crit@125000{
> temperature = <125000>;
> hysteresis = <0>;
> type = <3>;
> };
> };
> bind_params {
> action@0{
> cooling_device = "thermal-cpufreq";
> weight = <100>; /* percentage */
> mask = <0x01>;
> };
> };
> };
> };
>
>
> And you see that, in this case, the bandgap sensor driver does not need
> to worry about loading the cpufreq cooling device anymore. Who is
> responsible of doing that is the cpufreq driver, with the above
> proposal, when it makes sense and when there is a need.
Yes, this makes perfect sense to me. What I would like is to have the
links more specific in the devicetree, so to me this stringmatching
thing doesn't look too appealing, as it makes it harder to follow the
links just looking at the DT. That's why I would prefer them to be
phandles, so I could do something like:
bind_params {
action@0 {
cooling_device = <&cpu@0>;
weight = <40>; /* percentage */
mask = <0x01>;
};
action@1 {
cooling_device = <&gpu3d>;
weigth = <60>;
mask = <0x01>;
};
--
Pengutronix e.K. | Lucas Stach |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-5076 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [RFC PATCH 3/4] thermal: ti-soc-thermal: use thermal DT infrastructure
2013-07-15 14:05 ` Lucas Stach
@ 2013-07-15 14:14 ` Eduardo Valentin
2013-07-16 9:54 ` Lucas Stach
0 siblings, 1 reply; 33+ messages in thread
From: Eduardo Valentin @ 2013-07-15 14:14 UTC (permalink / raw)
To: Lucas Stach; +Cc: Eduardo Valentin, linux-pm
[-- Attachment #1: Type: text/plain, Size: 7563 bytes --]
On 15-07-2013 10:05, Lucas Stach wrote:
> Am Montag, den 15.07.2013, 09:36 -0400 schrieb Eduardo Valentin:
> [...]
>>
>>
>> as simple as the following:
>> diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c
>> index 3ab8294..486881c 100644
>> --- a/drivers/cpufreq/cpufreq-cpu0.c
>> +++ b/drivers/cpufreq/cpufreq-cpu0.c
>> @@ -20,6 +20,9 @@
>> #include <linux/platform_device.h>
>> #include <linux/regulator/consumer.h>
>> #include <linux/slab.h>
>> +#include <linux/thermal.h>
>> +#include <linux/cpu_cooling.h>
>> +#include <linux/cpumask.h>
>>
>> static unsigned int transition_latency;
>> static unsigned int voltage_tolerance; /* in percentage */
>> @@ -28,6 +31,7 @@ static struct device *cpu_dev;
>> static struct clk *cpu_clk;
>> static struct regulator *cpu_reg;
>> static struct cpufreq_frequency_table *freq_table;
>> +static struct thermal_cooling_device *cdev;
>>
>> static int cpu0_verify_speed(struct cpufreq_policy *policy)
>> {
>> @@ -256,6 +260,9 @@ static int cpu0_cpufreq_probe(struct platform_device
>> *pdev)
>> goto out_free_table;
>> }
>>
>> + if (!of_property_read_bool(np, "needs-cooling"))
>> + cdev = cpufreq_cooling_register(cpu_present_mask);
>> +
>> of_node_put(np);
>> of_node_put(parent);
>> return 0;
>> @@ -269,6 +276,7 @@ out_put_node:
>>
>> static int cpu0_cpufreq_remove(struct platform_device *pdev)
>> {
>> + cpufreq_cooling_unregister(cdev);
>> cpufreq_unregister_driver(&cpu0_cpufreq_driver);
>> opp_free_cpufreq_table(cpu_dev, &freq_table);
>>
>>> For instance, assuming that all systems will need a cpufreq cooling
>>> device is a flaw, because that is not the case. Thus, it makes sense to
>>> have a property, say at the cpu node, to determine that it needs
>>> cooling. However, that won't be saying how it would cool off.
>>
>>
>> Then you would define your cpu0 node as:
>>
>> cpu@0 {
>> /* OMAP443x variants OPP50-OPPNT */
>> operating-points = <
>> /* kHz uV */
>> 300000 1025000
>> 600000 1200000
>> 800000 1313000
>> 1008000 1375000
>> >;
>> clock-latency = <300000>; /* From legacy driver */
>> needs-cooling; /* make sure we have cpufreq-cooling */
>> };
>>
>> Because in that system we actually need to take care of the cpu thermal.
>>
> I don't see what not registering the cooling device is buying us (aside
> from a small resource saving). The cpu is one potential source of heat
> in a system, so we may want to reference it in a thermal zone, so to me
> it makes sense to always register the cooling device.
The 'aside from a small resource saving' that bugs me :-). And
conceptually, to me it won't be correct to load stuff you don't need,
specially the 'always' loading part of it.
>
>>
>>>
>>>
>>>>
>>>>> I could try to push something following the same idea as the one I am
>>>>> trying to sell with this series for sensor devices. For instance, in a
>>>>> sensor node I am attaching a phandle to describe how thermal fw must
>>>>> behave. Then the sensor driver it is supposed to load the thermal data
>>>>> into the thermal fw. Same could apply for instance for cpufreq cooling
>>>>> device. at the cpu node we could have a 'cooling_device' node at the cpu
>>>>> node, while loading cpufreq-cpu0.
>>>>
>>>> I think a separate cooling_device node may be only necessary if we stuff
>>>> additional info in there. If it's just a plain cooling device I think it
>>>> is reasonable for the cpufreq driver to just register a cooling device
>>>> if the thermal framework is there.
>>>
>>> no, I think this is not what we want, because, as I said, not all cpus
>>> will need cooling. Just because the thermal framework is there does not
>>> mean your cpu needs cooling. As you can see, the thermal framework is
>>> not only for cpu cooling. It can be used for any other thermal need.
>>> Besides one needs to cover for the case where you are building for
>>> multiple platform support. Assuming system needs based on Kconfig setup
>>> is not very likely to scale in this case.
>>>
>>>>
>>>> I would really like the information about a thermal zone to hang off one
>>>> dt node rather than being scattered over several nodes. This way it may
>>>
>>> Again, thermal framework is not about only cpu(freq) cooling. Thermal
>>> zone info can (and will) be hanged off in one dt node. But please don't
>>> mix concepts. Just because a cooling device is part of a thermal zone,
>>> it does not mean it is only used there and that it can be defined there.
>>> One can use a cooling device in different thermal zones.
>>>
>>>> be easy to reference a cooling device in different thermal zones with
>>>> different weight, etc. As long as we define a thermal zone to always be
>>>> defined by a single sensor the right place seems to be the proposed
>>>> subnode to the sensor. If we want a zone to have more than one sensor,
>>>> we might even want a separate dt node for the thermal zone, referencing
>>>> both sensors and cooling devices through phandles.
>>>
>>> I still don't get why and how defining a thermal zone inside a sensor
>>> phandle can prevent us defining a cooling device in different device
>>> phandle.
>>
>>
>> Then you can keep everything about your thermal zone in one single
>> phandle, as follows, but remember, this is is the info about the thermal
>> zone, not about a cooling device. For instance, that is the zone built
>> on top of a bandgap sensor:
>> bandgap {
>> reg = <0x4a002260 0x4 0x4a00232C 0x4>;
>> compatible = "ti,omap4430-bandgap";
>> thermal_zone {
>> type = "CPU";
>> mask = <0x03>; /* trips writability */
>> passive_delay = <250>; /* milliseconds */
>> polling_delay = <1000>; /* milliseconds */
>> governor = "step_wise";
>> trips {
>> alert@100000{
>> temperature = <100000>;
>> hysteresis = <0>;
>> type = <1>;
>> };
>> crit@125000{
>> temperature = <125000>;
>> hysteresis = <0>;
>> type = <3>;
>> };
>> };
>> bind_params {
>> action@0{
>> cooling_device = "thermal-cpufreq";
>> weight = <100>; /* percentage */
>> mask = <0x01>;
>> };
>> };
>> };
>> };
>>
>>
>> And you see that, in this case, the bandgap sensor driver does not need
>> to worry about loading the cpufreq cooling device anymore. Who is
>> responsible of doing that is the cpufreq driver, with the above
>> proposal, when it makes sense and when there is a need.
>
> Yes, this makes perfect sense to me. What I would like is to have the
> links more specific in the devicetree, so to me this stringmatching
> thing doesn't look too appealing, as it makes it harder to follow the
> links just looking at the DT. That's why I would prefer them to be
> phandles, so I could do something like:
>
> bind_params {
> action@0 {
> cooling_device = <&cpu@0>;
> weight = <40>; /* percentage */
> mask = <0x01>;
> };
> action@1 {
> cooling_device = <&gpu3d>;
> weigth = <60>;
> mask = <0x01>;
> };
>
I see, but the matching won't work at device tree anyway. But I
understand your point. However, those would need to be 'cooling device'
phandles, not 'cpu' phandles or 'gpu3d' phandles, in order to this make
really sense.
--
You have got to be excited about what you are doing. (L. Lamport)
Eduardo Valentin
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 295 bytes --]
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [RFC PATCH 3/4] thermal: ti-soc-thermal: use thermal DT infrastructure
2013-07-15 14:14 ` Eduardo Valentin
@ 2013-07-16 9:54 ` Lucas Stach
2013-07-16 13:29 ` Eduardo Valentin
0 siblings, 1 reply; 33+ messages in thread
From: Lucas Stach @ 2013-07-16 9:54 UTC (permalink / raw)
To: Eduardo Valentin; +Cc: linux-pm
Hi Eduardo,
Am Montag, den 15.07.2013, 10:14 -0400 schrieb Eduardo Valentin:
> On 15-07-2013 10:05, Lucas Stach wrote:
> > Am Montag, den 15.07.2013, 09:36 -0400 schrieb Eduardo Valentin:
> > [...]
> >>
> >>
> >> as simple as the following:
> >> diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c
> >> index 3ab8294..486881c 100644
> >> --- a/drivers/cpufreq/cpufreq-cpu0.c
> >> +++ b/drivers/cpufreq/cpufreq-cpu0.c
> >> @@ -20,6 +20,9 @@
> >> #include <linux/platform_device.h>
> >> #include <linux/regulator/consumer.h>
> >> #include <linux/slab.h>
> >> +#include <linux/thermal.h>
> >> +#include <linux/cpu_cooling.h>
> >> +#include <linux/cpumask.h>
> >>
> >> static unsigned int transition_latency;
> >> static unsigned int voltage_tolerance; /* in percentage */
> >> @@ -28,6 +31,7 @@ static struct device *cpu_dev;
> >> static struct clk *cpu_clk;
> >> static struct regulator *cpu_reg;
> >> static struct cpufreq_frequency_table *freq_table;
> >> +static struct thermal_cooling_device *cdev;
> >>
> >> static int cpu0_verify_speed(struct cpufreq_policy *policy)
> >> {
> >> @@ -256,6 +260,9 @@ static int cpu0_cpufreq_probe(struct platform_device
> >> *pdev)
> >> goto out_free_table;
> >> }
> >>
> >> + if (!of_property_read_bool(np, "needs-cooling"))
> >> + cdev = cpufreq_cooling_register(cpu_present_mask);
> >> +
> >> of_node_put(np);
> >> of_node_put(parent);
> >> return 0;
> >> @@ -269,6 +276,7 @@ out_put_node:
> >>
> >> static int cpu0_cpufreq_remove(struct platform_device *pdev)
> >> {
> >> + cpufreq_cooling_unregister(cdev);
> >> cpufreq_unregister_driver(&cpu0_cpufreq_driver);
> >> opp_free_cpufreq_table(cpu_dev, &freq_table);
> >>
> >>> For instance, assuming that all systems will need a cpufreq cooling
> >>> device is a flaw, because that is not the case. Thus, it makes sense to
> >>> have a property, say at the cpu node, to determine that it needs
> >>> cooling. However, that won't be saying how it would cool off.
> >>
> >>
> >> Then you would define your cpu0 node as:
> >>
> >> cpu@0 {
> >> /* OMAP443x variants OPP50-OPPNT */
> >> operating-points = <
> >> /* kHz uV */
> >> 300000 1025000
> >> 600000 1200000
> >> 800000 1313000
> >> 1008000 1375000
> >> >;
> >> clock-latency = <300000>; /* From legacy driver */
> >> needs-cooling; /* make sure we have cpufreq-cooling */
> >> };
> >>
> >> Because in that system we actually need to take care of the cpu thermal.
> >>
> > I don't see what not registering the cooling device is buying us (aside
> > from a small resource saving). The cpu is one potential source of heat
> > in a system, so we may want to reference it in a thermal zone, so to me
> > it makes sense to always register the cooling device.
>
> The 'aside from a small resource saving' that bugs me :-). And
> conceptually, to me it won't be correct to load stuff you don't need,
> specially the 'always' loading part of it.
>
Hm, while thinking about this I agree. We should try to come up with
some property that can be used across different devices. My feeling is
that "needs-cooling" is a bit of a misnomer, as not the CPU/GPU/whatever
node needs cooling, but the thermal zone. The devices themselves are
just sources of heat in that thermal zone, so a name like
"enable-thermal-cooling" or something might be more appropriate.
> >
> >>
> >>>
> >>>
> >>>>
> >>>>> I could try to push something following the same idea as the one I am
> >>>>> trying to sell with this series for sensor devices. For instance, in a
> >>>>> sensor node I am attaching a phandle to describe how thermal fw must
> >>>>> behave. Then the sensor driver it is supposed to load the thermal data
> >>>>> into the thermal fw. Same could apply for instance for cpufreq cooling
> >>>>> device. at the cpu node we could have a 'cooling_device' node at the cpu
> >>>>> node, while loading cpufreq-cpu0.
> >>>>
> >>>> I think a separate cooling_device node may be only necessary if we stuff
> >>>> additional info in there. If it's just a plain cooling device I think it
> >>>> is reasonable for the cpufreq driver to just register a cooling device
> >>>> if the thermal framework is there.
> >>>
> >>> no, I think this is not what we want, because, as I said, not all cpus
> >>> will need cooling. Just because the thermal framework is there does not
> >>> mean your cpu needs cooling. As you can see, the thermal framework is
> >>> not only for cpu cooling. It can be used for any other thermal need.
> >>> Besides one needs to cover for the case where you are building for
> >>> multiple platform support. Assuming system needs based on Kconfig setup
> >>> is not very likely to scale in this case.
> >>>
> >>>>
> >>>> I would really like the information about a thermal zone to hang off one
> >>>> dt node rather than being scattered over several nodes. This way it may
> >>>
> >>> Again, thermal framework is not about only cpu(freq) cooling. Thermal
> >>> zone info can (and will) be hanged off in one dt node. But please don't
> >>> mix concepts. Just because a cooling device is part of a thermal zone,
> >>> it does not mean it is only used there and that it can be defined there.
> >>> One can use a cooling device in different thermal zones.
> >>>
> >>>> be easy to reference a cooling device in different thermal zones with
> >>>> different weight, etc. As long as we define a thermal zone to always be
> >>>> defined by a single sensor the right place seems to be the proposed
> >>>> subnode to the sensor. If we want a zone to have more than one sensor,
> >>>> we might even want a separate dt node for the thermal zone, referencing
> >>>> both sensors and cooling devices through phandles.
> >>>
> >>> I still don't get why and how defining a thermal zone inside a sensor
> >>> phandle can prevent us defining a cooling device in different device
> >>> phandle.
> >>
> >>
> >> Then you can keep everything about your thermal zone in one single
> >> phandle, as follows, but remember, this is is the info about the thermal
> >> zone, not about a cooling device. For instance, that is the zone built
> >> on top of a bandgap sensor:
> >> bandgap {
> >> reg = <0x4a002260 0x4 0x4a00232C 0x4>;
> >> compatible = "ti,omap4430-bandgap";
> >> thermal_zone {
> >> type = "CPU";
> >> mask = <0x03>; /* trips writability */
> >> passive_delay = <250>; /* milliseconds */
> >> polling_delay = <1000>; /* milliseconds */
> >> governor = "step_wise";
> >> trips {
> >> alert@100000{
> >> temperature = <100000>;
> >> hysteresis = <0>;
> >> type = <1>;
> >> };
> >> crit@125000{
> >> temperature = <125000>;
> >> hysteresis = <0>;
> >> type = <3>;
> >> };
> >> };
> >> bind_params {
> >> action@0{
> >> cooling_device = "thermal-cpufreq";
> >> weight = <100>; /* percentage */
> >> mask = <0x01>;
> >> };
> >> };
> >> };
> >> };
> >>
> >>
> >> And you see that, in this case, the bandgap sensor driver does not need
> >> to worry about loading the cpufreq cooling device anymore. Who is
> >> responsible of doing that is the cpufreq driver, with the above
> >> proposal, when it makes sense and when there is a need.
> >
> > Yes, this makes perfect sense to me. What I would like is to have the
> > links more specific in the devicetree, so to me this stringmatching
> > thing doesn't look too appealing, as it makes it harder to follow the
> > links just looking at the DT. That's why I would prefer them to be
> > phandles, so I could do something like:
> >
> > bind_params {
> > action@0 {
> > cooling_device = <&cpu@0>;
> > weight = <40>; /* percentage */
> > mask = <0x01>;
> > };
> > action@1 {
> > cooling_device = <&gpu3d>;
> > weigth = <60>;
> > mask = <0x01>;
> > };
> >
>
> I see, but the matching won't work at device tree anyway. But I
> understand your point. However, those would need to be 'cooling device'
> phandles, not 'cpu' phandles or 'gpu3d' phandles, in order to this make
> really sense.
>
I tend to disagree here. The devices themselves are the source of heat
and need to be instructed to cool down, not some virtual cooling device
on top of them. Also we should try to avoid to push implementation
specific things into the devicetree. Cooling devices are just some
arbitrary abstraction made up by the thermal framework, cpu and gpu
nodes are real hardware and thus the thing that should be in the DT.
Regards,
Lucas
--
Pengutronix e.K. | Lucas Stach |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-5076 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [RFC PATCH 3/4] thermal: ti-soc-thermal: use thermal DT infrastructure
2013-07-16 9:54 ` Lucas Stach
@ 2013-07-16 13:29 ` Eduardo Valentin
0 siblings, 0 replies; 33+ messages in thread
From: Eduardo Valentin @ 2013-07-16 13:29 UTC (permalink / raw)
To: Lucas Stach; +Cc: Eduardo Valentin, linux-pm
[-- Attachment #1: Type: text/plain, Size: 10045 bytes --]
Hello Lucas,
On 16-07-2013 05:54, Lucas Stach wrote:
> Hi Eduardo,
>
> Am Montag, den 15.07.2013, 10:14 -0400 schrieb Eduardo Valentin:
>> On 15-07-2013 10:05, Lucas Stach wrote:
>>> Am Montag, den 15.07.2013, 09:36 -0400 schrieb Eduardo Valentin:
>>> [...]
>>>>
>>>>
>>>> as simple as the following:
>>>> diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c
>>>> index 3ab8294..486881c 100644
>>>> --- a/drivers/cpufreq/cpufreq-cpu0.c
>>>> +++ b/drivers/cpufreq/cpufreq-cpu0.c
>>>> @@ -20,6 +20,9 @@
>>>> #include <linux/platform_device.h>
>>>> #include <linux/regulator/consumer.h>
>>>> #include <linux/slab.h>
>>>> +#include <linux/thermal.h>
>>>> +#include <linux/cpu_cooling.h>
>>>> +#include <linux/cpumask.h>
>>>>
>>>> static unsigned int transition_latency;
>>>> static unsigned int voltage_tolerance; /* in percentage */
>>>> @@ -28,6 +31,7 @@ static struct device *cpu_dev;
>>>> static struct clk *cpu_clk;
>>>> static struct regulator *cpu_reg;
>>>> static struct cpufreq_frequency_table *freq_table;
>>>> +static struct thermal_cooling_device *cdev;
>>>>
>>>> static int cpu0_verify_speed(struct cpufreq_policy *policy)
>>>> {
>>>> @@ -256,6 +260,9 @@ static int cpu0_cpufreq_probe(struct platform_device
>>>> *pdev)
>>>> goto out_free_table;
>>>> }
>>>>
>>>> + if (!of_property_read_bool(np, "needs-cooling"))
>>>> + cdev = cpufreq_cooling_register(cpu_present_mask);
>>>> +
>>>> of_node_put(np);
>>>> of_node_put(parent);
>>>> return 0;
>>>> @@ -269,6 +276,7 @@ out_put_node:
>>>>
>>>> static int cpu0_cpufreq_remove(struct platform_device *pdev)
>>>> {
>>>> + cpufreq_cooling_unregister(cdev);
>>>> cpufreq_unregister_driver(&cpu0_cpufreq_driver);
>>>> opp_free_cpufreq_table(cpu_dev, &freq_table);
>>>>
>>>>> For instance, assuming that all systems will need a cpufreq cooling
>>>>> device is a flaw, because that is not the case. Thus, it makes sense to
>>>>> have a property, say at the cpu node, to determine that it needs
>>>>> cooling. However, that won't be saying how it would cool off.
>>>>
>>>>
>>>> Then you would define your cpu0 node as:
>>>>
>>>> cpu@0 {
>>>> /* OMAP443x variants OPP50-OPPNT */
>>>> operating-points = <
>>>> /* kHz uV */
>>>> 300000 1025000
>>>> 600000 1200000
>>>> 800000 1313000
>>>> 1008000 1375000
>>>> >;
>>>> clock-latency = <300000>; /* From legacy driver */
>>>> needs-cooling; /* make sure we have cpufreq-cooling */
>>>> };
>>>>
>>>> Because in that system we actually need to take care of the cpu thermal.
>>>>
>>> I don't see what not registering the cooling device is buying us (aside
>>> from a small resource saving). The cpu is one potential source of heat
>>> in a system, so we may want to reference it in a thermal zone, so to me
>>> it makes sense to always register the cooling device.
>>
>> The 'aside from a small resource saving' that bugs me :-). And
>> conceptually, to me it won't be correct to load stuff you don't need,
>> specially the 'always' loading part of it.
>>
> Hm, while thinking about this I agree. We should try to come up with
> some property that can be used across different devices. My feeling is
> that "needs-cooling" is a bit of a misnomer, as not the CPU/GPU/whatever
> node needs cooling, but the thermal zone. The devices themselves are
> just sources of heat in that thermal zone, so a name like
> "enable-thermal-cooling" or something might be more appropriate.
They are heat sources, agreed, but they also need cooling. Again, they
can generate heat, one can throttle their dissipated power, but they
are not cooling devices. Cooling devices are virtual concepts, in this
case, that modulates the power dissipated by these heat generating
devices. "enable-thermal-cooling" looks like some switch/knob one would
see in a cooling device.
>
>>>
>>>>
>>>>>
>>>>>
>>>>>>
>>>>>>> I could try to push something following the same idea as the one I am
>>>>>>> trying to sell with this series for sensor devices. For instance, in a
>>>>>>> sensor node I am attaching a phandle to describe how thermal fw must
>>>>>>> behave. Then the sensor driver it is supposed to load the thermal data
>>>>>>> into the thermal fw. Same could apply for instance for cpufreq cooling
>>>>>>> device. at the cpu node we could have a 'cooling_device' node at the cpu
>>>>>>> node, while loading cpufreq-cpu0.
>>>>>>
>>>>>> I think a separate cooling_device node may be only necessary if we stuff
>>>>>> additional info in there. If it's just a plain cooling device I think it
>>>>>> is reasonable for the cpufreq driver to just register a cooling device
>>>>>> if the thermal framework is there.
>>>>>
>>>>> no, I think this is not what we want, because, as I said, not all cpus
>>>>> will need cooling. Just because the thermal framework is there does not
>>>>> mean your cpu needs cooling. As you can see, the thermal framework is
>>>>> not only for cpu cooling. It can be used for any other thermal need.
>>>>> Besides one needs to cover for the case where you are building for
>>>>> multiple platform support. Assuming system needs based on Kconfig setup
>>>>> is not very likely to scale in this case.
>>>>>
>>>>>>
>>>>>> I would really like the information about a thermal zone to hang off one
>>>>>> dt node rather than being scattered over several nodes. This way it may
>>>>>
>>>>> Again, thermal framework is not about only cpu(freq) cooling. Thermal
>>>>> zone info can (and will) be hanged off in one dt node. But please don't
>>>>> mix concepts. Just because a cooling device is part of a thermal zone,
>>>>> it does not mean it is only used there and that it can be defined there.
>>>>> One can use a cooling device in different thermal zones.
>>>>>
>>>>>> be easy to reference a cooling device in different thermal zones with
>>>>>> different weight, etc. As long as we define a thermal zone to always be
>>>>>> defined by a single sensor the right place seems to be the proposed
>>>>>> subnode to the sensor. If we want a zone to have more than one sensor,
>>>>>> we might even want a separate dt node for the thermal zone, referencing
>>>>>> both sensors and cooling devices through phandles.
>>>>>
>>>>> I still don't get why and how defining a thermal zone inside a sensor
>>>>> phandle can prevent us defining a cooling device in different device
>>>>> phandle.
>>>>
>>>>
>>>> Then you can keep everything about your thermal zone in one single
>>>> phandle, as follows, but remember, this is is the info about the thermal
>>>> zone, not about a cooling device. For instance, that is the zone built
>>>> on top of a bandgap sensor:
>>>> bandgap {
>>>> reg = <0x4a002260 0x4 0x4a00232C 0x4>;
>>>> compatible = "ti,omap4430-bandgap";
>>>> thermal_zone {
>>>> type = "CPU";
>>>> mask = <0x03>; /* trips writability */
>>>> passive_delay = <250>; /* milliseconds */
>>>> polling_delay = <1000>; /* milliseconds */
>>>> governor = "step_wise";
>>>> trips {
>>>> alert@100000{
>>>> temperature = <100000>;
>>>> hysteresis = <0>;
>>>> type = <1>;
>>>> };
>>>> crit@125000{
>>>> temperature = <125000>;
>>>> hysteresis = <0>;
>>>> type = <3>;
>>>> };
>>>> };
>>>> bind_params {
>>>> action@0{
>>>> cooling_device = "thermal-cpufreq";
>>>> weight = <100>; /* percentage */
>>>> mask = <0x01>;
>>>> };
>>>> };
>>>> };
>>>> };
>>>>
>>>>
>>>> And you see that, in this case, the bandgap sensor driver does not need
>>>> to worry about loading the cpufreq cooling device anymore. Who is
>>>> responsible of doing that is the cpufreq driver, with the above
>>>> proposal, when it makes sense and when there is a need.
>>>
>>> Yes, this makes perfect sense to me. What I would like is to have the
>>> links more specific in the devicetree, so to me this stringmatching
>>> thing doesn't look too appealing, as it makes it harder to follow the
>>> links just looking at the DT. That's why I would prefer them to be
>>> phandles, so I could do something like:
>>>
>>> bind_params {
>>> action@0 {
>>> cooling_device = <&cpu@0>;
>>> weight = <40>; /* percentage */
>>> mask = <0x01>;
>>> };
>>> action@1 {
>>> cooling_device = <&gpu3d>;
>>> weigth = <60>;
>>> mask = <0x01>;
>>> };
>>>
>>
>> I see, but the matching won't work at device tree anyway. But I
>> understand your point. However, those would need to be 'cooling device'
>> phandles, not 'cpu' phandles or 'gpu3d' phandles, in order to this make
>> really sense.
>>
> I tend to disagree here. The devices themselves are the source of heat
> and need to be instructed to cool down, not some virtual cooling device
> on top of them. Also we should try to avoid to push implementation
> specific things into the devicetree. Cooling devices are just some
> arbitrary abstraction made up by the thermal framework, cpu and gpu
> nodes are real hardware and thus the thing that should be in the DT.
Well, that's exactly my point. We are again making the same points. We
should not have phandles for things like cooling devices, as they are
virtual devices.
However, one disagreement here, when you construct something like:
cooling_device = <&gpu3d>;
To me, reading that, means gpu3d is a cooling device, which in fact is
not. That is why I said, in order for the above really make sense, gpu3d
would need to be a cooling device phandle, which to me is wrong to put
inside device tree. Thus, I believe using the string matching in the C
code is still a better way to go, because creating phandles for cooling
devices is a bit of a stretching.
>
> Regards,
> Lucas
>
--
You have got to be excited about what you are doing. (L. Lamport)
Eduardo Valentin
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 295 bytes --]
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [RFC PATCH 3/4] thermal: ti-soc-thermal: use thermal DT infrastructure
2013-07-15 13:25 ` Eduardo Valentin
2013-07-15 13:36 ` Eduardo Valentin
@ 2013-07-15 13:53 ` Lucas Stach
2013-07-15 14:09 ` Eduardo Valentin
1 sibling, 1 reply; 33+ messages in thread
From: Lucas Stach @ 2013-07-15 13:53 UTC (permalink / raw)
To: Eduardo Valentin; +Cc: linux-pm
Am Montag, den 15.07.2013, 09:25 -0400 schrieb Eduardo Valentin:
> On 15-07-2013 08:59, Lucas Stach wrote:
> > Am Montag, den 15.07.2013, 08:33 -0400 schrieb Eduardo Valentin:
> >> On 15-07-2013 08:12, Lucas Stach wrote:
> >>> Hi Eduardo and others,
> >>>
> >>> Eduardo Valentin <eduardo.valentin <at> ti.com> writes:
> >>>
> >>>>
> >>>> This patch improves the ti-soc-thermal driver by adding the
> >>>> support to build the thermal zones based on DT nodes.
> >>>>
> >>>> The driver will have two options now to build the thermal
> >>>> zones. The first option is the zones originally coded
> >>>> in this driver. So, the driver behavior will be same
> >>>> if there is no DT node describing the zones. The second
> >>>> option, when it is found a DT node with thermal data,
> >>>> will used the common infrastructure to build the thermal
> >>>> zone and bind its cooling devices.
> >>>>
> >>>> In either case, this driver still adds to the system
> >>>> a cpufreq cooling device.
> >>>>
> >>>
> >>> I really like the idea to configure thermal zones using devicetree, it's a
> >>> step in the right direction. We might follow suit with the i.MX6 tempmon
> >>> driver to use this infrastructure.
> >>>
> >>> What I strongly dislike is the notion of the sensor drivers instantiating
> >>> the cooling devices and the resulting devicetree binding. This seems really
> >>> backward to me.
> >>> I would rather see the drivers associated with the cooling devices (like
> >>> cpufreq and the respective gpu drivers) to instantiate the cooling devices
> >>> and the thermal zone referring to them through phandles. I think it
> >>> shouldn't be too much work to go in that direction.
> >>> The current method might be enough to work with the current thermal platform
> >>> drivers, but if you want to go down the route to eventually use plain i2c
> >>> devices (likely with an existing hwmon driver) you have to get away from the
> >>> sensor devices instantiating the cooling devices.
> >>
> >> I agree with you. While implementing the RFC, it looks awkward that the
> >> ti-soc-thermal driver had to do the job to load the cpufreq-cooling
> >> device. Problem is that a cooling device is not really a real device,
> >> and might get flamed while represented as a device tree node.
> >>
> > I don't think we even need to represent this into the device tree. We
> > already have the CPU nodes there and the cpu-freq driver is already
> > linked to those. It should be easy to have a global list of registered
> > thermal devices in the thermal framework together with their associated
> > devices, so one could look up cooling devices through the thermal
> > framework when we only have a phandle to the cpu node.
>
> Well, we do have a list of thermal cooling devices associated with its
> corresponding struct device. That is private data to the thermal
> framework. However, one needs to load the cooling device in order to its
> data structure appear in this list. The framework can not be proactive
> here. Some other entity needs to see the need and inform the thermal
> framework of it.
>
That's why I said it would be a good idea (IMHO) if the cpufreq driver
would register the cooling device.
> For instance, assuming that all systems will need a cpufreq cooling
> device is a flaw, because that is not the case. Thus, it makes sense to
> have a property, say at the cpu node, to determine that it needs
> cooling. However, that won't be saying how it would cool off.
>
Maybe I'm not up to speed with the thermal framework yet (just starting
to look into this), but isn't it the other way around? The thermal zone
is defined by the sensor providing temp readings and trip points. The
CPUs may be just one source of heat in the thermal zone, thus they have
to register a cooling device with the thermalfw, so they can be
throttled if the zone crosses a certain trip point.
I don't see how it would be problematic if the cpufreq driver just
always registers the cooling devices. If no thermal zone references them
they are of no use, but they are also not causing any harm.(?)
>
> >
> >> I could try to push something following the same idea as the one I am
> >> trying to sell with this series for sensor devices. For instance, in a
> >> sensor node I am attaching a phandle to describe how thermal fw must
> >> behave. Then the sensor driver it is supposed to load the thermal data
> >> into the thermal fw. Same could apply for instance for cpufreq cooling
> >> device. at the cpu node we could have a 'cooling_device' node at the cpu
> >> node, while loading cpufreq-cpu0.
> >
> > I think a separate cooling_device node may be only necessary if we stuff
> > additional info in there. If it's just a plain cooling device I think it
> > is reasonable for the cpufreq driver to just register a cooling device
> > if the thermal framework is there.
>
> no, I think this is not what we want, because, as I said, not all cpus
> will need cooling. Just because the thermal framework is there does not
> mean your cpu needs cooling. As you can see, the thermal framework is
> not only for cpu cooling. It can be used for any other thermal need.
> Besides one needs to cover for the case where you are building for
> multiple platform support. Assuming system needs based on Kconfig setup
> is not very likely to scale in this case.
>
Mhm, I think we have a bit of a misunderstanding here. I don't see how
always registering the cooling devices from the cpufreq driver would be
in the way of multiplatform support. In fact if I know the cpufreq
registers the cooling device I can just reference the CPU node from
whatever thermal zone the particular platform happens to define.
> >
> > I would really like the information about a thermal zone to hang off one
> > dt node rather than being scattered over several nodes. This way it may
>
> Again, thermal framework is not about only cpu(freq) cooling. Thermal
> zone info can (and will) be hanged off in one dt node. But please don't
> mix concepts. Just because a cooling device is part of a thermal zone,
> it does not mean it is only used there and that it can be defined there.
> One can use a cooling device in different thermal zones.
>
That's exactly what I want, so we seem to be on the same page.
I'm fine with having subnodes for the cooling devices, if we need to
stuff some sort of info in there. I'm just not sure if we need those
nodes at all, or if would be ok for the device drivers (cpufreq, gpu,
memory controller, etc.) to just register the cooling devices and
thermal zones to then look them up through the phandles of those parent
devices.
Again, I'm not an expert with this topic, just want to provide my view,
so we can work something out, which works for everybody on multiple
platforms.
> > be easy to reference a cooling device in different thermal zones with
> > different weight, etc. As long as we define a thermal zone to always be
> > defined by a single sensor the right place seems to be the proposed
> > subnode to the sensor. If we want a zone to have more than one sensor,
> > we might even want a separate dt node for the thermal zone, referencing
> > both sensors and cooling devices through phandles.
>
> I still don't get why and how defining a thermal zone inside a sensor
> phandle can prevent us defining a cooling device in different device
> phandle.
>
I'm not saying this. What I said is that if we define the thermal zone
inside the sensor node it's inherently bound to this single sensor,
which is completely fine, as long as we keep the current definition of
one thermal zone per sensor. It's just that I stumbled about the
proposal to have more than one sensor per thermal zone. For this to work
we would have to define the thermal zone in it's own node, so that we
can reference multiple sensors. I just wanted to point this out, as it
seems fundamental to the design of the dt binding. Personally I'm fine
either way.
Regards,
Lucas
--
Pengutronix e.K. | Lucas Stach |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-5076 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [RFC PATCH 3/4] thermal: ti-soc-thermal: use thermal DT infrastructure
2013-07-15 13:53 ` Lucas Stach
@ 2013-07-15 14:09 ` Eduardo Valentin
0 siblings, 0 replies; 33+ messages in thread
From: Eduardo Valentin @ 2013-07-15 14:09 UTC (permalink / raw)
To: Lucas Stach; +Cc: Eduardo Valentin, linux-pm
[-- Attachment #1: Type: text/plain, Size: 9438 bytes --]
Hi Lucas,
On 15-07-2013 09:53, Lucas Stach wrote:
> Am Montag, den 15.07.2013, 09:25 -0400 schrieb Eduardo Valentin:
>> On 15-07-2013 08:59, Lucas Stach wrote:
>>> Am Montag, den 15.07.2013, 08:33 -0400 schrieb Eduardo Valentin:
>>>> On 15-07-2013 08:12, Lucas Stach wrote:
>>>>> Hi Eduardo and others,
>>>>>
>>>>> Eduardo Valentin <eduardo.valentin <at> ti.com> writes:
>>>>>
>>>>>>
>>>>>> This patch improves the ti-soc-thermal driver by adding the
>>>>>> support to build the thermal zones based on DT nodes.
>>>>>>
>>>>>> The driver will have two options now to build the thermal
>>>>>> zones. The first option is the zones originally coded
>>>>>> in this driver. So, the driver behavior will be same
>>>>>> if there is no DT node describing the zones. The second
>>>>>> option, when it is found a DT node with thermal data,
>>>>>> will used the common infrastructure to build the thermal
>>>>>> zone and bind its cooling devices.
>>>>>>
>>>>>> In either case, this driver still adds to the system
>>>>>> a cpufreq cooling device.
>>>>>>
>>>>>
>>>>> I really like the idea to configure thermal zones using devicetree, it's a
>>>>> step in the right direction. We might follow suit with the i.MX6 tempmon
>>>>> driver to use this infrastructure.
>>>>>
>>>>> What I strongly dislike is the notion of the sensor drivers instantiating
>>>>> the cooling devices and the resulting devicetree binding. This seems really
>>>>> backward to me.
>>>>> I would rather see the drivers associated with the cooling devices (like
>>>>> cpufreq and the respective gpu drivers) to instantiate the cooling devices
>>>>> and the thermal zone referring to them through phandles. I think it
>>>>> shouldn't be too much work to go in that direction.
>>>>> The current method might be enough to work with the current thermal platform
>>>>> drivers, but if you want to go down the route to eventually use plain i2c
>>>>> devices (likely with an existing hwmon driver) you have to get away from the
>>>>> sensor devices instantiating the cooling devices.
>>>>
>>>> I agree with you. While implementing the RFC, it looks awkward that the
>>>> ti-soc-thermal driver had to do the job to load the cpufreq-cooling
>>>> device. Problem is that a cooling device is not really a real device,
>>>> and might get flamed while represented as a device tree node.
>>>>
>>> I don't think we even need to represent this into the device tree. We
>>> already have the CPU nodes there and the cpu-freq driver is already
>>> linked to those. It should be easy to have a global list of registered
>>> thermal devices in the thermal framework together with their associated
>>> devices, so one could look up cooling devices through the thermal
>>> framework when we only have a phandle to the cpu node.
>>
>> Well, we do have a list of thermal cooling devices associated with its
>> corresponding struct device. That is private data to the thermal
>> framework. However, one needs to load the cooling device in order to its
>> data structure appear in this list. The framework can not be proactive
>> here. Some other entity needs to see the need and inform the thermal
>> framework of it.
>>
> That's why I said it would be a good idea (IMHO) if the cpufreq driver
> would register the cooling device.
>
Ok. we are at the same page. cpufreq driver needs to load cpufreq
cooling device to the thermal fw.
>> For instance, assuming that all systems will need a cpufreq cooling
>> device is a flaw, because that is not the case. Thus, it makes sense to
>> have a property, say at the cpu node, to determine that it needs
>> cooling. However, that won't be saying how it would cool off.
>>
> Maybe I'm not up to speed with the thermal framework yet (just starting
> to look into this), but isn't it the other way around? The thermal zone
> is defined by the sensor providing temp readings and trip points. The
> CPUs may be just one source of heat in the thermal zone, thus they have
> to register a cooling device with the thermalfw, so they can be
> throttled if the zone crosses a certain trip point.
>
The above statement is correct.
> I don't see how it would be problematic if the cpufreq driver just
> always registers the cooling devices. If no thermal zone references them
> they are of no use, but they are also not causing any harm.(?)
Harm it won't cause, but it will be loading something to a system that
it does not need. Simply said, what I am proposing is to have a way to
say to cpufreq driver to load cpufreq cooling only on those systems that
needs cooling.
>>
>>>
>>>> I could try to push something following the same idea as the one I am
>>>> trying to sell with this series for sensor devices. For instance, in a
>>>> sensor node I am attaching a phandle to describe how thermal fw must
>>>> behave. Then the sensor driver it is supposed to load the thermal data
>>>> into the thermal fw. Same could apply for instance for cpufreq cooling
>>>> device. at the cpu node we could have a 'cooling_device' node at the cpu
>>>> node, while loading cpufreq-cpu0.
>>>
>>> I think a separate cooling_device node may be only necessary if we stuff
>>> additional info in there. If it's just a plain cooling device I think it
>>> is reasonable for the cpufreq driver to just register a cooling device
>>> if the thermal framework is there.
>>
>> no, I think this is not what we want, because, as I said, not all cpus
>> will need cooling. Just because the thermal framework is there does not
>> mean your cpu needs cooling. As you can see, the thermal framework is
>> not only for cpu cooling. It can be used for any other thermal need.
>> Besides one needs to cover for the case where you are building for
>> multiple platform support. Assuming system needs based on Kconfig setup
>> is not very likely to scale in this case.
>>
> Mhm, I think we have a bit of a misunderstanding here. I don't see how
> always registering the cooling devices from the cpufreq driver would be
> in the way of multiplatform support. In fact if I know the cpufreq
> registers the cooling device I can just reference the CPU node from
> whatever thermal zone the particular platform happens to define.
Again, it wont cause harm or wont be in the way, but we could be loading
stuff that the system does not need. And we could avoid that with a
simple flag.
Yes, when you have to cool off the cpu in you system, you have to:
1. ask cpufreq driver to load cpufreq cooling
2. describe what to do with cpufreq cooling device when your sensor
detects heat (by referencing cpufreq cooling device).
>
>>>
>>> I would really like the information about a thermal zone to hang off one
>>> dt node rather than being scattered over several nodes. This way it may
>>
>> Again, thermal framework is not about only cpu(freq) cooling. Thermal
>> zone info can (and will) be hanged off in one dt node. But please don't
>> mix concepts. Just because a cooling device is part of a thermal zone,
>> it does not mean it is only used there and that it can be defined there.
>> One can use a cooling device in different thermal zones.
>>
> That's exactly what I want, so we seem to be on the same page.
>
ok
> I'm fine with having subnodes for the cooling devices, if we need to
> stuff some sort of info in there. I'm just not sure if we need those
> nodes at all, or if would be ok for the device drivers (cpufreq, gpu,
> memory controller, etc.) to just register the cooling devices and
> thermal zones to then look them up through the phandles of those parent
> devices.
Some ppl just don't want kernel to mess around with thermal for
instance. Sometimes, your driver supports several chip versions, and
some of them do have thermal needs, some don't. That's why it makes
sense to load thermal stuff only when it really is required.
> Again, I'm not an expert with this topic, just want to provide my view,
> so we can work something out, which works for everybody on multiple
> platforms.
+1
>
>>> be easy to reference a cooling device in different thermal zones with
>>> different weight, etc. As long as we define a thermal zone to always be
>>> defined by a single sensor the right place seems to be the proposed
>>> subnode to the sensor. If we want a zone to have more than one sensor,
>>> we might even want a separate dt node for the thermal zone, referencing
>>> both sensors and cooling devices through phandles.
>>
>> I still don't get why and how defining a thermal zone inside a sensor
>> phandle can prevent us defining a cooling device in different device
>> phandle.
>>
> I'm not saying this. What I said is that if we define the thermal zone
> inside the sensor node it's inherently bound to this single sensor,
> which is completely fine, as long as we keep the current definition of
> one thermal zone per sensor. It's just that I stumbled about the
> proposal to have more than one sensor per thermal zone. For this to work
> we would have to define the thermal zone in it's own node, so that we
> can reference multiple sensors. I just wanted to point this out, as it
> seems fundamental to the design of the dt binding. Personally I'm fine
> either way.
>
> Regards,
> Lucas
>
--
You have got to be excited about what you are doing. (L. Lamport)
Eduardo Valentin
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 295 bytes --]
^ permalink raw reply [flat|nested] 33+ messages in thread
* [RFC PATCH 4/4] arm: dts: add omap4430 thermal data
2013-07-09 14:00 [RFC PATCH 0/4] thermal: introduce DT thermal builder Eduardo Valentin
` (2 preceding siblings ...)
2013-07-09 14:00 ` [RFC PATCH 3/4] thermal: ti-soc-thermal: use thermal DT infrastructure Eduardo Valentin
@ 2013-07-09 14:00 ` Eduardo Valentin
3 siblings, 0 replies; 33+ messages in thread
From: Eduardo Valentin @ 2013-07-09 14:00 UTC (permalink / raw)
To: linux-pm, durgadoss.r, amit.daniel; +Cc: rui.zhang, Eduardo Valentin
This patch changes the dtsi entry on omap4430 to contain
the thermal data. This data will enable the passive
cooling with CPUfreq cooling device at 100C and the
system will do a thermal shutdown at 125C.
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
---
arch/arm/boot/dts/omap443x.dtsi | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/arch/arm/boot/dts/omap443x.dtsi b/arch/arm/boot/dts/omap443x.dtsi
index cccf39a..baea44f 100644
--- a/arch/arm/boot/dts/omap443x.dtsi
+++ b/arch/arm/boot/dts/omap443x.dtsi
@@ -24,4 +24,35 @@
clock-latency = <300000>; /* From legacy driver */
};
};
+ bandgap {
+ reg = <0x4a002260 0x4 0x4a00232C 0x4>;
+ compatible = "ti,omap4430-bandgap";
+ thermal_zone {
+ type = "CPU";
+ mask = <0x03>; /* trips writability */
+ passive_delay = <250>; /* milliseconds */
+ polling_delay = <1000>; /* milliseconds */
+ governor = "step_wise";
+ trips {
+ alert@100000{
+ temperature = <100000>; /* milliCelsius */
+ hysteresis = <0>; /* milliCelsius */
+ type = <1>;
+ };
+ crit@125000{
+ temperature = <125000>; /* milliCelsius */
+ hysteresis = <0>; /* milliCelsius */
+ type = <3>;
+ };
+ };
+ bind_params {
+ action@0{
+ cooling_device = "thermal-cpufreq";
+ weight = <100>; /* percentage */
+ mask = <0x01>;
+ };
+ };
+ };
+ };
+
};
--
1.8.2.1.342.gfa7285d
^ permalink raw reply related [flat|nested] 33+ messages in thread