thermal: sysfs: Add a new sysfs node emul_temp for thermal emulation
Subsystems (3)
PATCH v2 1/2 thermal: sysfs: Add a new sysfs node emul_temp for thermal emulation
This patch adds support to set the emulated temperature method in thermal zone (sensor). After setting this feature thermal zone may report this temperature and not the actual temperature. The emulation implementation may be based on sensor capability through platform specific handler or pure software emulation if no platform handler defined.
This is useful in debugging different temperature threshold and its associated cooling action. Critical threshold's cannot be emulated. Writing 0 on this node should disable emulation.
---
Changes in V2:
* Added config option for enabling emulation support.
* Added s/w emulation if no platform handler registered.
* skip the critical trip point emulation
This patchset is based on thermal maintainer next tree.git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git next
Documentation/thermal/sysfs-api.txt | 13 ++++++ drivers/thermal/Kconfig | 8 +++ drivers/thermal/thermal_sys.c | 82 ++++++++++++++++++++++++++++++----- include/linux/thermal.h | 2 + 4 files changed, 94 insertions(+), 11 deletions(-)
Documentation/thermal/sysfs-api.txt +13 -0
@@ -55,6 +55,8 @@ temperature) and throttle appropriate devices. .get_trip_type: get the type of certain trip point. .get_trip_temp: get the temperature above which the certain trip point will be fired. + .set_emul_temp: set the emulation temperature which helps in debugging + different threshold temperature points. 1.1.2 void thermal_zone_device_unregister(struct thermal_zone_device *tz)
@@ -153,6 +155,7 @@ Thermal zone device sys I/F, created once it's registered: |---trip_point_[0-*]_temp: Trip point temperature |---trip_point_[0-*]_type: Trip point type |---trip_point_[0-*]_hyst: Hysteresis value for this trip point + |---emul_temp: Emulated temperature set node Thermal cooling device sys I/F, created once it's registered: /sys/class/thermal/cooling_device[0-*]:
@@ -252,6 +255,16 @@ passive Valid values: 0 (disabled) or greater than 1000 RW, Optional +emul_temp + Interface to set the emulated temperature method in thermal zone + (sensor). After setting this temperature, the thermal zone may pass + this temperature to platform emulation function if registered or + cache it locally. This is useful in debugging different temperature + threshold and its associated cooling action. This is write only node + and writing 0 on this node should disable emulation. + Unit: millidegree Celsius + WO, Optional + ***************************** * Cooling device attributes * *****************************
drivers/thermal/Kconfig +8 -0
@@ -78,6 +78,14 @@ config CPU_THERMAL and not the ACPI interface. If you want this support, you should say Y here. +config THERMAL_EMULATION + bool "Thermal emulation mode support" + help + Enable this option to make a emul_temp sysfs node in thermal zone + directory to support temperature emulation. With emulation sysfs node, + user can manually input temperature and test the different trip + threshold behaviour for simulation purpose. + config SPEAR_THERMAL bool "SPEAr thermal sensor driver" depends on PLAT_SPEAR
drivers/thermal/thermal_sys.c +71 -11
124 lines not on this page · raw message
include/linux/thermal.h +2 -0
@@ -123,6 +123,7 @@ struct thermal_zone_device_ops {int (*set_trip_hyst) (struct thermal_zone_device *,int ,unsigned long );int (*get_crit_temp) (struct thermal_zone_device *,unsigned long *); +int (*set_emul_temp) (struct thermal_zone_device *,unsigned long );int (*get_trend) (struct thermal_zone_device *,int ,enum thermal_trend *); int (*notify) (struct thermal_zone_device *, int,
@@ -165,6 +166,7 @@ struct thermal_zone_device {int polling_delay;int temperature;int last_temperature; +int emul_temperature;int passive;unsigned int forced_passive;const struct thermal_zone_device_ops *ops;
Signature · 1 line
1.7.5.4
PATCH v2 2/2 thermal: exynos: Use the framework for temperature emulation support
This removes the driver specific sysfs support of the temperature emulation and uses the newly added core thermal framework for thermal emulation. A platform specific handler is added to support this.
---
Changes in V2:
* Added config option CONFIG_THERMAL_EMULATION instead of CONFIG_EXYNOS_THERMAL_EMUL
This patchset is based on thermal maintainer next tree.git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git next
Documentation/thermal/exynos_thermal_emulation | 8 +- drivers/thermal/Kconfig | 9 -- drivers/thermal/exynos_thermal.c | 158 ++++++++++-------------- 3 files changed, 67 insertions(+), 108 deletions(-)
Documentation/thermal/exynos_thermal_emulation +4 -4
@@ -13,11 +13,11 @@ Thermal emulation mode supports software debug for TMU's operation. User can set manually with software code and TMU will read current temperature from user value not from sensor's value. -Enabling CONFIG_EXYNOS_THERMAL_EMUL option will make this support in available. -When it's enabled, sysfs node will be created under -/sys/bus/platform/devices/'exynos device name'/ with name of 'emulation'. +Enabling CONFIG_THERMAL_EMULATION option will make this support available. +When it's enabled, sysfs node will be created as +/sys/devices/virtual/thermal/thermal_zone'zone id'/emul_temp. -The sysfs node, 'emulation', will contain value 0 for the initial state. When you input any +The sysfs node, 'emul_node', will contain value 0 for the initial state. When you input any temperature you want to update to sysfs node, it automatically enable emulation mode and current temperature will be changed into it. (Exynos also supports user changable delay time which would be used to delay of
drivers/thermal/Kconfig +0 -9
@@ -109,15 +109,6 @@ config EXYNOS_THERMAL If you say yes here you get support for TMU (Thermal Management Unit) on SAMSUNG EXYNOS series of SoC. -config EXYNOS_THERMAL_EMUL - bool "EXYNOS TMU emulation mode support" - depends on EXYNOS_THERMAL - help - Exynos 4412 and 4414 and 5 series has emulation mode on TMU. - Enable this option will be make sysfs node in exynos thermal platform - device directory to support emulation mode. With emulation mode sysfs - node, you can manually input temperature to TMU for simulation purpose. - config DB8500_THERMAL bool "DB8500 thermal management" depends on ARCH_U8500
drivers/thermal/exynos_thermal.c +63 -95
217 lines not on this page · raw message
Signature · 1 line
1.7.5.4
Zhang Rui
reviewerRe: [PATCH V2 2/2] thermal: exynos: Use the framework for temperature emulation support
Quoted 260 lines · Amit Daniel Kachhap
This removes the driver specific sysfs support of the temperature emulation and uses the newly added core thermal framework for thermal emulation. A platform specific handler is added to support this.
Signed-off-by Amit Daniel Kachhap <[email protected]>Acked-by Kukjin Kim <[email protected]>---
Changes in V2:
* Added config optionCONFIG_THERMAL_EMULATIONinstead ofCONFIG_EXYNOS_THERMAL_EMULThis patchset is based on thermal maintainer next tree.
git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.gitnextDocumentation/thermal/exynos_thermal_emulation | 8 +- drivers/thermal/Kconfig | 9 -- drivers/thermal/exynos_thermal.c | 158 ++++++++++-------------- 3 files changed, 67 insertions(+), 108 deletions(-)Documentation/thermal/exynos_thermal_emulation +4
-4@@ -13,11 +13,11 @@ Thermal emulation mode supports software debug for TMU's operation. User can set manually with software code and TMU will read current temperature from user value not from sensor's value. -Enabling CONFIG_EXYNOS_THERMAL_EMUL option will make this support in available. -When it's enabled, sysfs node will be created under -/sys/bus/platform/devices/'exynos device name'/ with name of 'emulation'. +Enabling CONFIG_THERMAL_EMULATION option will make this support available. +When it's enabled, sysfs node will be created as +/sys/devices/virtual/thermal/thermal_zone'zone id'/emul_temp. -The sysfs node, 'emulation', will contain value 0 for the initial state. When you input any +The sysfs node, 'emul_node', will contain value 0 for the initial state. When you input any temperature you want to update to sysfs node, it automatically enable emulation mode and current temperature will be changed into it. (Exynos also supports user changable delay time which would be used to delay ofdrivers/thermal/Kconfig +0
-9@@ -109,15 +109,6 @@ config EXYNOS_THERMAL If you say yes here you get support for TMU (Thermal Management Unit) on SAMSUNG EXYNOS series of SoC. -config EXYNOS_THERMAL_EMUL - bool "EXYNOS TMU emulation mode support" - depends on EXYNOS_THERMAL - help - Exynos 4412 and 4414 and 5 series has emulation mode on TMU. - Enable this option will be make sysfs node in exynos thermal platform - device directory to support emulation mode. With emulation mode sysfs - node, you can manually input temperature to TMU for simulation purpose. - config DB8500_THERMAL bool "DB8500 thermal management" depends on ARCH_U8500drivers/thermal/exynos_thermal.c +20
-2@@ -99,13 +99,13 @@#define IDLE_INTERVAL 10000#define MCELSIUS 1000 -#ifdef CONFIG_EXYNOS_THERMAL_EMUL +#ifdef CONFIG_THERMAL_EMULATION #define EXYNOS_EMUL_TIME 0x57F0#define EXYNOS_EMUL_TIME_SHIFT 16#define EXYNOS_EMUL_DATA_SHIFT 8#define EXYNOS_EMUL_DATA_MASK 0xFF#define EXYNOS_EMUL_ENABLE 0x1 -#endif /* CONFIG_EXYNOS_THERMAL_EMUL */ +#endif /* CONFIG_THERMAL_EMULATION */ /* CPU Zone information */ #define PANIC_ZONE 4@@ -143,6 +143,7 @@ struct thermal_cooling_conf {struct thermal_sensor_conf {char name[SENSOR_NAME_LEN ];int (*read_temperature)(void *data); +int (*write_emul_temp)(void *data,unsigned long temp);struct thermal_trip_point_conf trip_data;struct thermal_cooling_conf cooling_data;void *private_data;@@ -366,6 +367,23 @@ static int exynos_get_temp(struct thermal_zone_device *thermal,return 0 ; } +/* Get temperature callback functions for thermal zone */ +static int exynos_set_emul_temp (struct thermal_zone_device *thermal, +unsigned long temp) +{ +void *data; +int ret = -EINVAL ; + +if (!th_zone->sensor_conf) { +pr_info ("Temperature sensor not initialised\n" ); +return -EINVAL ; + } + data = th_zone->sensor_conf->private_data; +if (th_zone->sensor_conf->write_emul_temp) + ret = th_zone->sensor_conf->write_emul_temp (data, temp); +return ret; +} +/* Get the temperature trend */ static int exynos_get_trend(struct thermal_zone_device *thermal,drivers/thermal/exynos_thermal.c +39
-87int trip, enum thermal_trend *trend)@@ -382,6 +400,7 @@ static struct thermal_zone_device_ops const exynos_dev_ops = { .bind = exynos_bind, .unbind = exynos_unbind, .get_temp = exynos_get_temp, + .set_emul_temp = exynos_set_emul_temp, .get_trend = exynos_get_trend, .get_mode = exynos_get_mode, .set_mode = exynos_set_mode,@@ -700,6 +719,44 @@ static int exynos_tmu_read(struct exynos_tmu_data *data)return temp; } +#ifdef CONFIG_THERMAL_EMULATION +static int exynos_tmu_set_emulation (struct exynos_tmu_data *data, +unsigned long temp) +{ +unsigned int reg; +int ret = -EINVAL ; + +if (data->soc ==SOC_ARCH_EXYNOS4210 ) + goto out; + +if (temp && temp <MCELSIUS ) + goto out; + +mutex_lock (&data->lock); +clk_enable (data->clk); + + reg =readl (data->base +EXYNOS_EMUL_CON ); + +if (temp) { + temp /=MCELSIUS ; + + reg = (EXYNOS_EMUL_TIME <<EXYNOS_EMUL_TIME_SHIFT ) | + (temp_to_code (data, temp) + <<EXYNOS_EMUL_DATA_SHIFT ) |EXYNOS_EMUL_ENABLE ; + }else { + reg &= ~EXYNOS_EMUL_ENABLE ; + } + +writel (reg, data->base +EXYNOS_EMUL_CON ); + +clk_disable (data->clk); +mutex_unlock (&data->lock); +return 0 ; +out: +return ret; +} +#endif /*CONFIG_THERMAL_EMULATION*/ +static void exynos_tmu_work (struct work_struct *work) { struct exynos_tmu_data *data = container_of(work,@@ -839,93 +896,6 @@ static inline struct exynos_tmu_platform_data *exynos_get_driver_data(platform_get_device_id (pdev)->driver_data; } -#ifdef CONFIG_EXYNOS_THERMAL_EMUL -static ssize_t exynos_tmu_emulation_show (struct device *dev, -struct device_attribute *attr, -char *buf) -{ -struct platform_device *pdev =container_of (dev, - struct platform_device, dev); -struct exynos_tmu_data *data =platform_get_drvdata (pdev); -unsigned int reg; -u8 temp_code; -int temp =0 ; - -if (data->soc ==SOC_ARCH_EXYNOS4210 ) - goto out; - -mutex_lock (&data->lock); -clk_enable (data->clk); - reg =readl (data->base +EXYNOS_EMUL_CON ); -clk_disable (data->clk); -mutex_unlock (&data->lock); - -if (reg &EXYNOS_EMUL_ENABLE ) { - reg >>=EXYNOS_EMUL_DATA_SHIFT ; - temp_code = reg &EXYNOS_EMUL_DATA_MASK ; - temp =code_to_temp (data, temp_code); - } -out: -return sprintf (buf,"%d\n" , temp *MCELSIUS ); -} - -static ssize_t exynos_tmu_emulation_store (struct device *dev, -struct device_attribute *attr, -const char *buf,size_t count) -{ -struct platform_device *pdev =container_of (dev, - struct platform_device, dev); -struct exynos_tmu_data *data =platform_get_drvdata (pdev); -unsigned int reg; -int temp; - -if (data->soc ==SOC_ARCH_EXYNOS4210 ) - goto out; - -if (!sscanf (buf,"%d\n" , &temp) || temp <0 ) -return -EINVAL ; - -mutex_lock (&data->lock); -clk_enable (data->clk); - - reg =readl (data->base +EXYNOS_EMUL_CON ); - -if (temp) { -/* Both CELSIUS and MCELSIUS type are available for input */ -if (temp >MCELSIUS ) - temp /=MCELSIUS ; - - reg = (EXYNOS_EMUL_TIME <<EXYNOS_EMUL_TIME_SHIFT ) | - (temp_to_code (data, (temp /MCELSIUS )) - <<EXYNOS_EMUL_DATA_SHIFT ) |EXYNOS_EMUL_ENABLE ; - }else { - reg &= ~EXYNOS_EMUL_ENABLE ; - } - -writel (reg, data->base +EXYNOS_EMUL_CON ); - -clk_disable (data->clk); -mutex_unlock (&data->lock); - -out: -return count; -} - -static DEVICE_ATTR(emulation, 0644, exynos_tmu_emulation_show, - exynos_tmu_emulation_store); -static int create_emulation_sysfs (struct device *dev) -{ -return device_create_file (dev, &dev_attr_emulation); -} -static void remove_emulation_sysfs (struct device *dev) -{ -device_remove_file (dev, &dev_attr_emulation); -} -#else -static inline int create_emulation_sysfs (struct device *dev) {return 0 ; } -static inline void remove_emulation_sysfs (struct device *dev) {} -#endif -static int __devinit exynos_tmu_probe (struct platform_device *pdev) {struct exynos_tmu_data *data;
drivers/thermal/exynos_thermal.c static int __devinit exynos_tmu_probe(struct platform_device *pdev) · line 978
Quoted 7 lines
drivers/thermal/exynos_thermal.c +4
-0@@ -1002,6 +972,10 @@ static int __devinit exynos_tmu_probe(struct platform_device *pdev)/* Register the sensor with thermal management interface */ (&exynos_sensor_conf)->private_data = data; +#ifdef CONFIG_THERMAL_EMULATION + (&exynos_sensor_conf)->write_emul_temp = + (int (*)(void *,unsigned long ))exynos_tmu_set_emulation; +#endif
this is a little complicate.
to enable emulation, you just need
#ifdef CONFIG_THERMAL_EMUL
static int exynos_set_emul_temp(struct thermal_zone_device *thermal,
unsigned long temp)
{
remove exynos_tmu_set_emulation and copy its code here.
}
#else
static int exynos_set_emul_temp() { return -EINVAL; } #endif
and
+ .set_emul_temp = exynos_set_emul_temp,
or do I miss something?
thanks,
rui
Quoted 23 lines
drivers/thermal/exynos_thermal.c +0
-6exynos_sensor_conf.trip_data.trip_count = pdata->trigger_level0_en + pdata->trigger_level1_en + pdata->trigger_level2_en + pdata->trigger_level3_en;@@ -1025,10 +999,6 @@ static int __devinit exynos_tmu_probe(struct platform_device *pdev) goto err_clk; } - ret =create_emulation_sysfs (&pdev->dev); -if (ret) -dev_err (&pdev->dev,"Failed to create emulation mode sysfs node\n" ); -return 0 ; err_clk:platform_set_drvdata (pdev,NULL );@@ -1040,8 +1010,6 @@ static int __devexit exynos_tmu_remove(struct platform_device *pdev) {struct exynos_tmu_data *data =platform_get_drvdata (pdev); -remove_emulation_sysfs (&pdev->dev); -exynos_tmu_control (pdev, false);exynos_unregister_thermal ();
Re: [PATCH V2 2/2] thermal: exynos: Use the framework for temperature emulation support
Hi Rui,
Please merge this patch also. The 1st series of this patchset is already accepted by you. This is just a adaptation of the earlier one and does code cleanup.
Thanks,
Amit Daniel
Quoted 282 lines · Zhang Rui
Quoted 260 lines · Amit Daniel Kachhap
This removes the driver specific sysfs support of the temperature emulation and uses the newly added core thermal framework for thermal emulation. A platform specific handler is added to support this.
Signed-off-by Amit Daniel Kachhap <[email protected]>Acked-by Kukjin Kim <[email protected]>---
Changes in V2:
* Added config optionCONFIG_THERMAL_EMULATIONinstead ofCONFIG_EXYNOS_THERMAL_EMULThis patchset is based on thermal maintainer next tree.
git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.gitnextDocumentation/thermal/exynos_thermal_emulation | 8 +- drivers/thermal/Kconfig | 9 -- drivers/thermal/exynos_thermal.c | 158 ++++++++++-------------- 3 files changed, 67 insertions(+), 108 deletions(-)Documentation/thermal/exynos_thermal_emulation +4
-4@@ -13,11 +13,11 @@ Thermal emulation mode supports software debug for TMU's operation. User can set manually with software code and TMU will read current temperature from user value not from sensor's value. -Enabling CONFIG_EXYNOS_THERMAL_EMUL option will make this support in available. -When it's enabled, sysfs node will be created under -/sys/bus/platform/devices/'exynos device name'/ with name of 'emulation'. +Enabling CONFIG_THERMAL_EMULATION option will make this support available. +When it's enabled, sysfs node will be created as +/sys/devices/virtual/thermal/thermal_zone'zone id'/emul_temp. -The sysfs node, 'emulation', will contain value 0 for the initial state. When you input any +The sysfs node, 'emul_node', will contain value 0 for the initial state. When you input any temperature you want to update to sysfs node, it automatically enable emulation mode and current temperature will be changed into it. (Exynos also supports user changable delay time which would be used to delay ofdrivers/thermal/Kconfig +0
-9@@ -109,15 +109,6 @@ config EXYNOS_THERMAL If you say yes here you get support for TMU (Thermal Management Unit) on SAMSUNG EXYNOS series of SoC. -config EXYNOS_THERMAL_EMUL - bool "EXYNOS TMU emulation mode support" - depends on EXYNOS_THERMAL - help - Exynos 4412 and 4414 and 5 series has emulation mode on TMU. - Enable this option will be make sysfs node in exynos thermal platform - device directory to support emulation mode. With emulation mode sysfs - node, you can manually input temperature to TMU for simulation purpose. - config DB8500_THERMAL bool "DB8500 thermal management" depends on ARCH_U8500drivers/thermal/exynos_thermal.c +20
-2@@ -99,13 +99,13 @@#define IDLE_INTERVAL 10000#define MCELSIUS 1000 -#ifdef CONFIG_EXYNOS_THERMAL_EMUL +#ifdef CONFIG_THERMAL_EMULATION #define EXYNOS_EMUL_TIME 0x57F0#define EXYNOS_EMUL_TIME_SHIFT 16#define EXYNOS_EMUL_DATA_SHIFT 8#define EXYNOS_EMUL_DATA_MASK 0xFF#define EXYNOS_EMUL_ENABLE 0x1 -#endif /* CONFIG_EXYNOS_THERMAL_EMUL */ +#endif /* CONFIG_THERMAL_EMULATION */ /* CPU Zone information */ #define PANIC_ZONE 4@@ -143,6 +143,7 @@ struct thermal_cooling_conf {struct thermal_sensor_conf {char name[SENSOR_NAME_LEN ];int (*read_temperature)(void *data); +int (*write_emul_temp)(void *data,unsigned long temp);struct thermal_trip_point_conf trip_data;struct thermal_cooling_conf cooling_data;void *private_data;@@ -366,6 +367,23 @@ static int exynos_get_temp(struct thermal_zone_device *thermal,return 0 ; } +/* Get temperature callback functions for thermal zone */ +static int exynos_set_emul_temp (struct thermal_zone_device *thermal, +unsigned long temp) +{ +void *data; +int ret = -EINVAL ; + +if (!th_zone->sensor_conf) { +pr_info ("Temperature sensor not initialised\n" ); +return -EINVAL ; + } + data = th_zone->sensor_conf->private_data; +if (th_zone->sensor_conf->write_emul_temp) + ret = th_zone->sensor_conf->write_emul_temp (data, temp); +return ret; +} +/* Get the temperature trend */ static int exynos_get_trend(struct thermal_zone_device *thermal,int trip, enum
thermal_trend*trend)drivers/thermal/exynos_thermal.c +39
-87@@ -382,6 +400,7 @@ static struct thermal_zone_device_ops const exynos_dev_ops = { .bind = exynos_bind, .unbind = exynos_unbind, .get_temp = exynos_get_temp, + .set_emul_temp = exynos_set_emul_temp, .get_trend = exynos_get_trend, .get_mode = exynos_get_mode, .set_mode = exynos_set_mode,@@ -700,6 +719,44 @@ static int exynos_tmu_read(struct exynos_tmu_data *data)return temp; } +#ifdef CONFIG_THERMAL_EMULATION +static int exynos_tmu_set_emulation (struct exynos_tmu_data *data, +unsigned long temp) +{ +unsigned int reg; +int ret = -EINVAL ; + +if (data->soc ==SOC_ARCH_EXYNOS4210 ) + goto out; + +if (temp && temp <MCELSIUS ) + goto out; + +mutex_lock (&data->lock); +clk_enable (data->clk); + + reg =readl (data->base +EXYNOS_EMUL_CON ); + +if (temp) { + temp /=MCELSIUS ; + + reg = (EXYNOS_EMUL_TIME <<EXYNOS_EMUL_TIME_SHIFT ) | + (temp_to_code (data, temp) + <<EXYNOS_EMUL_DATA_SHIFT ) |EXYNOS_EMUL_ENABLE ; + }else { + reg &= ~EXYNOS_EMUL_ENABLE ; + } + +writel (reg, data->base +EXYNOS_EMUL_CON ); + +clk_disable (data->clk); +mutex_unlock (&data->lock); +return 0 ; +out: +return ret; +} +#endif /*CONFIG_THERMAL_EMULATION*/ +static void exynos_tmu_work (struct work_struct *work) { struct exynos_tmu_data *data = container_of(work,@@ -839,93 +896,6 @@ static inline struct exynos_tmu_platform_data *exynos_get_driver_data(platform_get_device_id (pdev)->driver_data; } -#ifdef CONFIG_EXYNOS_THERMAL_EMUL -static ssize_t exynos_tmu_emulation_show (struct device *dev, -struct device_attribute *attr, -char *buf) -{ -struct platform_device *pdev =container_of (dev, - struct platform_device, dev); -struct exynos_tmu_data *data =platform_get_drvdata (pdev); -unsigned int reg; -u8 temp_code; -int temp =0 ; - -if (data->soc ==SOC_ARCH_EXYNOS4210 ) - goto out; - -mutex_lock (&data->lock); -clk_enable (data->clk); - reg =readl (data->base +EXYNOS_EMUL_CON ); -clk_disable (data->clk); -mutex_unlock (&data->lock); - -if (reg &EXYNOS_EMUL_ENABLE ) { - reg >>=EXYNOS_EMUL_DATA_SHIFT ; - temp_code = reg &EXYNOS_EMUL_DATA_MASK ; - temp =code_to_temp (data, temp_code); - } -out: -return sprintf (buf,"%d\n" , temp *MCELSIUS ); -} - -static ssize_t exynos_tmu_emulation_store (struct device *dev, -struct device_attribute *attr, -const char *buf,size_t count) -{ -struct platform_device *pdev =container_of (dev, - struct platform_device, dev); -struct exynos_tmu_data *data =platform_get_drvdata (pdev); -unsigned int reg; -int temp; - -if (data->soc ==SOC_ARCH_EXYNOS4210 ) - goto out; - -if (!sscanf (buf,"%d\n" , &temp) || temp <0 ) -return -EINVAL ; - -mutex_lock (&data->lock); -clk_enable (data->clk); - - reg =readl (data->base +EXYNOS_EMUL_CON ); - -if (temp) { -/* Both CELSIUS and MCELSIUS type are available for input */ -if (temp >MCELSIUS ) - temp /=MCELSIUS ; - - reg = (EXYNOS_EMUL_TIME <<EXYNOS_EMUL_TIME_SHIFT ) | - (temp_to_code (data, (temp /MCELSIUS )) - <<EXYNOS_EMUL_DATA_SHIFT ) |EXYNOS_EMUL_ENABLE ; - }else { - reg &= ~EXYNOS_EMUL_ENABLE ; - } - -writel (reg, data->base +EXYNOS_EMUL_CON ); - -clk_disable (data->clk); -mutex_unlock (&data->lock); - -out: -return count; -} - -static DEVICE_ATTR(emulation, 0644, exynos_tmu_emulation_show, - exynos_tmu_emulation_store); -static int create_emulation_sysfs (struct device *dev) -{ -return device_create_file (dev, &dev_attr_emulation); -} -static void remove_emulation_sysfs (struct device *dev) -{ -device_remove_file (dev, &dev_attr_emulation); -} -#else -static inline int create_emulation_sysfs (struct device *dev) {return 0 ; } -static inline void remove_emulation_sysfs (struct device *dev) {} -#endif -static int __devinit exynos_tmu_probe (struct platform_device *pdev) {struct exynos_tmu_data *data;drivers/thermal/exynos_thermal.c static int __devinit exynos_tmu_probe(struct platform_device *pdev) · line 978
Quoted 7 lines
drivers/thermal/exynos_thermal.c +4
-0@@ -1002,6 +972,10 @@ static int __devinit exynos_tmu_probe(struct platform_device *pdev)/* Register the sensor with thermal management interface */ (&exynos_sensor_conf)->private_data = data; +#ifdef CONFIG_THERMAL_EMULATION + (&exynos_sensor_conf)->write_emul_temp = + (int (*)(void *,unsigned long ))exynos_tmu_set_emulation; +#endif this is a little complicate.
to enable emulation, you just need#ifdef
CONFIG_THERMAL_EMUL
static int exynos_set_emul_temp(structthermal_zone_device*thermal,
unsigned long temp)
{
removeexynos_tmu_set_emulationand copy its code here.
}
#else
static intexynos_set_emul_temp(){ return-EINVAL; } #endif
Quoted 4 lines
and
+ .set_emul_temp =exynos_set_emul_temp,or do I miss something?
The above code just assigns the emulated function pointer. The purpose in doing that is to keep the senor related and framework related(thermal zone, cooling devices) separate. I am current working on adding some more sensor support using the same framework code and the above way of doing it is helpful.
Quoted 31 lines
thanks,
ruiQuoted 15 lines
drivers/thermal/exynos_thermal.c +0
-4exynos_sensor_conf.trip_data.trip_count = pdata->trigger_level0_en + pdata->trigger_level1_en + pdata->trigger_level2_en + pdata->trigger_level3_en;@@ -1025,10 +999,6 @@ static int __devinit exynos_tmu_probe(struct platform_device *pdev) goto err_clk; } - ret =create_emulation_sysfs (&pdev->dev); -if (ret) -dev_err (&pdev->dev,"Failed to create emulation mode sysfs node\n" ); -return 0 ; err_clk:platform_set_drvdata (pdev,NULL );drivers/thermal/exynos_thermal.c static int __devexit exynos_tmu_remove(struct platform_device *pdev) · line 1015
Quoted 8 lines
drivers/thermal/exynos_thermal.c +0
-2@@ -1040,8 +1010,6 @@ static int __devexit exynos_tmu_remove(struct platform_device *pdev) {struct exynos_tmu_data *data =platform_get_drvdata (pdev); -remove_emulation_sysfs (&pdev->dev); -exynos_tmu_control (pdev, false);exynos_unregister_thermal ();--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Zhang Rui
reviewerRe: [PATCH V2 2/2] thermal: exynos: Use the framework for temperature emulation support
In reply to Zhang RuiQuoted 282 lines · Zhang Rui
Quoted 260 lines · Amit Daniel Kachhap
This removes the driver specific sysfs support of the temperature emulation and uses the newly added core thermal framework for thermal emulation. A platform specific handler is added to support this.
Signed-off-by Amit Daniel Kachhap <[email protected]>Acked-by Kukjin Kim <[email protected]>---
Changes in V2:
* Added config optionCONFIG_THERMAL_EMULATIONinstead ofCONFIG_EXYNOS_THERMAL_EMULThis patchset is based on thermal maintainer next tree.
git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.gitnextDocumentation/thermal/exynos_thermal_emulation | 8 +- drivers/thermal/Kconfig | 9 -- drivers/thermal/exynos_thermal.c | 158 ++++++++++-------------- 3 files changed, 67 insertions(+), 108 deletions(-)Documentation/thermal/exynos_thermal_emulation +4
-4@@ -13,11 +13,11 @@ Thermal emulation mode supports software debug for TMU's operation. User can set manually with software code and TMU will read current temperature from user value not from sensor's value. -Enabling CONFIG_EXYNOS_THERMAL_EMUL option will make this support in available. -When it's enabled, sysfs node will be created under -/sys/bus/platform/devices/'exynos device name'/ with name of 'emulation'. +Enabling CONFIG_THERMAL_EMULATION option will make this support available. +When it's enabled, sysfs node will be created as +/sys/devices/virtual/thermal/thermal_zone'zone id'/emul_temp. -The sysfs node, 'emulation', will contain value 0 for the initial state. When you input any +The sysfs node, 'emul_node', will contain value 0 for the initial state. When you input any temperature you want to update to sysfs node, it automatically enable emulation mode and current temperature will be changed into it. (Exynos also supports user changable delay time which would be used to delay ofdrivers/thermal/Kconfig +0
-9@@ -109,15 +109,6 @@ config EXYNOS_THERMAL If you say yes here you get support for TMU (Thermal Management Unit) on SAMSUNG EXYNOS series of SoC. -config EXYNOS_THERMAL_EMUL - bool "EXYNOS TMU emulation mode support" - depends on EXYNOS_THERMAL - help - Exynos 4412 and 4414 and 5 series has emulation mode on TMU. - Enable this option will be make sysfs node in exynos thermal platform - device directory to support emulation mode. With emulation mode sysfs - node, you can manually input temperature to TMU for simulation purpose. - config DB8500_THERMAL bool "DB8500 thermal management" depends on ARCH_U8500drivers/thermal/exynos_thermal.c +20
-2@@ -99,13 +99,13 @@#define IDLE_INTERVAL 10000#define MCELSIUS 1000 -#ifdef CONFIG_EXYNOS_THERMAL_EMUL +#ifdef CONFIG_THERMAL_EMULATION #define EXYNOS_EMUL_TIME 0x57F0#define EXYNOS_EMUL_TIME_SHIFT 16#define EXYNOS_EMUL_DATA_SHIFT 8#define EXYNOS_EMUL_DATA_MASK 0xFF#define EXYNOS_EMUL_ENABLE 0x1 -#endif /* CONFIG_EXYNOS_THERMAL_EMUL */ +#endif /* CONFIG_THERMAL_EMULATION */ /* CPU Zone information */ #define PANIC_ZONE 4@@ -143,6 +143,7 @@ struct thermal_cooling_conf {struct thermal_sensor_conf {char name[SENSOR_NAME_LEN ];int (*read_temperature)(void *data); +int (*write_emul_temp)(void *data,unsigned long temp);struct thermal_trip_point_conf trip_data;struct thermal_cooling_conf cooling_data;void *private_data;@@ -366,6 +367,23 @@ static int exynos_get_temp(struct thermal_zone_device *thermal,return 0 ; } +/* Get temperature callback functions for thermal zone */ +static int exynos_set_emul_temp (struct thermal_zone_device *thermal, +unsigned long temp) +{ +void *data; +int ret = -EINVAL ; + +if (!th_zone->sensor_conf) { +pr_info ("Temperature sensor not initialised\n" ); +return -EINVAL ; + } + data = th_zone->sensor_conf->private_data; +if (th_zone->sensor_conf->write_emul_temp) + ret = th_zone->sensor_conf->write_emul_temp (data, temp); +return ret; +} +/* Get the temperature trend */ static int exynos_get_trend(struct thermal_zone_device *thermal,drivers/thermal/exynos_thermal.c +39
-87int trip, enum thermal_trend *trend)@@ -382,6 +400,7 @@ static struct thermal_zone_device_ops const exynos_dev_ops = { .bind = exynos_bind, .unbind = exynos_unbind, .get_temp = exynos_get_temp, + .set_emul_temp = exynos_set_emul_temp, .get_trend = exynos_get_trend, .get_mode = exynos_get_mode, .set_mode = exynos_set_mode,@@ -700,6 +719,44 @@ static int exynos_tmu_read(struct exynos_tmu_data *data)return temp; } +#ifdef CONFIG_THERMAL_EMULATION +static int exynos_tmu_set_emulation (struct exynos_tmu_data *data, +unsigned long temp) +{ +unsigned int reg; +int ret = -EINVAL ; + +if (data->soc ==SOC_ARCH_EXYNOS4210 ) + goto out; + +if (temp && temp <MCELSIUS ) + goto out; + +mutex_lock (&data->lock); +clk_enable (data->clk); + + reg =readl (data->base +EXYNOS_EMUL_CON ); + +if (temp) { + temp /=MCELSIUS ; + + reg = (EXYNOS_EMUL_TIME <<EXYNOS_EMUL_TIME_SHIFT ) | + (temp_to_code (data, temp) + <<EXYNOS_EMUL_DATA_SHIFT ) |EXYNOS_EMUL_ENABLE ; + }else { + reg &= ~EXYNOS_EMUL_ENABLE ; + } + +writel (reg, data->base +EXYNOS_EMUL_CON ); + +clk_disable (data->clk); +mutex_unlock (&data->lock); +return 0 ; +out: +return ret; +} +#endif /*CONFIG_THERMAL_EMULATION*/ +static void exynos_tmu_work (struct work_struct *work) { struct exynos_tmu_data *data = container_of(work,@@ -839,93 +896,6 @@ static inline struct exynos_tmu_platform_data *exynos_get_driver_data(platform_get_device_id (pdev)->driver_data; } -#ifdef CONFIG_EXYNOS_THERMAL_EMUL -static ssize_t exynos_tmu_emulation_show (struct device *dev, -struct device_attribute *attr, -char *buf) -{ -struct platform_device *pdev =container_of (dev, - struct platform_device, dev); -struct exynos_tmu_data *data =platform_get_drvdata (pdev); -unsigned int reg; -u8 temp_code; -int temp =0 ; - -if (data->soc ==SOC_ARCH_EXYNOS4210 ) - goto out; - -mutex_lock (&data->lock); -clk_enable (data->clk); - reg =readl (data->base +EXYNOS_EMUL_CON ); -clk_disable (data->clk); -mutex_unlock (&data->lock); - -if (reg &EXYNOS_EMUL_ENABLE ) { - reg >>=EXYNOS_EMUL_DATA_SHIFT ; - temp_code = reg &EXYNOS_EMUL_DATA_MASK ; - temp =code_to_temp (data, temp_code); - } -out: -return sprintf (buf,"%d\n" , temp *MCELSIUS ); -} - -static ssize_t exynos_tmu_emulation_store (struct device *dev, -struct device_attribute *attr, -const char *buf,size_t count) -{ -struct platform_device *pdev =container_of (dev, - struct platform_device, dev); -struct exynos_tmu_data *data =platform_get_drvdata (pdev); -unsigned int reg; -int temp; - -if (data->soc ==SOC_ARCH_EXYNOS4210 ) - goto out; - -if (!sscanf (buf,"%d\n" , &temp) || temp <0 ) -return -EINVAL ; - -mutex_lock (&data->lock); -clk_enable (data->clk); - - reg =readl (data->base +EXYNOS_EMUL_CON ); - -if (temp) { -/* Both CELSIUS and MCELSIUS type are available for input */ -if (temp >MCELSIUS ) - temp /=MCELSIUS ; - - reg = (EXYNOS_EMUL_TIME <<EXYNOS_EMUL_TIME_SHIFT ) | - (temp_to_code (data, (temp /MCELSIUS )) - <<EXYNOS_EMUL_DATA_SHIFT ) |EXYNOS_EMUL_ENABLE ; - }else { - reg &= ~EXYNOS_EMUL_ENABLE ; - } - -writel (reg, data->base +EXYNOS_EMUL_CON ); - -clk_disable (data->clk); -mutex_unlock (&data->lock); - -out: -return count; -} - -static DEVICE_ATTR(emulation, 0644, exynos_tmu_emulation_show, - exynos_tmu_emulation_store); -static int create_emulation_sysfs (struct device *dev) -{ -return device_create_file (dev, &dev_attr_emulation); -} -static void remove_emulation_sysfs (struct device *dev) -{ -device_remove_file (dev, &dev_attr_emulation); -} -#else -static inline int create_emulation_sysfs (struct device *dev) {return 0 ; } -static inline void remove_emulation_sysfs (struct device *dev) {} -#endif -static int __devinit exynos_tmu_probe (struct platform_device *pdev) {struct exynos_tmu_data *data;drivers/thermal/exynos_thermal.c static int __devinit exynos_tmu_probe(struct platform_device *pdev) · line 978
Quoted 7 lines
drivers/thermal/exynos_thermal.c +4
-0@@ -1002,6 +972,10 @@ static int __devinit exynos_tmu_probe(struct platform_device *pdev)/* Register the sensor with thermal management interface */ (&exynos_sensor_conf)->private_data = data; +#ifdef CONFIG_THERMAL_EMULATION + (&exynos_sensor_conf)->write_emul_temp = + (int (*)(void *,unsigned long ))exynos_tmu_set_emulation; +#endif this is a little complicate.
to enable emulation, you just need#ifdef
CONFIG_THERMAL_EMUL
static int exynos_set_emul_temp(structthermal_zone_device*thermal,
unsigned long temp)
{
removeexynos_tmu_set_emulationand copy its code here.
}
#else
static intexynos_set_emul_temp(){ return-EINVAL; } #endif
Quoted 5 lines
and
+ .set_emul_temp =exynos_set_emul_temp,or do I miss something?
maybe you missed this email.
IMO, the code above should be much cleaner.
thanks,
rui
Quoted 25 lines
thanks,
ruiQuoted 23 lines
drivers/thermal/exynos_thermal.c +0
-6exynos_sensor_conf.trip_data.trip_count = pdata->trigger_level0_en + pdata->trigger_level1_en + pdata->trigger_level2_en + pdata->trigger_level3_en;@@ -1025,10 +999,6 @@ static int __devinit exynos_tmu_probe(struct platform_device *pdev) goto err_clk; } - ret =create_emulation_sysfs (&pdev->dev); -if (ret) -dev_err (&pdev->dev,"Failed to create emulation mode sysfs node\n" ); -return 0 ; err_clk:platform_set_drvdata (pdev,NULL );@@ -1040,8 +1010,6 @@ static int __devexit exynos_tmu_remove(struct platform_device *pdev) {struct exynos_tmu_data *data =platform_get_drvdata (pdev); -remove_emulation_sysfs (&pdev->dev); -exynos_tmu_control (pdev, false);exynos_unregister_thermal ();
Re: [PATCH V2 2/2] thermal: exynos: Use the framework for temperature emulation support
Quoted 283 lines · Zhang Rui
Quoted 282 lines · Zhang Rui
Quoted 260 lines · Amit Daniel Kachhap
This removes the driver specific sysfs support of the temperature emulation and uses the newly added core thermal framework for thermal emulation. A platform specific handler is added to support this.
Signed-off-by Amit Daniel Kachhap <[email protected]>Acked-by Kukjin Kim <[email protected]>---
Changes in V2:
* Added config optionCONFIG_THERMAL_EMULATIONinstead ofCONFIG_EXYNOS_THERMAL_EMULThis patchset is based on thermal maintainer next tree.
git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.gitnextDocumentation/thermal/exynos_thermal_emulation | 8 +- drivers/thermal/Kconfig | 9 -- drivers/thermal/exynos_thermal.c | 158 ++++++++++-------------- 3 files changed, 67 insertions(+), 108 deletions(-)Documentation/thermal/exynos_thermal_emulation +4
-4@@ -13,11 +13,11 @@ Thermal emulation mode supports software debug for TMU's operation. User can set manually with software code and TMU will read current temperature from user value not from sensor's value. -Enabling CONFIG_EXYNOS_THERMAL_EMUL option will make this support in available. -When it's enabled, sysfs node will be created under -/sys/bus/platform/devices/'exynos device name'/ with name of 'emulation'. +Enabling CONFIG_THERMAL_EMULATION option will make this support available. +When it's enabled, sysfs node will be created as +/sys/devices/virtual/thermal/thermal_zone'zone id'/emul_temp. -The sysfs node, 'emulation', will contain value 0 for the initial state. When you input any +The sysfs node, 'emul_node', will contain value 0 for the initial state. When you input any temperature you want to update to sysfs node, it automatically enable emulation mode and current temperature will be changed into it. (Exynos also supports user changable delay time which would be used to delay ofdrivers/thermal/Kconfig +0
-9@@ -109,15 +109,6 @@ config EXYNOS_THERMAL If you say yes here you get support for TMU (Thermal Management Unit) on SAMSUNG EXYNOS series of SoC. -config EXYNOS_THERMAL_EMUL - bool "EXYNOS TMU emulation mode support" - depends on EXYNOS_THERMAL - help - Exynos 4412 and 4414 and 5 series has emulation mode on TMU. - Enable this option will be make sysfs node in exynos thermal platform - device directory to support emulation mode. With emulation mode sysfs - node, you can manually input temperature to TMU for simulation purpose. - config DB8500_THERMAL bool "DB8500 thermal management" depends on ARCH_U8500drivers/thermal/exynos_thermal.c +20
-2@@ -99,13 +99,13 @@#define IDLE_INTERVAL 10000#define MCELSIUS 1000 -#ifdef CONFIG_EXYNOS_THERMAL_EMUL +#ifdef CONFIG_THERMAL_EMULATION #define EXYNOS_EMUL_TIME 0x57F0#define EXYNOS_EMUL_TIME_SHIFT 16#define EXYNOS_EMUL_DATA_SHIFT 8#define EXYNOS_EMUL_DATA_MASK 0xFF#define EXYNOS_EMUL_ENABLE 0x1 -#endif /* CONFIG_EXYNOS_THERMAL_EMUL */ +#endif /* CONFIG_THERMAL_EMULATION */ /* CPU Zone information */ #define PANIC_ZONE 4@@ -143,6 +143,7 @@ struct thermal_cooling_conf {struct thermal_sensor_conf {char name[SENSOR_NAME_LEN ];int (*read_temperature)(void *data); +int (*write_emul_temp)(void *data,unsigned long temp);struct thermal_trip_point_conf trip_data;struct thermal_cooling_conf cooling_data;void *private_data;@@ -366,6 +367,23 @@ static int exynos_get_temp(struct thermal_zone_device *thermal,return 0 ; } +/* Get temperature callback functions for thermal zone */ +static int exynos_set_emul_temp (struct thermal_zone_device *thermal, +unsigned long temp) +{ +void *data; +int ret = -EINVAL ; + +if (!th_zone->sensor_conf) { +pr_info ("Temperature sensor not initialised\n" ); +return -EINVAL ; + } + data = th_zone->sensor_conf->private_data; +if (th_zone->sensor_conf->write_emul_temp) + ret = th_zone->sensor_conf->write_emul_temp (data, temp); +return ret; +} +/* Get the temperature trend */ static int exynos_get_trend(struct thermal_zone_device *thermal,int trip, enum
thermal_trend*trend)drivers/thermal/exynos_thermal.c +39
-87@@ -382,6 +400,7 @@ static struct thermal_zone_device_ops const exynos_dev_ops = { .bind = exynos_bind, .unbind = exynos_unbind, .get_temp = exynos_get_temp, + .set_emul_temp = exynos_set_emul_temp, .get_trend = exynos_get_trend, .get_mode = exynos_get_mode, .set_mode = exynos_set_mode,@@ -700,6 +719,44 @@ static int exynos_tmu_read(struct exynos_tmu_data *data)return temp; } +#ifdef CONFIG_THERMAL_EMULATION +static int exynos_tmu_set_emulation (struct exynos_tmu_data *data, +unsigned long temp) +{ +unsigned int reg; +int ret = -EINVAL ; + +if (data->soc ==SOC_ARCH_EXYNOS4210 ) + goto out; + +if (temp && temp <MCELSIUS ) + goto out; + +mutex_lock (&data->lock); +clk_enable (data->clk); + + reg =readl (data->base +EXYNOS_EMUL_CON ); + +if (temp) { + temp /=MCELSIUS ; + + reg = (EXYNOS_EMUL_TIME <<EXYNOS_EMUL_TIME_SHIFT ) | + (temp_to_code (data, temp) + <<EXYNOS_EMUL_DATA_SHIFT ) |EXYNOS_EMUL_ENABLE ; + }else { + reg &= ~EXYNOS_EMUL_ENABLE ; + } + +writel (reg, data->base +EXYNOS_EMUL_CON ); + +clk_disable (data->clk); +mutex_unlock (&data->lock); +return 0 ; +out: +return ret; +} +#endif /*CONFIG_THERMAL_EMULATION*/ +static void exynos_tmu_work (struct work_struct *work) { struct exynos_tmu_data *data = container_of(work,@@ -839,93 +896,6 @@ static inline struct exynos_tmu_platform_data *exynos_get_driver_data(platform_get_device_id (pdev)->driver_data; } -#ifdef CONFIG_EXYNOS_THERMAL_EMUL -static ssize_t exynos_tmu_emulation_show (struct device *dev, -struct device_attribute *attr, -char *buf) -{ -struct platform_device *pdev =container_of (dev, - struct platform_device, dev); -struct exynos_tmu_data *data =platform_get_drvdata (pdev); -unsigned int reg; -u8 temp_code; -int temp =0 ; - -if (data->soc ==SOC_ARCH_EXYNOS4210 ) - goto out; - -mutex_lock (&data->lock); -clk_enable (data->clk); - reg =readl (data->base +EXYNOS_EMUL_CON ); -clk_disable (data->clk); -mutex_unlock (&data->lock); - -if (reg &EXYNOS_EMUL_ENABLE ) { - reg >>=EXYNOS_EMUL_DATA_SHIFT ; - temp_code = reg &EXYNOS_EMUL_DATA_MASK ; - temp =code_to_temp (data, temp_code); - } -out: -return sprintf (buf,"%d\n" , temp *MCELSIUS ); -} - -static ssize_t exynos_tmu_emulation_store (struct device *dev, -struct device_attribute *attr, -const char *buf,size_t count) -{ -struct platform_device *pdev =container_of (dev, - struct platform_device, dev); -struct exynos_tmu_data *data =platform_get_drvdata (pdev); -unsigned int reg; -int temp; - -if (data->soc ==SOC_ARCH_EXYNOS4210 ) - goto out; - -if (!sscanf (buf,"%d\n" , &temp) || temp <0 ) -return -EINVAL ; - -mutex_lock (&data->lock); -clk_enable (data->clk); - - reg =readl (data->base +EXYNOS_EMUL_CON ); - -if (temp) { -/* Both CELSIUS and MCELSIUS type are available for input */ -if (temp >MCELSIUS ) - temp /=MCELSIUS ; - - reg = (EXYNOS_EMUL_TIME <<EXYNOS_EMUL_TIME_SHIFT ) | - (temp_to_code (data, (temp /MCELSIUS )) - <<EXYNOS_EMUL_DATA_SHIFT ) |EXYNOS_EMUL_ENABLE ; - }else { - reg &= ~EXYNOS_EMUL_ENABLE ; - } - -writel (reg, data->base +EXYNOS_EMUL_CON ); - -clk_disable (data->clk); -mutex_unlock (&data->lock); - -out: -return count; -} - -static DEVICE_ATTR(emulation, 0644, exynos_tmu_emulation_show, - exynos_tmu_emulation_store); -static int create_emulation_sysfs (struct device *dev) -{ -return device_create_file (dev, &dev_attr_emulation); -} -static void remove_emulation_sysfs (struct device *dev) -{ -device_remove_file (dev, &dev_attr_emulation); -} -#else -static inline int create_emulation_sysfs (struct device *dev) {return 0 ; } -static inline void remove_emulation_sysfs (struct device *dev) {} -#endif -static int __devinit exynos_tmu_probe (struct platform_device *pdev) {struct exynos_tmu_data *data;drivers/thermal/exynos_thermal.c static int __devinit exynos_tmu_probe(struct platform_device *pdev) · line 978
Quoted 7 lines
drivers/thermal/exynos_thermal.c +4
-0@@ -1002,6 +972,10 @@ static int __devinit exynos_tmu_probe(struct platform_device *pdev)/* Register the sensor with thermal management interface */ (&exynos_sensor_conf)->private_data = data; +#ifdef CONFIG_THERMAL_EMULATION + (&exynos_sensor_conf)->write_emul_temp = + (int (*)(void *,unsigned long ))exynos_tmu_set_emulation; +#endif this is a little complicate.
to enable emulation, you just need#ifdef
CONFIG_THERMAL_EMUL
static int exynos_set_emul_temp(structthermal_zone_device*thermal,
unsigned long temp)
{
removeexynos_tmu_set_emulationand copy its code here.
}
#else
static intexynos_set_emul_temp(){ return-EINVAL; } #endif
Quoted 7 lines
Quoted 5 lines
and
+ .set_emul_temp =exynos_set_emul_temp,or do I miss something?
maybe you missed this email.
IMO, the code above should be much cleaner.
ohh sorry I missed the later part. Will implement these comments.
Thanks,
Amit D
Quoted 34 lines
thanks,
ruiQuoted 20 lines
thanks,
ruiQuoted 18 lines
drivers/thermal/exynos_thermal.c +0
-4exynos_sensor_conf.trip_data.trip_count = pdata->trigger_level0_en + pdata->trigger_level1_en + pdata->trigger_level2_en + pdata->trigger_level3_en;@@ -1025,10 +999,6 @@ static int __devinit exynos_tmu_probe(struct platform_device *pdev) goto err_clk; } - ret =create_emulation_sysfs (&pdev->dev); -if (ret) -dev_err (&pdev->dev,"Failed to create emulation mode sysfs node\n" ); -return 0 ; err_clk:platform_set_drvdata (pdev,NULL );@@ -1040,8 +1010,6 @@ static int __devexit exynos_tmu_remove(struct platform_device *pdev) {struct exynos_tmu_data *data =platform_get_drvdata (pdev);Quoted 5 lines
drivers/thermal/exynos_thermal.c static int __devexit exynos_tmu_remove(struct platform_device *pdev) · line 1015
Quoted 5 lines
drivers/thermal/exynos_thermal.c +0
-2-remove_emulation_sysfs (&pdev->dev); -exynos_tmu_control (pdev, false);exynos_unregister_thermal ();--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Zhang Rui
reviewerQuoted 94 lines · Amit Daniel Kachhap
This patch adds support to set the emulated temperature method in thermal zone (sensor). After setting this feature thermal zone may report this temperature and not the actual temperature. The emulation implementation may be based on sensor capability through platform specific handler or pure software emulation if no platform handler defined.
This is useful in debugging different temperature threshold and its associated cooling action. Critical threshold's cannot be emulated. Writing 0 on this node should disable emulation.
Signed-off-by Amit Daniel Kachhap <[email protected]>Acked-by Kukjin Kim <[email protected]>---
Changes in V2:
* Added config option for enabling emulation support.
* Added s/w emulation if no platform handler registered.
* skip the critical trip point emulationThis patchset is based on thermal maintainer next tree.
git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.gitnextDocumentation/thermal/sysfs-api.txt | 13 ++++++ drivers/thermal/Kconfig | 8 +++ drivers/thermal/thermal_sys.c | 82 ++++++++++++++++++++++++++++++----- include/linux/thermal.h | 2 + 4 files changed, 94 insertions(+), 11 deletions(-)Documentation/thermal/sysfs-api.txt +13
-0@@ -55,6 +55,8 @@ temperature) and throttle appropriate devices. .get_trip_type: get the type of certain trip point. .get_trip_temp: get the temperature above which the certain trip point will be fired. + .set_emul_temp: set the emulation temperature which helps in debugging + different threshold temperature points. 1.1.2 void thermal_zone_device_unregister(struct thermal_zone_device *tz)@@ -153,6 +155,7 @@ Thermal zone device sys I/F, created once it's registered: |---trip_point_[0-*]_temp: Trip point temperature |---trip_point_[0-*]_type: Trip point type |---trip_point_[0-*]_hyst: Hysteresis value for this trip point + |---emul_temp: Emulated temperature set node Thermal cooling device sys I/F, created once it's registered: /sys/class/thermal/cooling_device[0-*]:@@ -252,6 +255,16 @@ passive Valid values: 0 (disabled) or greater than 1000 RW, Optional +emul_temp + Interface to set the emulated temperature method in thermal zone + (sensor). After setting this temperature, the thermal zone may pass + this temperature to platform emulation function if registered or + cache it locally. This is useful in debugging different temperature + threshold and its associated cooling action. This is write only node + and writing 0 on this node should disable emulation. + Unit: millidegree Celsius + WO, Optional + ***************************** * Cooling device attributes * *****************************drivers/thermal/Kconfig +8
-0@@ -78,6 +78,14 @@ config CPU_THERMAL and not the ACPI interface. If you want this support, you should say Y here. +config THERMAL_EMULATION + bool "Thermal emulation mode support" + help + Enable this option to make a emul_temp sysfs node in thermal zone + directory to support temperature emulation. With emulation sysfs node, + user can manually input temperature and test the different trip + threshold behaviour for simulation purpose. + config SPEAR_THERMAL bool "SPEAr thermal sensor driver" depends on PLAT_SPEARdrivers/thermal/thermal_sys.c +1
-0@@ -378,24 +378,57 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip)monitor_thermal_zone (tz); } +static int thermal_zone_get_temp(struct thermal_zone_device *tz,
drivers/thermal/thermal_sys.c static void handle_thermal_trip(struct thermal_zone_device *tz, int trip) · line 391
Quoted 10 lines
drivers/thermal/thermal_sys.c +10
-0+ unsigned long *temp) +{ +int ret =0 , count; +unsigned long crit_temp =-1UL ; +enum thermal_trip_type type; + +mutex_lock (&tz->lock); + +if (tz->ops->get_temp) + ret = tz->ops->get_temp (tz, temp);
we do not need to do this check, .get_temp() should always be available.
#ifdef CONFIG_THERMAL_EMUL
Quoted 13 lines
drivers/thermal/thermal_sys.c +11
-0+else + ret = -EPERM ; + +if (!tz->emul_temperature) + goto skip_emul; + +for (count =0 ; count < tz->trips; count++) { + ret = tz->ops->get_trip_type (tz, count, &type); +if (!ret && type ==THERMAL_TRIP_CRITICAL ) { + ret = tz->ops->get_trip_temp (tz, count, &crit_temp); +break ;
drivers/thermal/thermal_sys.c static void handle_thermal_trip(struct thermal_zone_device *tz, int trip) · line 412
Quoted 10 lines
drivers/thermal/thermal_sys.c +10
-0+ } + } + +if (ret) + goto skip_emul; + +if (*temp < crit_temp) + *temp = tz->emul_temperature; + +skip_emul:
#endif
or you can introduce get_emul_temp() instead.
Quoted 106 lines
drivers/thermal/thermal_sys.c +7
-6+mutex_unlock (&tz->lock); +return ret; +} +static void update_temperature (struct thermal_zone_device *tz) {long temp;int ret; -mutex_lock (&tz->lock); - - ret = tz->ops->get_temp (tz, &temp); + ret =thermal_zone_get_temp (tz, &temp);if (ret) {dev_warn (&tz->device,"failed to read out thermal zone %d\n" , tz->id); - goto exit; +return ; } +mutex_lock (&tz->lock); tz->last_temperature = tz->temperature; tz->temperature = temp; - -exit:mutex_unlock (&tz->lock);}
drivers/thermal/thermal_sys.c +32
-5@@ -438,10 +471,7 @@ temp_show(struct device *dev, struct device_attribute *attr, char *buf)long temperature;int ret; -if (!tz->ops->get_temp) -return -EPERM ; - - ret = tz->ops->get_temp (tz, &temperature); + ret =thermal_zone_get_temp (tz, &temperature);if (ret)return ret;@@ -701,6 +731,31 @@ policy_show(struct device *dev, struct device_attribute *devattr, char *buf)return sprintf (buf,"%s\n" , tz->governor->name); } +#ifdef CONFIG_THERMAL_EMULATION +static ssize_t +emul_temp_store (struct device *dev,struct device_attribute *attr, +const char *buf,size_t count) +{ +struct thermal_zone_device *tz =to_thermal_zone (dev); +int ret =0 ; +unsigned long temperature; + +if (kstrtoul (buf,10 , &temperature)) +return -EINVAL ; + +if (!tz->ops->set_emul_temp) { +mutex_lock (&tz->lock); + tz->emul_temperature = temperature; +mutex_unlock (&tz->lock); + }else { + ret = tz->ops->set_emul_temp (tz, temperature); + } + +return ret ? ret : count; +} +static DEVICE_ATTR(emul_temp, S_IWUSR, NULL, emul_temp_store); +#endif /*CONFIG_THERMAL_EMULATION*/ + static DEVICE_ATTR(type, 0444, type_show, NULL); static DEVICE_ATTR(temp, 0444, temp_show, NULL); static DEVICE_ATTR(mode, 0644, mode_show, mode_store);@@ -843,7 +898,7 @@ temp_input_show(struct device *dev, struct device_attribute *attr, char *buf) temp_input);struct thermal_zone_device *tz = temp->tz; - ret = tz->ops->get_temp (tz, &temperature); + ret =thermal_zone_get_temp (tz, &temperature);if (ret)return ret;@@ -1596,6 +1651,11 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, goto unregister; } +#ifdef CONFIG_THERMAL_EMULATION + result =device_create_file (&tz->device, &dev_attr_emul_temp); +if (result) + goto unregister; +#endif /* Create policy attribute */ result =device_create_file (&tz->device, &dev_attr_policy);if (result)include/linux/thermal.h +1
-0@@ -123,6 +123,7 @@ struct thermal_zone_device_ops {int (*set_trip_hyst) (struct thermal_zone_device *,int ,unsigned long );int (*get_crit_temp) (struct thermal_zone_device *,unsigned long *); +int (*set_emul_temp) (struct thermal_zone_device *,unsigned long );int (*get_trend) (struct thermal_zone_device *,int ,enum thermal_trend *); int (*notify) (struct thermal_zone_device *, int,
include/linux/thermal.h struct thermal_zone_device { · line 172
Quoted 7 lines
include/linux/thermal.h +1
-0@@ -165,6 +166,7 @@ struct thermal_zone_device {int polling_delay;int temperature;int last_temperature; +int emul_temperature;int passive;unsigned int forced_passive;const struct thermal_zone_device_ops *ops;
others look okay to me.
thanks,
rui
Quoted 116 lines · Zhang Rui
Quoted 94 lines · Amit Daniel Kachhap
This patch adds support to set the emulated temperature method in thermal zone (sensor). After setting this feature thermal zone may report this temperature and not the actual temperature. The emulation implementation may be based on sensor capability through platform specific handler or pure software emulation if no platform handler defined.
This is useful in debugging different temperature threshold and its associated cooling action. Critical threshold's cannot be emulated. Writing 0 on this node should disable emulation.
Signed-off-by Amit Daniel Kachhap <[email protected]>Acked-by Kukjin Kim <[email protected]>---
Changes in V2:
* Added config option for enabling emulation support.
* Added s/w emulation if no platform handler registered.
* skip the critical trip point emulationThis patchset is based on thermal maintainer next tree.
git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.gitnextDocumentation/thermal/sysfs-api.txt | 13 ++++++ drivers/thermal/Kconfig | 8 +++ drivers/thermal/thermal_sys.c | 82 ++++++++++++++++++++++++++++++----- include/linux/thermal.h | 2 + 4 files changed, 94 insertions(+), 11 deletions(-)Documentation/thermal/sysfs-api.txt +13
-0@@ -55,6 +55,8 @@ temperature) and throttle appropriate devices. .get_trip_type: get the type of certain trip point. .get_trip_temp: get the temperature above which the certain trip point will be fired. + .set_emul_temp: set the emulation temperature which helps in debugging + different threshold temperature points. 1.1.2 void thermal_zone_device_unregister(struct thermal_zone_device *tz)@@ -153,6 +155,7 @@ Thermal zone device sys I/F, created once it's registered: |---trip_point_[0-*]_temp: Trip point temperature |---trip_point_[0-*]_type: Trip point type |---trip_point_[0-*]_hyst: Hysteresis value for this trip point + |---emul_temp: Emulated temperature set node Thermal cooling device sys I/F, created once it's registered: /sys/class/thermal/cooling_device[0-*]:@@ -252,6 +255,16 @@ passive Valid values: 0 (disabled) or greater than 1000 RW, Optional +emul_temp + Interface to set the emulated temperature method in thermal zone + (sensor). After setting this temperature, the thermal zone may pass + this temperature to platform emulation function if registered or + cache it locally. This is useful in debugging different temperature + threshold and its associated cooling action. This is write only node + and writing 0 on this node should disable emulation. + Unit: millidegree Celsius + WO, Optional + ***************************** * Cooling device attributes * *****************************drivers/thermal/Kconfig +8
-0@@ -78,6 +78,14 @@ config CPU_THERMAL and not the ACPI interface. If you want this support, you should say Y here. +config THERMAL_EMULATION + bool "Thermal emulation mode support" + help + Enable this option to make a emul_temp sysfs node in thermal zone + directory to support temperature emulation. With emulation sysfs node, + user can manually input temperature and test the different trip + threshold behaviour for simulation purpose. + config SPEAR_THERMAL bool "SPEAr thermal sensor driver" depends on PLAT_SPEARdrivers/thermal/thermal_sys.c +1
-0@@ -378,24 +378,57 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip)monitor_thermal_zone (tz); } +static int thermal_zone_get_temp(struct thermal_zone_device *tz,drivers/thermal/thermal_sys.c static void handle_thermal_trip(struct thermal_zone_device *tz, int trip) · line 391
Quoted 10 lines
drivers/thermal/thermal_sys.c +10
-0+ unsigned long *temp) +{ +int ret =0 , count; +unsigned long crit_temp =-1UL ; +enum thermal_trip_type type; + +mutex_lock (&tz->lock); + +if (tz->ops->get_temp) + ret = tz->ops->get_temp (tz, temp);we do not need to do this check, .get_temp() should always be available.
#ifdef
CONFIG_THERMAL_EMULQuoted 6 lines
drivers/thermal/thermal_sys.c +6
-0+else + ret = -EPERM ; + +if (!tz->emul_temperature) + goto skip_emul; +
Quoted 16 lines
Quoted 5 lines
drivers/thermal/thermal_sys.c +5
-0+for (count =0 ; count < tz->trips; count++) { + ret = tz->ops->get_trip_type (tz, count, &type); +if (!ret && type ==THERMAL_TRIP_CRITICAL ) { + ret = tz->ops->get_trip_temp (tz, count, &crit_temp); +break ;drivers/thermal/thermal_sys.c static void handle_thermal_trip(struct thermal_zone_device *tz, int trip) · line 412
Quoted 10 lines
drivers/thermal/thermal_sys.c +10
-0+ } + } + +if (ret) + goto skip_emul; + +if (*temp < crit_temp) + *temp = tz->emul_temperature; + +skip_emul:#endif
Will re-send with this code in #ifdef
Quoted 109 lines
or you can introduce
get_emul_temp()instead.Quoted 106 lines
drivers/thermal/thermal_sys.c +39
-11+mutex_unlock (&tz->lock); +return ret; +} +static void update_temperature (struct thermal_zone_device *tz) {long temp;int ret; -mutex_lock (&tz->lock); - - ret = tz->ops->get_temp (tz, &temp); + ret =thermal_zone_get_temp (tz, &temp);if (ret) {dev_warn (&tz->device,"failed to read out thermal zone %d\n" , tz->id); - goto exit; +return ; } +mutex_lock (&tz->lock); tz->last_temperature = tz->temperature; tz->temperature = temp; - -exit:mutex_unlock (&tz->lock); }@@ -438,10 +471,7 @@ temp_show(struct device *dev, struct device_attribute *attr, char *buf)long temperature;int ret; -if (!tz->ops->get_temp) -return -EPERM ; - - ret = tz->ops->get_temp (tz, &temperature); + ret =thermal_zone_get_temp (tz, &temperature);if (ret)return ret;@@ -701,6 +731,31 @@ policy_show(struct device *dev, struct device_attribute *devattr, char *buf)return sprintf (buf,"%s\n" , tz->governor->name); } +#ifdef CONFIG_THERMAL_EMULATION +static ssize_t +emul_temp_store (struct device *dev,struct device_attribute *attr, +const char *buf,size_t count) +{ +struct thermal_zone_device *tz =to_thermal_zone (dev); +int ret =0 ; +unsigned long temperature; + +if (kstrtoul (buf,10 , &temperature)) +return -EINVAL ; + +if (!tz->ops->set_emul_temp) { +mutex_lock (&tz->lock); + tz->emul_temperature = temperature; +mutex_unlock (&tz->lock); + }else { + ret = tz->ops->set_emul_temp (tz, temperature); + } + +return ret ? ret : count; +} +static DEVICE_ATTR(emul_temp, S_IWUSR, NULL, emul_temp_store); +#endif /*CONFIG_THERMAL_EMULATION*/ + static DEVICE_ATTR(type, 0444, type_show, NULL); static DEVICE_ATTR(temp, 0444, temp_show, NULL); static DEVICE_ATTR(mode, 0644, mode_show, mode_store);@@ -843,7 +898,7 @@ temp_input_show(struct device *dev, struct device_attribute *attr, char *buf) temp_input);struct thermal_zone_device *tz = temp->tz; - ret = tz->ops->get_temp (tz, &temperature); + ret =thermal_zone_get_temp (tz, &temperature);if (ret)return ret;@@ -1596,6 +1651,11 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, goto unregister; } +#ifdef CONFIG_THERMAL_EMULATION + result =device_create_file (&tz->device, &dev_attr_emul_temp); +if (result) + goto unregister; +#endif /* Create policy attribute */ result =device_create_file (&tz->device, &dev_attr_policy);if (result)include/linux/thermal.h +1
-0@@ -123,6 +123,7 @@ struct thermal_zone_device_ops {int (*set_trip_hyst) (struct thermal_zone_device *,int ,unsigned long );int (*get_crit_temp) (struct thermal_zone_device *,unsigned long *); +int (*set_emul_temp) (struct thermal_zone_device *,unsigned long );int (*get_trend) (struct thermal_zone_device *,int ,enum thermal_trend *); int (*notify) (struct thermal_zone_device *, int,@@ -165,6 +166,7 @@ struct thermal_zone_device {
Quoted 8 lines
include/linux/thermal.h struct thermal_zone_device { · line 172
Quoted 7 lines
include/linux/thermal.h +1
-0int polling_delay;int temperature;int last_temperature; +int emul_temperature;int passive;unsigned int forced_passive;const struct thermal_zone_device_ops *ops;others look okay to me.
Thanks.
Amit
Quoted 9 lines
thanks,
rui--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v3 1/2 thermal: sysfs: Add a new sysfs node emul_temp for thermal emulation
In reply to Amit Daniel KachhapThis patch adds support to set the emulated temperature method in thermal zone (sensor). After setting this feature thermal zone may report this temperature and not the actual temperature. The emulation implementation may be based on sensor capability through platform specific handler or pure software emulation if no platform handler defined.
This is useful in debugging different temperature threshold and its associated cooling action. Critical threshold's cannot be emulated. Writing 0 on this node should disable emulation.
---
Changes in V3:
* Removed the un-necessary get_temp pointer check.
* Added the read temp code in #ifdef EMULATION macros
Changes in V2:
* Added config option for enabling emulation support.
* Added s/w emulation if no platform handler registered.
* skip the critical trip point emulation
This patchset is based on thermal maintainer next tree.git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git next
Documentation/thermal/sysfs-api.txt | 13 ++++++ drivers/thermal/Kconfig | 8 ++++ drivers/thermal/thermal_sys.c | 79 ++++++++++++++++++++++++++++++----- include/linux/thermal.h | 2 + 4 files changed, 91 insertions(+), 11 deletions(-)
Documentation/thermal/sysfs-api.txt +13 -0
@@ -55,6 +55,8 @@ temperature) and throttle appropriate devices. .get_trip_type: get the type of certain trip point. .get_trip_temp: get the temperature above which the certain trip point will be fired. + .set_emul_temp: set the emulation temperature which helps in debugging + different threshold temperature points. 1.1.2 void thermal_zone_device_unregister(struct thermal_zone_device *tz)
@@ -153,6 +155,7 @@ Thermal zone device sys I/F, created once it's registered: |---trip_point_[0-*]_temp: Trip point temperature |---trip_point_[0-*]_type: Trip point type |---trip_point_[0-*]_hyst: Hysteresis value for this trip point + |---emul_temp: Emulated temperature set node Thermal cooling device sys I/F, created once it's registered: /sys/class/thermal/cooling_device[0-*]:
@@ -252,6 +255,16 @@ passive Valid values: 0 (disabled) or greater than 1000 RW, Optional +emul_temp + Interface to set the emulated temperature method in thermal zone + (sensor). After setting this temperature, the thermal zone may pass + this temperature to platform emulation function if registered or + cache it locally. This is useful in debugging different temperature + threshold and its associated cooling action. This is write only node + and writing 0 on this node should disable emulation. + Unit: millidegree Celsius + WO, Optional + ***************************** * Cooling device attributes * *****************************
drivers/thermal/Kconfig +8 -0
@@ -78,6 +78,14 @@ config CPU_THERMAL and not the ACPI interface. If you want this support, you should say Y here. +config THERMAL_EMULATION + bool "Thermal emulation mode support" + help + Enable this option to make a emul_temp sysfs node in thermal zone + directory to support temperature emulation. With emulation sysfs node, + user can manually input temperature and test the different trip + threshold behaviour for simulation purpose. + config SPEAR_THERMAL bool "SPEAr thermal sensor driver" depends on PLAT_SPEAR
drivers/thermal/thermal_sys.c +68 -11
121 lines not on this page · raw message
include/linux/thermal.h +2 -0
@@ -123,6 +123,7 @@ struct thermal_zone_device_ops {int (*set_trip_hyst) (struct thermal_zone_device *,int ,unsigned long );int (*get_crit_temp) (struct thermal_zone_device *,unsigned long *); +int (*set_emul_temp) (struct thermal_zone_device *,unsigned long );int (*get_trend) (struct thermal_zone_device *,int ,enum thermal_trend *); int (*notify) (struct thermal_zone_device *, int,
@@ -165,6 +166,7 @@ struct thermal_zone_device {int polling_delay;int temperature;int last_temperature; +int emul_temperature;int passive;unsigned int forced_passive;const struct thermal_zone_device_ops *ops;
Signature · 1 line
1.7.5.4
Quoted 6 lines · Amit Daniel Kachhap
This patch adds support to set the emulated temperature method in thermal zone (sensor). After setting this feature thermal zone may report this temperature and not the actual temperature. The emulation implementation may be based on sensor capability through platform specific handler or pure software emulation if no platform handler defined.
Quoted 6 lines
This is useful in debugging different temperature threshold and its associated cooling action. Critical threshold's cannot be emulated. Writing 0 on this node should disable emulation.
Signed-off-by Amit Daniel Kachhap <[email protected]>Acked-by Kukjin Kim <[email protected]>
applied to thermal -next.
thanks,
rui
Quoted 226 lines
---
Changes in V3:
* Removed the un-necessaryget_temppointer check.
* Added the read temp code in #ifdef EMULATION macrosChanges in V2:
* Added config option for enabling emulation support.
* Added s/w emulation if no platform handler registered.
* skip the critical trip point emulationThis patchset is based on thermal maintainer next tree.
git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.gitnextDocumentation/thermal/sysfs-api.txt | 13 ++++++ drivers/thermal/Kconfig | 8 ++++ drivers/thermal/thermal_sys.c | 79 ++++++++++++++++++++++++++++++----- include/linux/thermal.h | 2 + 4 files changed, 91 insertions(+), 11 deletions(-)Documentation/thermal/sysfs-api.txt +13
-0@@ -55,6 +55,8 @@ temperature) and throttle appropriate devices. .get_trip_type: get the type of certain trip point. .get_trip_temp: get the temperature above which the certain trip point will be fired. + .set_emul_temp: set the emulation temperature which helps in debugging + different threshold temperature points. 1.1.2 void thermal_zone_device_unregister(struct thermal_zone_device *tz)@@ -153,6 +155,7 @@ Thermal zone device sys I/F, created once it's registered: |---trip_point_[0-*]_temp: Trip point temperature |---trip_point_[0-*]_type: Trip point type |---trip_point_[0-*]_hyst: Hysteresis value for this trip point + |---emul_temp: Emulated temperature set node Thermal cooling device sys I/F, created once it's registered: /sys/class/thermal/cooling_device[0-*]:@@ -252,6 +255,16 @@ passive Valid values: 0 (disabled) or greater than 1000 RW, Optional +emul_temp + Interface to set the emulated temperature method in thermal zone + (sensor). After setting this temperature, the thermal zone may pass + this temperature to platform emulation function if registered or + cache it locally. This is useful in debugging different temperature + threshold and its associated cooling action. This is write only node + and writing 0 on this node should disable emulation. + Unit: millidegree Celsius + WO, Optional + ***************************** * Cooling device attributes * *****************************drivers/thermal/Kconfig +8
-0@@ -78,6 +78,14 @@ config CPU_THERMAL and not the ACPI interface. If you want this support, you should say Y here. +config THERMAL_EMULATION + bool "Thermal emulation mode support" + help + Enable this option to make a emul_temp sysfs node in thermal zone + directory to support temperature emulation. With emulation sysfs node, + user can manually input temperature and test the different trip + threshold behaviour for simulation purpose. + config SPEAR_THERMAL bool "SPEAr thermal sensor driver" depends on PLAT_SPEARdrivers/thermal/thermal_sys.c +68
-11@@ -378,24 +378,54 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip)monitor_thermal_zone (tz); } +static int thermal_zone_get_temp (struct thermal_zone_device *tz, +unsigned long *temp) +{ +int ret =0 , count; +unsigned long crit_temp =-1UL ; +enum thermal_trip_type type; + +mutex_lock (&tz->lock); + + ret = tz->ops->get_temp (tz, temp); +#ifdef CONFIG_THERMAL_EMULATION +if (!tz->emul_temperature) + goto skip_emul; + +for (count =0 ; count < tz->trips; count++) { + ret = tz->ops->get_trip_type (tz, count, &type); +if (!ret && type ==THERMAL_TRIP_CRITICAL ) { + ret = tz->ops->get_trip_temp (tz, count, &crit_temp); +break ; + } + } + +if (ret) + goto skip_emul; + +if (*temp < crit_temp) + *temp = tz->emul_temperature; +skip_emul: +#endif +mutex_unlock (&tz->lock); +return ret; +} +static void update_temperature (struct thermal_zone_device *tz) {long temp;int ret; -mutex_lock (&tz->lock); - - ret = tz->ops->get_temp (tz, &temp); + ret =thermal_zone_get_temp (tz, &temp);if (ret) {dev_warn (&tz->device,"failed to read out thermal zone %d\n" , tz->id); - goto exit; +return ; } +mutex_lock (&tz->lock); tz->last_temperature = tz->temperature; tz->temperature = temp; - -exit:mutex_unlock (&tz->lock); }@@ -438,10 +468,7 @@ temp_show(struct device *dev, struct device_attribute *attr, char *buf)long temperature;int ret; -if (!tz->ops->get_temp) -return -EPERM ; - - ret = tz->ops->get_temp (tz, &temperature); + ret =thermal_zone_get_temp (tz, &temperature);if (ret)return ret;@@ -701,6 +728,31 @@ policy_show(struct device *dev, struct device_attribute *devattr, char *buf)return sprintf (buf,"%s\n" , tz->governor->name); } +#ifdef CONFIG_THERMAL_EMULATION +static ssize_t +emul_temp_store (struct device *dev,struct device_attribute *attr, +const char *buf,size_t count) +{ +struct thermal_zone_device *tz =to_thermal_zone (dev); +int ret =0 ; +unsigned long temperature; + +if (kstrtoul (buf,10 , &temperature)) +return -EINVAL ; + +if (!tz->ops->set_emul_temp) { +mutex_lock (&tz->lock); + tz->emul_temperature = temperature; +mutex_unlock (&tz->lock); + }else { + ret = tz->ops->set_emul_temp (tz, temperature); + } + +return ret ? ret : count; +} +static DEVICE_ATTR(emul_temp, S_IWUSR, NULL, emul_temp_store); +#endif /*CONFIG_THERMAL_EMULATION*/ + static DEVICE_ATTR(type, 0444, type_show, NULL); static DEVICE_ATTR(temp, 0444, temp_show, NULL); static DEVICE_ATTR(mode, 0644, mode_show, mode_store);@@ -843,7 +895,7 @@ temp_input_show(struct device *dev, struct device_attribute *attr, char *buf) temp_input);struct thermal_zone_device *tz = temp->tz; - ret = tz->ops->get_temp (tz, &temperature); + ret =thermal_zone_get_temp (tz, &temperature);if (ret)return ret;@@ -1596,6 +1648,11 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, goto unregister; } +#ifdef CONFIG_THERMAL_EMULATION + result =device_create_file (&tz->device, &dev_attr_emul_temp); +if (result) + goto unregister; +#endif /* Create policy attribute */ result =device_create_file (&tz->device, &dev_attr_policy);if (result)include/linux/thermal.h +2
-0@@ -123,6 +123,7 @@ struct thermal_zone_device_ops {int (*set_trip_hyst) (struct thermal_zone_device *,int ,unsigned long );int (*get_crit_temp) (struct thermal_zone_device *,unsigned long *); +int (*set_emul_temp) (struct thermal_zone_device *,unsigned long );int (*get_trend) (struct thermal_zone_device *,int ,enum thermal_trend *); int (*notify) (struct thermal_zone_device *, int,@@ -165,6 +166,7 @@ struct thermal_zone_device {int polling_delay;int temperature;int last_temperature; +int emul_temperature;int passive;unsigned int forced_passive;const struct thermal_zone_device_ops *ops;