Stop monitoring disabled devices
Subsystems (17)
cover Stop monitoring disabled devices
The current kernel behavior is to keep polling the thermal zone devices regardless of their current mode. This is not desired, as all such "disabled" devices are meant to be handled by userspace, so polling them makes no sense.
There was an attempt to solve this issue:
https://lkml.org/lkml/2018/2/26/498
and it ultimately has not succeeded:
https://lkml.org/lkml/2018/2/27/910
This is a new attempt addressing all the relevant drivers, and I have identified them with:
$ git grep "thermal_zone_device_ops" | grep "= {" | cut -f1 -d: | sort | uniqThe idea is to modify thermal_zone_device_update() and monitor_thermal_zone() in such a way that they stop polling a disabled device. To do decide what to do they should call ->get_mode() operation of the specialized thermal zone device in question (e.g. drivers/acpi/thermal.c's). But here comes problem:
sometimes a thermal zone device must be initially disabled and becomes enabled only after its sensors appear on the system. If such thermal zone's ->get_mode() /* in the context of thermal_zone_device_update() or monitor_thermal_zone() */ is called _before_ the sensors are available, it will be reported as "disabled" and consequently polling it will be ceased. This is a change in behavior from userspace's perspective.
To solve the above described problem I want to introduce the third mode of athermal_zone_device: initial. The idea is that when the device is in its initial mode, then its polling will be handled as it is now. This is a good
thing: should the temperature be just about hitting the critical treshnold early during the boot process, it might be too late if we wait for the userspace to run to save the system from overheating. The initial mode should be reported in sysfs as "enabled" to keep the userspace interface intact. From the initial mode there will be two possible transitions: to enabled or disabled mode, but there will be no transition back to initial. If the transition is from initial to enabled, then keep polling. If the transition is from initial to disabled, then stop polling. If the transition is from enabled to disabled, then stop polling. The transition from disabled to enabled must be handled in a special way: there must be a mandatory call to monitor_thermal_zone(), otherwise the polling will not start. If this transition is triggeted from sysfs, then it can be easily handled at the thermal framework level. However, if drivers call their own ->set_mode() operation then they must also call "monitor_thermal_zone()" afterwards. The latter being a sensible thing anyway, so perhaps all/most of the drivers in question do. The plan for implementation is this:
- ensure ALL users use symbolic enum names (THERMAL_DEVICE_DISABLED, THERMAL_DEVICE_ENABLED) for thermal device mode rather than the numeric values of enum thermal_device_mode elements
- add THERMAL_DEVICE_INITIAL to the said enum making its value 0 (so that kzalloc() results in the initial state)
- modify thermal zone device's mode_show() (thermal framework level) so that it reports "enabled" for THERMAL_DEVICE_INITIAL
- modify thermal zone device's mode_store() (thermal framework level) so that it calls monitor_thermal_zone() upon mode change
- modify ALL thermal drivers so that their code is prepared to return THERMAL_DEVICE_INITIAL before they call thermal_zone_device_register(); when the invocation of the latter completes then polling is expected to be started
- verify ALL drivers which call their own ->set_mode() to ensure they do call monitor_thermal_zone() afterwards
- modify thermal_zone_device_update() and monitor_thermal_zone() so that they cancel polling for disabled thermal zone devices (but not for those in THERMAL_DEVICE_INITIAL mode)
This RFC series does all the above steps in more or less that order.
I kindly ask for comments/suggestions/improvements.
Rebased onto v5.6.
Andrzej Pietrasiewicz (8):
thermal: int3400_thermal: Statically initialize
.get_mode()/.set_mode() ops
thermal: Properly handle mode values in .set_mode()
thermal: Store thermal mode in a dedicated enum
thermal: core: Introduce THERMAL_DEVICE_INITIAL
thermal: core: Monitor thermal zone after mode change
thermal: Set initial state to THERMAL_DEVICE_INITIAL
thermal: of: Monitor thermal zone after enabling it
thermal: Stop polling DISABLED thermal devices
drivers/acpi/thermal.c | 28 +++++----- .../ethernet/mellanox/mlxsw/core_thermal.c | 11 +++- drivers/platform/x86/acerhdf.c | 17 ++++-- drivers/thermal/da9062-thermal.c | 2 +- drivers/thermal/imx_thermal.c | 5 +- .../intel/int340x_thermal/int3400_thermal.c | 24 ++++----- .../thermal/intel/intel_quark_dts_thermal.c | 6 ++- drivers/thermal/of-thermal.c | 9 +++- drivers/thermal/thermal_core.c | 52 ++++++++++++++++++- drivers/thermal/thermal_core.h | 2 + drivers/thermal/thermal_sysfs.c | 12 +++-- include/linux/thermal.h | 3 +- 12 files changed, 123 insertions(+), 48 deletions(-)
Signature · 1 line
2.17.1
RFC 1/8 thermal: int3400_thermal: Statically initialize .get_mode()/.set_mode() ops
int3400_thermal_ops is used inside int3400_thermal_probe() only after the assignments, which can just as well be made statically at struct's initizer.
--- drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +2 -3
@@ -271,6 +271,8 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal,static struct thermal_zone_device_ops int3400_thermal_ops = { .get_temp = int3400_thermal_get_temp, + .get_mode = int3400_thermal_get_mode, + .set_mode = int3400_thermal_set_mode, };static struct thermal_zone_params int3400_thermal_params = {
@@ -309,9 +311,6 @@ static int int3400_thermal_probe(struct platform_device *pdev)platform_set_drvdata (pdev, priv); - int3400_thermal_ops.get_mode = int3400_thermal_get_mode; - int3400_thermal_ops.set_mode = int3400_thermal_set_mode; - priv->thermal =thermal_zone_device_register ("INT3400 Thermal" ,0 ,0 , priv, &int3400_thermal_ops, &int3400_thermal_params,0 ,0 );
Signature · 1 line
2.17.1
Re: [RFC 1/8] thermal: int3400_thermal: Statically initialize .get_mode()/.set_mode() ops
Quoted 5 lines · Andrzej Pietrasiewicz
int3400_thermal_opsis used insideint3400_thermal_probe()only after the assignments, which can just as well be made statically at struct's initizer.Signed-off-by Andrzej Pietrasiewicz <[email protected]>
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Quoted 28 lines
--- drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/thermal/intel/int340x_thermal/int3400_thermal.c +2
-3@@ -271,6 +271,8 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal,static struct thermal_zone_device_ops int3400_thermal_ops = { .get_temp = int3400_thermal_get_temp, + .get_mode = int3400_thermal_get_mode, + .set_mode = int3400_thermal_set_mode, };static struct thermal_zone_params int3400_thermal_params = {@@ -309,9 +311,6 @@ static int int3400_thermal_probe(struct platform_device *pdev)platform_set_drvdata (pdev, priv); - int3400_thermal_ops.get_mode = int3400_thermal_get_mode; - int3400_thermal_ops.set_mode = int3400_thermal_set_mode; - priv->thermal =thermal_zone_device_register ("INT3400 Thermal" ,0 ,0 , priv, &int3400_thermal_ops, &int3400_thermal_params,0 ,0 );
RFC 2/8 thermal: Properly handle mode values in .set_mode()
In reply to Andrzej PietrasiewiczAllow only THERMAL_DEVICE_ENABLED and THERMAL_DEVICE_DISABLED as valid states to transition to.
--- drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 8 ++++++-- drivers/platform/x86/acerhdf.c | 4 ++++ drivers/thermal/imx_thermal.c | 4 +++- drivers/thermal/intel/intel_quark_dts_thermal.c | 5 ++++- drivers/thermal/of-thermal.c | 4 +++- 5 files changed, 20 insertions(+), 5 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +6 -2
@@ -296,8 +296,10 @@ static int mlxsw_thermal_set_mode(struct thermal_zone_device *tzdev,if (mode ==THERMAL_DEVICE_ENABLED ) tzdev->polling_delay = thermal->polling_delay; -else +else if (mode ==THERMAL_DEVICE_DISABLED ) tzdev->polling_delay =0 ; +else +return -EINVAL ;mutex_unlock (&tzdev->lock);
@@ -486,8 +488,10 @@ static int mlxsw_thermal_module_mode_set(struct thermal_zone_device *tzdev,if (mode ==THERMAL_DEVICE_ENABLED ) tzdev->polling_delay = thermal->polling_delay; -else +else if (mode ==THERMAL_DEVICE_DISABLED ) tzdev->polling_delay =0 ; +else +return -EINVAL ;mutex_unlock (&tzdev->lock);
drivers/platform/x86/acerhdf.c +4 -0
@@ -431,6 +431,10 @@ static int acerhdf_get_mode(struct thermal_zone_device *thermal,static int acerhdf_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) { +if (mode !=THERMAL_DEVICE_DISABLED && + mode !=THERMAL_DEVICE_ENABLED ) +return -EINVAL ; +if (mode ==THERMAL_DEVICE_DISABLED && kernelmode)acerhdf_revert_to_bios_mode ();else if (mode ==THERMAL_DEVICE_ENABLED && !kernelmode)
drivers/thermal/imx_thermal.c +3 -1
@@ -368,7 +368,7 @@ static int imx_set_mode(struct thermal_zone_device *tz, data->irq_enabled = true;enable_irq (data->irq); } - }else { + }else if (mode ==THERMAL_DEVICE_DISABLED ) {regmap_write (map, soc_data->sensor_ctrl +REG_CLR , soc_data->measure_temp_mask); regmap_write(map, soc_data->sensor_ctrl + REG_SET,
@@ -381,6 +381,8 @@ static int imx_set_mode(struct thermal_zone_device *tz,disable_irq (data->irq); data->irq_enabled = false; } + }else { +return -EINVAL ; } data->mode = mode;
drivers/thermal/intel/intel_quark_dts_thermal.c +4 -1
@@ -328,8 +328,11 @@ static int sys_set_mode(struct thermal_zone_device *tzd,mutex_lock (&dts_update_mutex);if (mode ==THERMAL_DEVICE_ENABLED ) ret =soc_dts_enable (tzd); -else +else if (mode ==THERMAL_DEVICE_DISABLED ) ret =soc_dts_disable (tzd); +else +return -EINVAL ; +mutex_unlock (&dts_update_mutex);return ret;
drivers/thermal/of-thermal.c +3 -1
@@ -289,9 +289,11 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz,if (mode ==THERMAL_DEVICE_ENABLED ) { tz->polling_delay = data->polling_delay; tz->passive_delay = data->passive_delay; - }else { + }else if (mode ==THERMAL_DEVICE_DISABLED ) { tz->polling_delay =0 ; tz->passive_delay =0 ; + }else { +return -EINVAL ; }mutex_unlock (&tz->lock);
Signature · 1 line
2.17.1
Re: [RFC 2/8] thermal: Properly handle mode values in .set_mode()
Quoted 17 lines · Andrzej Pietrasiewicz
Allow only
THERMAL_DEVICE_ENABLEDandTHERMAL_DEVICE_DISABLEDas valid states to transition to.Signed-off-by Andrzej Pietrasiewicz <[email protected]>--- drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 8 ++++++-- drivers/platform/x86/acerhdf.c | 4 ++++ drivers/thermal/imx_thermal.c | 4 +++- drivers/thermal/intel/intel_quark_dts_thermal.c | 5 ++++- drivers/thermal/of-thermal.c | 4 +++- 5 files changed, 20 insertions(+), 5 deletions(-)drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +0
-0
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c static int mlxsw_thermal_set_mode(struct thermal_zone_device *tzdev, · line 302
Quoted 8 lines
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +3
-1@@ -296,8 +296,10 @@ static int mlxsw_thermal_set_mode(struct thermal_zone_device *tzdev,if (mode ==THERMAL_DEVICE_ENABLED ) tzdev->polling_delay = thermal->polling_delay; -else +else if (mode ==THERMAL_DEVICE_DISABLED ) tzdev->polling_delay =0 ; +else +return -EINVAL ;
Making sure that the valid parameters are passed to driver specific ->set_mode method should be handled in the higher layer (callers).
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Quoted 86 lines
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +3
-1mutex_unlock (&tzdev->lock);@@ -486,8 +488,10 @@ static int mlxsw_thermal_module_mode_set(struct thermal_zone_device *tzdev,if (mode ==THERMAL_DEVICE_ENABLED ) tzdev->polling_delay = thermal->polling_delay; -else +else if (mode ==THERMAL_DEVICE_DISABLED ) tzdev->polling_delay =0 ; +else +return -EINVAL ;mutex_unlock (&tzdev->lock);drivers/platform/x86/acerhdf.c +4
-0@@ -431,6 +431,10 @@ static int acerhdf_get_mode(struct thermal_zone_device *thermal,static int acerhdf_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) { +if (mode !=THERMAL_DEVICE_DISABLED && + mode !=THERMAL_DEVICE_ENABLED ) +return -EINVAL ; +if (mode ==THERMAL_DEVICE_DISABLED && kernelmode)acerhdf_revert_to_bios_mode ();else if (mode ==THERMAL_DEVICE_ENABLED && !kernelmode)drivers/thermal/imx_thermal.c +3
-1@@ -368,7 +368,7 @@ static int imx_set_mode(struct thermal_zone_device *tz, data->irq_enabled = true;enable_irq (data->irq); } - }else { + }else if (mode ==THERMAL_DEVICE_DISABLED ) {regmap_write (map, soc_data->sensor_ctrl +REG_CLR , soc_data->measure_temp_mask); regmap_write(map, soc_data->sensor_ctrl + REG_SET,@@ -381,6 +381,8 @@ static int imx_set_mode(struct thermal_zone_device *tz,disable_irq (data->irq); data->irq_enabled = false; } + }else { +return -EINVAL ; } data->mode = mode;drivers/thermal/intel/intel_quark_dts_thermal.c +4
-1@@ -328,8 +328,11 @@ static int sys_set_mode(struct thermal_zone_device *tzd,mutex_lock (&dts_update_mutex);if (mode ==THERMAL_DEVICE_ENABLED ) ret =soc_dts_enable (tzd); -else +else if (mode ==THERMAL_DEVICE_DISABLED ) ret =soc_dts_disable (tzd); +else +return -EINVAL ; +mutex_unlock (&dts_update_mutex);return ret;drivers/thermal/of-thermal.c +3
-1@@ -289,9 +289,11 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz,if (mode ==THERMAL_DEVICE_ENABLED ) { tz->polling_delay = data->polling_delay; tz->passive_delay = data->passive_delay; - }else { + }else if (mode ==THERMAL_DEVICE_DISABLED ) { tz->polling_delay =0 ; tz->passive_delay =0 ; + }else { +return -EINVAL ; }mutex_unlock (&tz->lock);
RFC 3/8 thermal: Store thermal mode in a dedicated enum
In reply to Andrzej PietrasiewiczPrepare for adding THERMAL_DEVICE_INITIAL mode.
--- drivers/acpi/thermal.c | 27 +++++++++---------- drivers/platform/x86/acerhdf.c | 12 ++++++--- .../intel/int340x_thermal/int3400_thermal.c | 18 +++++-------- 3 files changed, 27 insertions(+), 30 deletions(-)
drivers/acpi/thermal.c +12 -15
@@ -172,7 +172,7 @@ struct acpi_thermal {struct acpi_thermal_trips trips;struct acpi_handle_list devices;struct thermal_zone_device *thermal_zone; -int tz_enabled; +enum thermal_device_mode mode;int kelvin_offset;/* in millidegrees */ struct work_struct thermal_check_work; };
@@ -500,7 +500,7 @@ static void acpi_thermal_check(void *data) {struct acpi_thermal *tz = data; -if (!tz->tz_enabled) +if (tz->mode !=THERMAL_DEVICE_ENABLED )return ; thermal_zone_device_update(tz->thermal_zone,
@@ -534,8 +534,7 @@ static int thermal_get_mode(struct thermal_zone_device *thermal,if (!tz)return -EINVAL ; - *mode = tz->tz_enabled ?THERMAL_DEVICE_ENABLED : -THERMAL_DEVICE_DISABLED ; + *mode = tz->mode;return 0 ; }
@@ -544,27 +543,25 @@ static int thermal_set_mode(struct thermal_zone_device *thermal, enum thermal_device_mode mode) {struct acpi_thermal *tz = thermal->devdata; -int enable;if (!tz)return -EINVAL ; +if (mode !=THERMAL_DEVICE_DISABLED && + mode !=THERMAL_DEVICE_ENABLED ) +return -EINVAL ;/* * enable/disable thermal management from ACPI thermal driver */ -if (mode ==THERMAL_DEVICE_ENABLED ) - enable =1 ; -else if (mode ==THERMAL_DEVICE_DISABLED ) { - enable =0 ; +if (mode ==THERMAL_DEVICE_DISABLED )pr_warn ("thermal zone will be disabled\n" ); - }else -return -EINVAL ; -if (enable != tz->tz_enabled) { - tz->tz_enabled = enable; +if (mode != tz->mode) { + tz->mode = mode;ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"%s kernel ACPI thermal control\n" , - tz->tz_enabled ?"Enable" :"Disable" )); + tz->mode ==THERMAL_DEVICE_ENABLED ? +"Enable" :"Disable" ));acpi_thermal_check (tz); }return 0 ;
@@ -913,7 +910,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)if (ACPI_FAILURE (status))return -ENODEV ; - tz->tz_enabled =1 ; + tz->mode =THERMAL_DEVICE_ENABLED ;dev_info (&tz->device->dev,"registered as thermal_zone%d\n" , tz->thermal_zone->id);
drivers/platform/x86/acerhdf.c +8 -4
@@ -65,8 +65,10 @@#ifdef START_IN_KERNEL_MODE static int kernelmode =1 ; +static enum thermal_device_mode thermal_mode =THERMAL_DEVICE_ENABLED ;#else static int kernelmode; +static enum thermal_device_mode thermal_mode =THERMAL_DEVICE_DISABLED ;#endif static unsigned int interval =10 ;
@@ -416,8 +418,7 @@ static int acerhdf_get_mode(struct thermal_zone_device *thermal,if (verbose)pr_notice ("kernel mode fan control %d\n" , kernelmode); - *mode = (kernelmode) ?THERMAL_DEVICE_ENABLED - :THERMAL_DEVICE_DISABLED ; + *mode = thermal_mode;return 0 ; }
@@ -435,10 +436,13 @@ static int acerhdf_set_mode(struct thermal_zone_device *thermal, mode != THERMAL_DEVICE_ENABLED)return -EINVAL ; -if (mode ==THERMAL_DEVICE_DISABLED && kernelmode) +if (mode ==THERMAL_DEVICE_DISABLED && kernelmode) {acerhdf_revert_to_bios_mode (); -else if (mode ==THERMAL_DEVICE_ENABLED && !kernelmode) + thermal_mode =THERMAL_DEVICE_DISABLED ; + }else if (mode ==THERMAL_DEVICE_ENABLED && !kernelmode) {acerhdf_enable_kernelmode (); + thermal_mode =THERMAL_DEVICE_ENABLED ; + }return 0 ; }
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +7 -11
@@ -44,7 +44,7 @@ static char *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = {struct int3400_thermal_priv {struct acpi_device *adev;struct thermal_zone_device *thermal; -int mode; +enum thermal_device_mode mode;int art_count;struct art *arts;int trt_count;
@@ -247,24 +247,20 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal, enum thermal_device_mode mode) {struct int3400_thermal_priv *priv = thermal->devdata; -bool enable;int result =0 ;if (!priv)return -EINVAL ; -if (mode ==THERMAL_DEVICE_ENABLED ) - enable = true; -else if (mode ==THERMAL_DEVICE_DISABLED ) - enable = false; -else +if (mode !=THERMAL_DEVICE_ENABLED && + mode !=THERMAL_DEVICE_DISABLED )return -EINVAL ; -if (enable != priv->mode) { - priv->mode = enable; +if (mode != priv->mode) { + priv->mode = mode; result =int3400_thermal_run_osc (priv->adev->handle, - priv->current_uuid_index, - enable); + priv->current_uuid_index, + mode ==THERMAL_DEVICE_ENABLED ); }return result; }
Signature · 1 line
2.17.1
Re: [RFC 3/8] thermal: Store thermal mode in a dedicated enum
Quoted 117 lines · Andrzej Pietrasiewicz
Prepare for adding
THERMAL_DEVICE_INITIALmode.Signed-off-by Andrzej Pietrasiewicz <[email protected]>--- drivers/acpi/thermal.c | 27 +++++++++---------- drivers/platform/x86/acerhdf.c | 12 ++++++--- .../intel/int340x_thermal/int3400_thermal.c | 18 +++++-------- 3 files changed, 27 insertions(+), 30 deletions(-)drivers/acpi/thermal.c +12
-15@@ -172,7 +172,7 @@ struct acpi_thermal {struct acpi_thermal_trips trips;struct acpi_handle_list devices;struct thermal_zone_device *thermal_zone; -int tz_enabled; +enum thermal_device_mode mode;int kelvin_offset;/* in millidegrees */ struct work_struct thermal_check_work; };@@ -500,7 +500,7 @@ static void acpi_thermal_check(void *data) {struct acpi_thermal *tz = data; -if (!tz->tz_enabled) +if (tz->mode !=THERMAL_DEVICE_ENABLED )return ; thermal_zone_device_update(tz->thermal_zone,@@ -534,8 +534,7 @@ static int thermal_get_mode(struct thermal_zone_device *thermal,if (!tz)return -EINVAL ; - *mode = tz->tz_enabled ?THERMAL_DEVICE_ENABLED : -THERMAL_DEVICE_DISABLED ; + *mode = tz->mode;return 0 ; }@@ -544,27 +543,25 @@ static int thermal_set_mode(struct thermal_zone_device *thermal, enum thermal_device_mode mode) {struct acpi_thermal *tz = thermal->devdata; -int enable;if (!tz)return -EINVAL ; +if (mode !=THERMAL_DEVICE_DISABLED && + mode !=THERMAL_DEVICE_ENABLED ) +return -EINVAL ;/* * enable/disable thermal management from ACPI thermal driver */ -if (mode ==THERMAL_DEVICE_ENABLED ) - enable =1 ; -else if (mode ==THERMAL_DEVICE_DISABLED ) { - enable =0 ; +if (mode ==THERMAL_DEVICE_DISABLED )pr_warn ("thermal zone will be disabled\n" ); - }else -return -EINVAL ; -if (enable != tz->tz_enabled) { - tz->tz_enabled = enable; +if (mode != tz->mode) { + tz->mode = mode;ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"%s kernel ACPI thermal control\n" , - tz->tz_enabled ?"Enable" :"Disable" )); + tz->mode ==THERMAL_DEVICE_ENABLED ? +"Enable" :"Disable" ));acpi_thermal_check (tz); }return 0 ;@@ -913,7 +910,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)if (ACPI_FAILURE (status))return -ENODEV ; - tz->tz_enabled =1 ; + tz->mode =THERMAL_DEVICE_ENABLED ;dev_info (&tz->device->dev,"registered as thermal_zone%d\n" , tz->thermal_zone->id);drivers/platform/x86/acerhdf.c +4
-3@@ -65,8 +65,10 @@#ifdef START_IN_KERNEL_MODE static int kernelmode =1 ; +static enum thermal_device_mode thermal_mode =THERMAL_DEVICE_ENABLED ;#else static int kernelmode; +static enum thermal_device_mode thermal_mode =THERMAL_DEVICE_DISABLED ;#endif static unsigned int interval =10 ;@@ -416,8 +418,7 @@ static int acerhdf_get_mode(struct thermal_zone_device *thermal,if (verbose)pr_notice ("kernel mode fan control %d\n" , kernelmode); - *mode = (kernelmode) ?THERMAL_DEVICE_ENABLED - :THERMAL_DEVICE_DISABLED ; + *mode = thermal_mode;return 0 ; }@@ -435,10 +436,13 @@ static int acerhdf_set_mode(struct thermal_zone_device *thermal, mode != THERMAL_DEVICE_ENABLED)return -EINVAL ; -if (mode ==THERMAL_DEVICE_DISABLED && kernelmode) +if (mode ==THERMAL_DEVICE_DISABLED && kernelmode) {
drivers/platform/x86/acerhdf.c static int acerhdf_set_mode(struct thermal_zone_device *thermal, · line 448
Quoted 10 lines
drivers/platform/x86/acerhdf.c +4
-1acerhdf_revert_to_bios_mode (); - else if (mode == THERMAL_DEVICE_ENABLED && !kernelmode) + thermal_mode =THERMAL_DEVICE_DISABLED ; + }else if (mode ==THERMAL_DEVICE_ENABLED && !kernelmode) {acerhdf_enable_kernelmode (); + thermal_mode =THERMAL_DEVICE_ENABLED ; + }return 0 ; }
The conversion missed:
* handling of "force_bios" and force_product" kernel parameters:
if (force_bios[0]) {
version = force_bios;
pr_info("forcing BIOS version: %s\n", version);
kernelmode = 0;
}
if (force_product[0]) {
product = force_product;
pr_info("forcing BIOS product: %s\n", product);
kernelmode = 0;
}* acerhdf_revert_to_bios_mode() call on error in acerhdf_set_cur_state()
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Quoted 45 lines
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +7
-11@@ -44,7 +44,7 @@ static char *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = {struct int3400_thermal_priv {struct acpi_device *adev;struct thermal_zone_device *thermal; -int mode; +enum thermal_device_mode mode;int art_count;struct art *arts;int trt_count;@@ -247,24 +247,20 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal, enum thermal_device_mode mode) {struct int3400_thermal_priv *priv = thermal->devdata; -bool enable;int result =0 ;if (!priv)return -EINVAL ; -if (mode ==THERMAL_DEVICE_ENABLED ) - enable = true; -else if (mode ==THERMAL_DEVICE_DISABLED ) - enable = false; -else +if (mode !=THERMAL_DEVICE_ENABLED && + mode !=THERMAL_DEVICE_DISABLED )return -EINVAL ; -if (enable != priv->mode) { - priv->mode = enable; +if (mode != priv->mode) { + priv->mode = mode; result =int3400_thermal_run_osc (priv->adev->handle, - priv->current_uuid_index, - enable); + priv->current_uuid_index, + mode ==THERMAL_DEVICE_ENABLED ); }return result; }
RFC 4/8 thermal: core: Introduce THERMAL_DEVICE_INITIAL
In reply to Andrzej PietrasiewiczAdd a new mode: THERMAL_DEVICE_INITIAL. It is dedicated to handle devices which must be initially DISABLED, but which are polled at startup nonetheless. THERMAL_DEVICE_INITIAL shall be reported as "enabled" in sysfs to keep the userspace interface intact.
--- drivers/thermal/thermal_sysfs.c | 4 ++-- include/linux/thermal.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/thermal/thermal_sysfs.c +2 -2
@@ -59,8 +59,8 @@ mode_show(struct device *dev, struct device_attribute *attr, char *buf)if (result)return result; -return sprintf (buf,"%s\n" , mode ==THERMAL_DEVICE_ENABLED ?"enabled" - :"disabled" ); +return sprintf (buf,"%s\n" , mode ==THERMAL_DEVICE_DISABLED ?"disabled" + :"enabled" ); } static ssize_t
include/linux/thermal.h +2 -1
@@ -48,8 +48,9 @@ struct thermal_cooling_device;struct thermal_instance ;enum thermal_device_mode { -THERMAL_DEVICE_DISABLED =0 , +THERMAL_DEVICE_INITIAL =0 ,THERMAL_DEVICE_ENABLED , +THERMAL_DEVICE_DISABLED , };enum thermal_trip_type {
Signature · 1 line
2.17.1
RFC 5/8 thermal: core: Monitor thermal zone after mode change
In reply to Andrzej PietrasiewiczMode changing might imply a need to stop/start polling the device. monitor_thermal_zone() when mode changes or if previous mode is unknown.
--- drivers/thermal/thermal_core.c | 26 ++++++++++++++++++++++++++ drivers/thermal/thermal_core.h | 2 ++ drivers/thermal/thermal_sysfs.c | 8 +++++--- 3 files changed, 33 insertions(+), 3 deletions(-)
drivers/thermal/thermal_core.c +26 -0
@@ -469,6 +469,32 @@ static void thermal_zone_device_reset(struct thermal_zone_device *tz)thermal_zone_device_init (tz); } +int thermal_zone_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) +{ +enum thermal_device_mode old_mode; +int result; + +if (!tz->ops->set_mode) +return -EPERM ; + +if (tz->ops->get_mode) { + result = tz->ops->get_mode (tz, &old_mode); +if (result) +return result; + } + + result = tz->ops->set_mode (tz, mode); +if (result) +return result; + +/* old mode unknown or mode changed */ +if (!tz->ops->get_mode || mode != old_mode) +monitor_thermal_zone (tz); + +return 0 ; +} +void thermal_zone_device_update (struct thermal_zone_device *tz,enum thermal_notify_event event) {
drivers/thermal/thermal_core.h +2 -0
@@ -74,6 +74,8 @@ int thermal_zone_create_device_groups(struct thermal_zone_device *, int);void thermal_zone_destroy_device_groups (struct thermal_zone_device *);void thermal_cooling_device_setup_sysfs (struct thermal_cooling_device *);void thermal_cooling_device_destroy_sysfs (struct thermal_cooling_device *cdev); +int thermal_zone_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode);/* used only at binding time */ ssize_t trip_point_show (struct device *,struct device_attribute *,char *);ssize_t weight_show (struct device *,struct device_attribute *,char *);
drivers/thermal/thermal_sysfs.c +5 -3
@@ -68,18 +68,20 @@ mode_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) {struct thermal_zone_device *tz =to_thermal_zone (dev); +enum thermal_device_mode mode;int result;if (!tz->ops->set_mode)return -EPERM ;if (!strncmp (buf,"enabled" ,sizeof ("enabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_ENABLED ); + mode =THERMAL_DEVICE_ENABLED ;else if (!strncmp (buf,"disabled" ,sizeof ("disabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_DISABLED ); + mode =THERMAL_DEVICE_DISABLED ;else - result = -EINVAL ; +return -EINVAL ; + result =thermal_zone_set_mode (tz, mode);if (result)return result;
Signature · 1 line
2.17.1
RFC 6/8 thermal: Set initial state to THERMAL_DEVICE_INITIAL
In reply to Andrzej PietrasiewiczNow that THERMAL_DEVICE_INITIAL is available use it.
--- drivers/acpi/thermal.c | 1 + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 3 +++ drivers/platform/x86/acerhdf.c | 1 + drivers/thermal/da9062-thermal.c | 2 +- drivers/thermal/imx_thermal.c | 1 + drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 1 + drivers/thermal/intel/intel_quark_dts_thermal.c | 1 + 7 files changed, 9 insertions(+), 1 deletion(-)
drivers/acpi/thermal.c +1 -0
@@ -881,6 +881,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)for (i =0 ; i <ACPI_THERMAL_MAX_ACTIVE && tz->trips.active[i].flags.valid; i++, trips++); + tz->mode =THERMAL_DEVICE_INITIAL ;if (tz->trips.passive.flags.valid) tz->thermal_zone = thermal_zone_device_register("acpitz", trips, 0, tz,
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +3 -0
@@ -758,6 +758,7 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz)snprintf (tz_name,sizeof (tz_name),"mlxsw-module%d" , module_tz->module +1 ); + module_tz->mode =THERMAL_DEVICE_INITIAL ; module_tz->tzdev = thermal_zone_device_register(tz_name, MLXSW_THERMAL_NUM_TRIPS, MLXSW_THERMAL_TRIP_MASK,
@@ -876,6 +877,7 @@ mlxsw_thermal_gearbox_tz_init(struct mlxsw_thermal_module *gearbox_tz)snprintf (tz_name,sizeof (tz_name),"mlxsw-gearbox%d" , gearbox_tz->module +1 ); + gearbox_tz->mode =THERMAL_DEVICE_INITIAL ; gearbox_tz->tzdev = thermal_zone_device_register(tz_name, MLXSW_THERMAL_NUM_TRIPS, MLXSW_THERMAL_TRIP_MASK,
@@ -1033,6 +1035,7 @@ int mlxsw_thermal_init(struct mlxsw_core *core, MLXSW_THERMAL_SLOW_POLL_INT :MLXSW_THERMAL_POLL_INT ; + thermal->mode =THERMAL_DEVICE_INITIAL ; thermal->tzdev = thermal_zone_device_register("mlxsw", MLXSW_THERMAL_NUM_TRIPS, MLXSW_THERMAL_TRIP_MASK,
drivers/platform/x86/acerhdf.c +1 -0
@@ -747,6 +747,7 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (cl_dev))return -EINVAL ; + thermal_mode =THERMAL_DEVICE_INITIAL ; thz_dev = thermal_zone_device_register("acerhdf", 2, 0, NULL, &acerhdf_dev_ops, &acerhdf_zone_params, 0,
drivers/thermal/da9062-thermal.c +1 -1
@@ -233,7 +233,7 @@ static int da9062_thermal_probe(struct platform_device *pdev) thermal->config = match->data; thermal->hw = chip; - thermal->mode =THERMAL_DEVICE_ENABLED ; + thermal->mode =THERMAL_DEVICE_INITIAL ; thermal->dev = &pdev->dev;INIT_DELAYED_WORK (&thermal->work, da9062_thermal_poll_on);
drivers/thermal/imx_thermal.c +1 -0
@@ -805,6 +805,7 @@ static int imx_thermal_probe(struct platform_device *pdev) goto legacy_cleanup; } + data->mode =THERMAL_DEVICE_INITIAL ; data->tz = thermal_zone_device_register("imx_thermal_zone", IMX_TRIP_NUM, BIT(IMX_TRIP_PASSIVE), data,
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +1 -0
@@ -307,6 +307,7 @@ static int int3400_thermal_probe(struct platform_device *pdev)platform_set_drvdata (pdev, priv); + priv->mode =THERMAL_DEVICE_INITIAL ; priv->thermal =thermal_zone_device_register ("INT3400 Thermal" ,0 ,0 , priv, &int3400_thermal_ops, &int3400_thermal_params,0 ,0 );
drivers/thermal/intel/intel_quark_dts_thermal.c +1 -0
@@ -411,6 +411,7 @@ static struct soc_sensor_entry *alloc_soc_dts(void) goto err_ret; } + aux_entry->mode =THERMAL_DEVICE_INITIAL ; aux_entry->tzone = thermal_zone_device_register("quark_dts", QRK_MAX_DTS_TRIPS, wr_mask,
Signature · 1 line
2.17.1
RFC 7/8 thermal: of: Monitor thermal zone after enabling it
In reply to Andrzej Pietrasiewiczthermal/of calls its own ->set_mode() method, so monitor thermal zone afterwards. This is needed for the DISABLED->ENABLED transition.
--- drivers/thermal/of-thermal.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/thermal/of-thermal.c +4 -1
@@ -523,8 +523,11 @@ thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data,if (sensor_specs.np == sensor_np && id == sensor_id) { tzd =thermal_zone_of_add_sensor (child, sensor_np, data, ops); -if (!IS_ERR (tzd)) +if (!IS_ERR (tzd)) { tzd->ops->set_mode (tzd,THERMAL_DEVICE_ENABLED ); +thermal_zone_device_update (tzd, +THERMAL_EVENT_UNSPECIFIED ); + }of_node_put (sensor_specs.np);of_node_put (child);
Signature · 1 line
2.17.1
Re: [RFC 7/8] thermal: of: Monitor thermal zone after enabling it
Quoted 16 lines · Andrzej Pietrasiewicz
thermal/of calls its own ->set_mode() method, so monitor thermal zone afterwards. This is needed for the
DISABLED->ENABLEDtransition.Signed-off-by Andrzej Pietrasiewicz <[email protected]>--- drivers/thermal/of-thermal.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)drivers/thermal/of-thermal.c +0
-0@@ -523,8 +523,11 @@ thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data,if (sensor_specs.np == sensor_np && id == sensor_id) { tzd = thermal_zone_of_add_sensor(child, sensor_np,
drivers/thermal/of-thermal.c thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data, · line 533
Quoted 10 lines
drivers/thermal/of-thermal.c +4
-1data, ops); -if (!IS_ERR (tzd)) +if (!IS_ERR (tzd)) { tzd->ops->set_mode (tzd,THERMAL_DEVICE_ENABLED ); +thermal_zone_device_update (tzd, +THERMAL_EVENT_UNSPECIFIED ); + }of_node_put (sensor_specs.np);of_node_put (child);
This patch is bogus/redundant, please look at ->set_mode implementation for thermal/of drivers:
static int of_thermal_set_mode(struct thermal_zone_device *tz,
enum thermal_device_mode mode)
{
struct __thermal_zone *data = tz->devdata;
mutex_lock(&tz->lock);
if (mode == THERMAL_DEVICE_ENABLED) {
tz->polling_delay = data->polling_delay;
tz->passive_delay = data->passive_delay;
} else {
tz->polling_delay = 0;
tz->passive_delay = 0;
}
mutex_unlock(&tz->lock);
data->mode = mode;
thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);
return 0;
}Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
RFC 8/8 thermal: Stop polling DISABLED thermal devices
In reply to Andrzej PietrasiewiczPolling DISABLED devices is not desired, as all such "disabled" devices are meant to be handled by userspace.
--- drivers/thermal/thermal_core.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)
drivers/thermal/thermal_core.c +24 -2
@@ -305,13 +305,32 @@ static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,cancel_delayed_work (&tz->poll_queue); } +static bool should_stop_polling (struct thermal_zone_device *tz) +{ +enum thermal_device_mode mode; +int result; + +if (!tz->ops->get_mode) +return false; + + result = tz->ops->get_mode (tz, &mode); +if (result) +return false; + +return mode ==THERMAL_DEVICE_DISABLED ; +} +static void monitor_thermal_zone (struct thermal_zone_device *tz) { +bool stop; + + stop =should_stop_polling (tz); +mutex_lock (&tz->lock); -if (tz->passive) +if (!stop && tz->passive)thermal_zone_device_set_polling (tz, tz->passive_delay); -else if (tz->polling_delay) +else if (!stop && tz->polling_delay)thermal_zone_device_set_polling (tz, tz->polling_delay);else thermal_zone_device_set_polling (tz,0 );
@@ -500,6 +519,9 @@ void thermal_zone_device_update(struct thermal_zone_device *tz, {int count; +if (should_stop_polling (tz)) +return ; +if (atomic_read (&in_suspend))return ;
Signature · 1 line
2.17.1
Quoted 3 lines · Andrzej Pietrasiewicz
The current kernel behavior is to keep polling the thermal zone devices regardless of their current mode. This is not desired, as all such "disabled" devices are meant to be handled by userspace,> so polling them makes no sense.
Thanks for proposing these changes.
I've been (quickly) through the series and the description below. I have the feeling the series makes more complex while the current code which would deserve a cleanup.
Why not first:
- Add a 'mode' field in the thermal zone device
- Kill all set/get_mode callbacks in the drivers which are duplicated code.
- Add a function:
enum thermal_device_mode thermal_zone_get_mode( *tz)
{
...
if (tz->ops->get_mode)
return tz->ops->get_mode();
return tz->mode;}
int thermal_zone_set_mode(..*tz, enum thermal_device_mode mode)
{
...
if (tz->ops->set_mode)
return tz->ops->set_mode(tz, mode);
tz->mode = mode;
return 0;}
static inline thermal_zone_enable(... *tz)
{
thermal_zone_set_mode(tz, THERMAL_DEVICE_ENABLED);}
static inline thermal_zone_disable(... *tz) {
thermal_zone_set_mode(tz, THERMAL_DEVICE_DISABLED);}
And then when the code is consolidated, use the mode to enable/disable the polling and continue killing the duplicated code in of-thermal.c and anywhere else.
Quoted 93 lines
There was an attempt to solve this issue:
https://lkml.org/lkml/2018/2/26/498
and it ultimately has not succeeded:
https://lkml.org/lkml/2018/2/27/910
This is a new attempt addressing all the relevant drivers, and I have identified them with:
$ git grep "thermal_zone_device_ops" | grep "= {" | cut -f1 -d: | sort | uniqThe idea is to modify
thermal_zone_device_update()andmonitor_thermal_zone()in such a way that they stop polling a disabled device. To do decide what to do they should call ->get_mode() operation of the specialized thermal zone device in question (e.g. drivers/acpi/thermal.c's). But here comes problem:
sometimes a thermal zone device must be initially disabled and becomes enabled only after its sensors appear on the system. If such thermal zone's ->get_mode() /* in the context ofthermal_zone_device_update()ormonitor_thermal_zone()*/ is called _before_ the sensors are available, it will be reported as "disabled" and consequently polling it will be ceased. This is a change in behavior from userspace's perspective.To solve the above described problem I want to introduce the third mode of a
thermal_zone_device: initial. The idea is that when the device is in its initial mode, then its polling will be handled as it is now. This is a good
thing: should the temperature be just about hitting the critical treshnold early during the boot process, it might be too late if we wait for the userspace to run to save the system from overheating. The initial mode should be reported in sysfs as "enabled" to keep the userspace interface intact. From the initial mode there will be two possible transitions: to enabled or disabled mode, but there will be no transition back to initial. If the transition is from initial to enabled, then keep polling. If the transition is from initial to disabled, then stop polling. If the transition is from enabled to disabled, then stop polling. The transition from disabled to enabled must be handled in a special way: there must be a mandatory call tomonitor_thermal_zone(), otherwise the polling will not start. If this transition is triggeted from sysfs, then it can be easily handled at the thermal framework level. However, if drivers call their own ->set_mode() operation then they must also call "monitor_thermal_zone()" afterwards. The latter being a sensible thing anyway, so perhaps all/most of the drivers in question do. The plan for implementation is this:- ensure ALL users use symbolic enum names (
THERMAL_DEVICE_DISABLED,THERMAL_DEVICE_ENABLED) for thermal device mode rather than the numeric values of enumthermal_device_modeelements
- addTHERMAL_DEVICE_INITIALto the said enum making its value 0 (so thatkzalloc()results in the initial state)
- modify thermal zone device'smode_show()(thermal framework level) so that it reports "enabled" forTHERMAL_DEVICE_INITIAL
- modify thermal zone device'smode_store()(thermal framework level) so that it callsmonitor_thermal_zone()upon mode change
- modify ALL thermal drivers so that their code is prepared to returnTHERMAL_DEVICE_INITIALbefore they callthermal_zone_device_register(); when the invocation of the latter completes then polling is expected to be started
- verify ALL drivers which call their own ->set_mode() to ensure they do callmonitor_thermal_zone()afterwards
- modifythermal_zone_device_update()andmonitor_thermal_zone()so that they cancel polling for disabled thermal zone devices (but not for those inTHERMAL_DEVICE_INITIALmode)This RFC series does all the above steps in more or less that order.
I kindly ask for comments/suggestions/improvements.
Rebased onto v5.6.
Andrzej Pietrasiewicz (8):
thermal:int3400_thermal: Statically initialize.get_mode()/.set_mode() opsthermal: Properly handle mode values in .set_mode()
thermal: Store thermal mode in a dedicated enum
thermal: core: IntroduceTHERMAL_DEVICE_INITIAL
thermal: core: Monitor thermal zone after mode change
thermal: Set initial state toTHERMAL_DEVICE_INITIAL
thermal: of: Monitor thermal zone after enabling it
thermal: Stop polling DISABLED thermal devicesdrivers/acpi/thermal.c | 28 +++++----- .../ethernet/mellanox/mlxsw/core_thermal.c | 11 +++- drivers/platform/x86/acerhdf.c | 17 ++++-- drivers/thermal/da9062-thermal.c | 2 +- drivers/thermal/imx_thermal.c | 5 +- .../intel/int340x_thermal/int3400_thermal.c | 24 ++++----- .../thermal/intel/intel_quark_dts_thermal.c | 6 ++- drivers/thermal/of-thermal.c | 9 +++- drivers/thermal/thermal_core.c | 52 ++++++++++++++++++- drivers/thermal/thermal_core.h | 2 + drivers/thermal/thermal_sysfs.c | 12 +++-- include/linux/thermal.h | 3 +- 12 files changed, 123 insertions(+), 48 deletions(-)
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Hi Daniel,
W dniu 09.04.2020 o 12:29, Daniel Lezcano pisze:
Quoted 43 lines · Andrzej Pietrasiewicz
Quoted 3 lines
The current kernel behavior is to keep polling the thermal zone devices regardless of their current mode. This is not desired, as all such "disabled" devices are meant to be handled by userspace,> so polling them makes no sense.
Thanks for proposing these changes.
I've been (quickly) through the series and the description below. I have the feeling the series makes more complex while the current code which would deserve a cleanup.
Why not first:
- Add a 'mode' field in the thermal zone device
- Kill all set/get_mode callbacks in the drivers which are duplicated code.
- Add a function:enum
thermal_device_modethermal_zone_get_mode( *tz){ ... if (tz->ops->get_mode) return tz->ops->get_mode(); return tz->mode;}
int
thermal_zone_set_mode(..*tz, enum thermal_device_mode mode){ ... if (tz->ops->set_mode) return tz->ops->set_mode(tz, mode); tz->mode = mode; return 0;}
static inline thermal_zone_enable(... *tz)
{ thermal_zone_set_mode(tz, THERMAL_DEVICE_ENABLED);}
Quoted 9 lines
static inline thermal_zone_disable(... *tz) { thermal_zone_set_mode(tz, THERMAL_DEVICE_DISABLED);}
And then when the code is consolidated, use the mode to enable/disable the polling and continue killing the duplicated code in
of-thermal.cand anywhere else.
Thanks for feedback.
Anyone else?
Andrzej
Quoted 56 lines · Andrzej Pietrasiewicz
Hi Daniel,
W dniu 09.04.2020 o 12:29, Daniel Lezcano pisze:
Quoted 43 lines · Andrzej Pietrasiewicz
Quoted 3 lines
The current kernel behavior is to keep polling the thermal zone devices regardless of their current mode. This is not desired, as all such "disabled" devices are meant to be handled by userspace,> so polling them makes no sense.
Thanks for proposing these changes.
I've been (quickly) through the series and the description below. I have the feeling the series makes more complex while the current code which would deserve a cleanup.
Why not first:
- Add a 'mode' field in the thermal zone device
- Kill all set/get_mode callbacks in the drivers which are duplicated code.
- Add a function:enum
thermal_device_modethermal_zone_get_mode( *tz){
...
if (tz->ops->get_mode)
returntz->ops->get_mode();return
tz->mode;
}int
thermal_zone_set_mode(..*tz, enum thermal_device_mode mode){
...
if (tz->ops->set_mode)
returntz->ops->set_mode(tz, mode);tz->mode = mode;
return 0;
}static inline thermal_zone_enable(... *tz) {
thermal_zone_set_mode(tz,THERMAL_DEVICE_ENABLED); }Quoted 9 lines
static inline thermal_zone_disable(... *tz) {
thermal_zone_set_mode(tz, THERMAL_DEVICE_DISABLED); }And then when the code is consolidated, use the mode to enable/disable the polling and continue killing the duplicated code in
of-thermal.cand anywhere else.
Quoted 3 lines
Thanks for feedback.
Anyone else?
Yes. :)
Please take a look at the following patchset (which I'm reviving currently):
https://lkml.org/lkml/2018/10/17/926
It overlaps partially with your work so we need to coordinate our efforts.
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Hi Barlomiej,
Quoted 4 lines
Quoted 3 lines
Thanks for feedback.
Anyone else?
Quoted 8 lines
Yes. :)
Please take a look at the following patchset (which I'm reviving currently):
https://lkml.org/lkml/2018/10/17/926It overlaps partially with your work so we need to coordinate our efforts.
I've just sent a v3. After addressing your and Daniel's comments my series now looks pretty compact. Let's see if there's more feedback. Is your work on reviving the above mentioned 2018 series ready?
Andrzej
Peter Kästle
maintainerHi,
17. April 2020 18:23, "Andrzej Pietrasiewicz" <[email protected]> schrieb:
[...]
Quoted 3 lines
I've just sent a v3. After addressing your and Daniel's comments my series now looks pretty compact. Let's see if there's more feedback. Is your work on reviving the above mentioned 2018 series ready?
I agree, v3 looks pretty good, I will test it within next 2 days for acerhdf. Thanks for your work!
Signature · 1 line
--peter;
Quoted 10 lines · Andrzej Pietrasiewicz
Hi Barlomiej,
Quoted 8 lines
Quoted 3 lines
Thanks for feedback.
Anyone else?
Yes. :)
Please take a look at the following patchset (which I'm reviving currently):
Quoted 8 lines
Quoted 4 lines
It overlaps partially with your work so we need to coordinate our efforts.
I've just sent a v3. After addressing your and Daniel's comments my series now looks pretty compact. Let's see if there's more feedback. Is your work on reviving the above mentioned 2018 series ready?
Not yet, also I think now that it will be the best if I rebase my changes on top of your patchset (once it is ready/finished).
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
v2 cover Stop monitoring disabled devices
In reply to Daniel LezcanoThis is the second iteration of this RFC.
The series now focuses on cleaning up the code in the first place.
After the cleanups in patches 1-3 struct thermal_zone_device is extended so that it contains a "mode" member (patch 4/9).
The next patch (5/9) makes all thermal zone devices use the "mode" member. This patch makes drivers' ->get_mode() methods redundant, so the next one (6/9) removes the method altogether.
Patches 7-8/9 ensure that after changing thermal zone device's mode an attempt will be made to monitor the device.
And finally patch 9/9 prevents DISABLED devices from being monitored. It also adds THERMAL_DEVICE_INITIAL to accommodate the devices, which should be monitored but cannot be initially ENABLED.
Andrzej Pietrasiewicz (9):
thermal: int3400_thermal: Statically initialize
.get_mode()/.set_mode() ops
thermal: Eliminate an always-false condition
thermal: Properly handle mode values in .set_mode()
thermal: core: Let thermal zone device's mode be stored in its struct
thermal: Store mode in thermal_zone_device
thermal: Remove get_mode() method
thermal: core: Monitor thermal zone after mode change
thermal: of: Monitor thermal zone after enabling it
thermal: core: Stop polling DISABLED thermal devices
drivers/acpi/thermal.c | 44 +++++---------- .../ethernet/mellanox/mlxsw/core_thermal.c | 43 ++++----------- drivers/platform/x86/acerhdf.c | 28 +++++----- drivers/thermal/da9062-thermal.c | 12 +--- drivers/thermal/imx_thermal.c | 30 ++++------ .../intel/int340x_thermal/int3400_thermal.c | 39 +++---------- .../thermal/intel/intel_quark_dts_thermal.c | 27 ++++----- drivers/thermal/of-thermal.c | 28 ++++------ drivers/thermal/thermal_core.c | 40 ++++++++++++-- drivers/thermal/thermal_core.h | 2 + drivers/thermal/thermal_sysfs.c | 40 ++++---------- include/linux/thermal.h | 55 ++++++++++++++++++- 12 files changed, 180 insertions(+), 208 deletions(-)
Signature · 1 line
2.17.1
RFC v2 1/9 thermal: int3400_thermal: Statically initialize .get_mode()/.set_mode() ops
int3400_thermal_ops is used inside int3400_thermal_probe() only after the assignments, which can just as well be made statically at struct's initizer.
--- drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +2 -3
@@ -271,6 +271,8 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal,static struct thermal_zone_device_ops int3400_thermal_ops = { .get_temp = int3400_thermal_get_temp, + .get_mode = int3400_thermal_get_mode, + .set_mode = int3400_thermal_set_mode, };static struct thermal_zone_params int3400_thermal_params = {
@@ -309,9 +311,6 @@ static int int3400_thermal_probe(struct platform_device *pdev)platform_set_drvdata (pdev, priv); - int3400_thermal_ops.get_mode = int3400_thermal_get_mode; - int3400_thermal_ops.set_mode = int3400_thermal_set_mode; - priv->thermal =thermal_zone_device_register ("INT3400 Thermal" ,0 ,0 , priv, &int3400_thermal_ops, &int3400_thermal_params,0 ,0 );
Signature · 1 line
2.17.1
Re: [RFC v2 1/9] thermal: int3400_thermal: Statically initialize .get_mode()/.set_mode() ops
Quoted 6 lines · Andrzej Pietrasiewicz
int3400_thermal_opsis used insideint3400_thermal_probe()only after the assignments, which can just as well be made statically at struct's initizer.Signed-off-by Andrzej Pietrasiewicz <[email protected]>---
Applied this patch with Bartlomiej's tag.
Thanks
-- Daniel
Signature · 10 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
RFC v2 2/9 thermal: Eliminate an always-false condition
In reply to Andrzej PietrasiewiczThis driver provides a non-NULL "devdata" argument for thermal_zone_device_register(). Thermal core never sets it to NULL afterwards, so checking for its being NULL in this driver makes no sense.
--- drivers/acpi/thermal.c | 6 ------ drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 6 ------ 2 files changed, 12 deletions(-)
drivers/acpi/thermal.c +0 -6
@@ -531,9 +531,6 @@ static int thermal_get_mode(struct thermal_zone_device *thermal, {struct acpi_thermal *tz = thermal->devdata; -if (!tz) -return -EINVAL ; - *mode = tz->tz_enabled ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ;
@@ -546,9 +543,6 @@ static int thermal_set_mode(struct thermal_zone_device *thermal,struct acpi_thermal *tz = thermal->devdata;int enable; -if (!tz) -return -EINVAL ; -/* * enable/disable thermal management from ACPI thermal driver */
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +0 -6
@@ -235,9 +235,6 @@ static int int3400_thermal_get_mode(struct thermal_zone_device *thermal, {struct int3400_thermal_priv *priv = thermal->devdata; -if (!priv) -return -EINVAL ; - *mode = priv->mode;return 0 ;
@@ -250,9 +247,6 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal,bool enable;int result =0 ; -if (!priv) -return -EINVAL ; -if (mode ==THERMAL_DEVICE_ENABLED ) enable = true;else if (mode ==THERMAL_DEVICE_DISABLED )
Signature · 1 line
2.17.1
RFC v2 3/9 thermal: Properly handle mode values in .set_mode()
In reply to Andrzej PietrasiewiczAllow only THERMAL_DEVICE_ENABLED and THERMAL_DEVICE_DISABLED as valid states to transition to.
--- drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 8 ++++++-- drivers/platform/x86/acerhdf.c | 4 ++++ drivers/thermal/imx_thermal.c | 4 +++- drivers/thermal/intel/intel_quark_dts_thermal.c | 5 ++++- drivers/thermal/of-thermal.c | 4 +++- 5 files changed, 20 insertions(+), 5 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +6 -2
@@ -296,8 +296,10 @@ static int mlxsw_thermal_set_mode(struct thermal_zone_device *tzdev,if (mode ==THERMAL_DEVICE_ENABLED ) tzdev->polling_delay = thermal->polling_delay; -else +else if (mode ==THERMAL_DEVICE_DISABLED ) tzdev->polling_delay =0 ; +else +return -EINVAL ;mutex_unlock (&tzdev->lock);
@@ -486,8 +488,10 @@ static int mlxsw_thermal_module_mode_set(struct thermal_zone_device *tzdev,if (mode ==THERMAL_DEVICE_ENABLED ) tzdev->polling_delay = thermal->polling_delay; -else +else if (mode ==THERMAL_DEVICE_DISABLED ) tzdev->polling_delay =0 ; +else +return -EINVAL ;mutex_unlock (&tzdev->lock);
drivers/platform/x86/acerhdf.c +4 -0
@@ -431,6 +431,10 @@ static int acerhdf_get_mode(struct thermal_zone_device *thermal,static int acerhdf_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) { +if (mode !=THERMAL_DEVICE_DISABLED && + mode !=THERMAL_DEVICE_ENABLED ) +return -EINVAL ; +if (mode ==THERMAL_DEVICE_DISABLED && kernelmode)acerhdf_revert_to_bios_mode ();else if (mode ==THERMAL_DEVICE_ENABLED && !kernelmode)
drivers/thermal/imx_thermal.c +3 -1
@@ -361,7 +361,7 @@ static int imx_set_mode(struct thermal_zone_device *tz, data->irq_enabled = true;enable_irq (data->irq); } - }else { + }else if (mode ==THERMAL_DEVICE_DISABLED ) {regmap_write (map, soc_data->sensor_ctrl +REG_CLR , soc_data->measure_temp_mask); regmap_write(map, soc_data->sensor_ctrl + REG_SET,
@@ -374,6 +374,8 @@ static int imx_set_mode(struct thermal_zone_device *tz,disable_irq (data->irq); data->irq_enabled = false; } + }else { +return -EINVAL ; } data->mode = mode;
drivers/thermal/intel/intel_quark_dts_thermal.c +4 -1
@@ -325,8 +325,11 @@ static int sys_set_mode(struct thermal_zone_device *tzd,mutex_lock (&dts_update_mutex);if (mode ==THERMAL_DEVICE_ENABLED ) ret =soc_dts_enable (tzd); -else +else if (mode ==THERMAL_DEVICE_DISABLED ) ret =soc_dts_disable (tzd); +else +return -EINVAL ; +mutex_unlock (&dts_update_mutex);return ret;
drivers/thermal/of-thermal.c +3 -1
@@ -289,9 +289,11 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz,if (mode ==THERMAL_DEVICE_ENABLED ) { tz->polling_delay = data->polling_delay; tz->passive_delay = data->passive_delay; - }else { + }else if (mode ==THERMAL_DEVICE_DISABLED ) { tz->polling_delay =0 ; tz->passive_delay =0 ; + }else { +return -EINVAL ; }mutex_unlock (&tz->lock);
Signature · 1 line
2.17.1
Re: [RFC v2 3/9] thermal: Properly handle mode values in .set_mode()
Hi Andrzej,
you can drop this patch. It is not useful as the caller checks the correctness of the values in the patch 4/9.
Moreover the patch is bogus because it returns before releasing the lock.
Quoted 115 lines · Andrzej Pietrasiewicz
Allow only
THERMAL_DEVICE_ENABLEDandTHERMAL_DEVICE_DISABLEDas valid states to transition to.Signed-off-by Andrzej Pietrasiewicz <[email protected]>--- drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 8 ++++++-- drivers/platform/x86/acerhdf.c | 4 ++++ drivers/thermal/imx_thermal.c | 4 +++- drivers/thermal/intel/intel_quark_dts_thermal.c | 5 ++++- drivers/thermal/of-thermal.c | 4 +++- 5 files changed, 20 insertions(+), 5 deletions(-)drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +6
-2@@ -296,8 +296,10 @@ static int mlxsw_thermal_set_mode(struct thermal_zone_device *tzdev,if (mode ==THERMAL_DEVICE_ENABLED ) tzdev->polling_delay = thermal->polling_delay; -else +else if (mode ==THERMAL_DEVICE_DISABLED ) tzdev->polling_delay =0 ; +else +return -EINVAL ;mutex_unlock (&tzdev->lock);@@ -486,8 +488,10 @@ static int mlxsw_thermal_module_mode_set(struct thermal_zone_device *tzdev,if (mode ==THERMAL_DEVICE_ENABLED ) tzdev->polling_delay = thermal->polling_delay; -else +else if (mode ==THERMAL_DEVICE_DISABLED ) tzdev->polling_delay =0 ; +else +return -EINVAL ;mutex_unlock (&tzdev->lock);drivers/platform/x86/acerhdf.c +4
-0@@ -431,6 +431,10 @@ static int acerhdf_get_mode(struct thermal_zone_device *thermal,static int acerhdf_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) { +if (mode !=THERMAL_DEVICE_DISABLED && + mode !=THERMAL_DEVICE_ENABLED ) +return -EINVAL ; +if (mode ==THERMAL_DEVICE_DISABLED && kernelmode)acerhdf_revert_to_bios_mode ();else if (mode ==THERMAL_DEVICE_ENABLED && !kernelmode)drivers/thermal/imx_thermal.c +3
-1@@ -361,7 +361,7 @@ static int imx_set_mode(struct thermal_zone_device *tz, data->irq_enabled = true;enable_irq (data->irq); } - }else { + }else if (mode ==THERMAL_DEVICE_DISABLED ) {regmap_write (map, soc_data->sensor_ctrl +REG_CLR , soc_data->measure_temp_mask); regmap_write(map, soc_data->sensor_ctrl + REG_SET,@@ -374,6 +374,8 @@ static int imx_set_mode(struct thermal_zone_device *tz,disable_irq (data->irq); data->irq_enabled = false; } + }else { +return -EINVAL ; } data->mode = mode;drivers/thermal/intel/intel_quark_dts_thermal.c +4
-1@@ -325,8 +325,11 @@ static int sys_set_mode(struct thermal_zone_device *tzd,mutex_lock (&dts_update_mutex);if (mode ==THERMAL_DEVICE_ENABLED ) ret =soc_dts_enable (tzd); -else +else if (mode ==THERMAL_DEVICE_DISABLED ) ret =soc_dts_disable (tzd); +else +return -EINVAL ; +mutex_unlock (&dts_update_mutex);return ret;drivers/thermal/of-thermal.c +3
-1@@ -289,9 +289,11 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz,if (mode ==THERMAL_DEVICE_ENABLED ) { tz->polling_delay = data->polling_delay; tz->passive_delay = data->passive_delay; - }else { + }else if (mode ==THERMAL_DEVICE_DISABLED ) { tz->polling_delay =0 ; tz->passive_delay =0 ; + }else { +return -EINVAL ; }mutex_unlock (&tz->lock);
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
RFC v2 4/9 thermal: core: Let thermal zone device's mode be stored in its struct
In reply to Andrzej PietrasiewiczAll the drivers which provide ->get_mode()/->set_mode() methods store their mode in a thermal_device_mode enum, so keep this information in struct thermal_zone_device rather than scattered all over the place.
--- drivers/thermal/thermal_core.c | 28 +++++++++++++++++++ drivers/thermal/thermal_sysfs.c | 9 +++---- include/linux/thermal.h | 48 +++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 6 deletions(-)
drivers/thermal/thermal_core.c +28 -0
@@ -469,6 +469,34 @@ static void thermal_zone_device_reset(struct thermal_zone_device *tz)thermal_zone_device_init (tz); } +int thermal_zone_device_get_mode (struct thermal_zone_device *tz, +enum thermal_device_mode *mode) +{ +if (tz->ops->get_mode) +return tz->ops->get_mode (tz, mode); + + *mode = tz->mode; + +return 0 ; +} +EXPORT_SYMBOL_GPL (thermal_zone_device_get_mode); + +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) +{ +if (mode !=THERMAL_DEVICE_DISABLED && + mode !=THERMAL_DEVICE_ENABLED ) +return -EINVAL ; + +if (tz->ops->set_mode) +return tz->ops->set_mode (tz, mode); + + tz->mode = mode; + +return 0 ; +} +EXPORT_SYMBOL_GPL (thermal_zone_device_set_mode); +void thermal_zone_device_update (struct thermal_zone_device *tz,enum thermal_notify_event event) {
drivers/thermal/thermal_sysfs.c +3 -6
@@ -52,10 +52,7 @@ mode_show(struct device *dev, struct device_attribute *attr, char *buf)enum thermal_device_mode mode;int result; -if (!tz->ops->get_mode) -return -EPERM ; - - result = tz->ops->get_mode (tz, &mode); + result =thermal_zone_device_get_mode (tz, &mode);if (result)return result;
@@ -74,9 +71,9 @@ mode_store(struct device *dev, struct device_attribute *attr,return -EPERM ;if (!strncmp (buf,"enabled" ,sizeof ("enabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_ENABLED ); + result =thermal_zone_device_enable (tz);else if (!strncmp (buf,"disabled" ,sizeof ("disabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_DISABLED ); + result =thermal_zone_device_disable (tz);else result = -EINVAL ;
include/linux/thermal.h +48 -0
76 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [RFC v2 4/9] thermal: core: Let thermal zone device's mode be stored in its struct
Quoted 16 lines · Andrzej Pietrasiewicz
All the drivers which provide ->get_mode()/->set_mode() methods store their mode in a
thermal_device_modeenum, so keep this information in structthermal_zone_devicerather than scattered all over the place.Signed-off-by Andrzej Pietrasiewicz <[email protected]>--- drivers/thermal/thermal_core.c | 28 +++++++++++++++++++ drivers/thermal/thermal_sysfs.c | 9 +++---- include/linux/thermal.h | 48 +++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 6 deletions(-)drivers/thermal/thermal_core.c +0
-0
drivers/thermal/thermal_core.c static void thermal_zone_device_reset(struct thermal_zone_device *tz) · line 476
Quoted 8 lines
drivers/thermal/thermal_core.c +5
-0@@ -469,6 +469,34 @@ static void thermal_zone_device_reset(struct thermal_zone_device *tz)thermal_zone_device_init (tz); } +int thermal_zone_device_get_mode (struct thermal_zone_device *tz, +enum thermal_device_mode *mode) +{ +if (tz->ops->get_mode) +return tz->ops->get_mode (tz, mode);
I think we can get rid of the get_mode here.
locks missing.
and mode = tz->mode must be always set.
drivers/thermal/thermal_core.c static void thermal_zone_device_reset(struct thermal_zone_device *tz) · line 489
Quoted 12 lines
drivers/thermal/thermal_core.c +12
-0+ *mode = tz->mode; + +return 0 ; +} +EXPORT_SYMBOL_GPL (thermal_zone_device_get_mode); + +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) +{ +if (mode !=THERMAL_DEVICE_DISABLED && + mode !=THERMAL_DEVICE_ENABLED ) +return -EINVAL ;
I'm not sure this is useful as 'mode' is an enum and this condition will be always correct.
locks missing.
drivers/thermal/thermal_core.c static void thermal_zone_device_reset(struct thermal_zone_device *tz) · line 494
Quoted 4 lines
drivers/thermal/thermal_core.c +3
-0+if (tz->ops->set_mode) +return tz->ops->set_mode (tz, mode); + tz->mode = mode;
It should be like:
int ret = 0; mutex_lock(&tz->lock); if (tz->ops->set_mode) ret = tz->ops->set_mode(tz, mode); *mode = tz->mode; mutex_unlock(&tz->lock); return ret;
Quoted 63 lines
drivers/thermal/thermal_core.c +5
-0+ +return 0 ; +} +EXPORT_SYMBOL_GPL (thermal_zone_device_set_mode); +void thermal_zone_device_update (struct thermal_zone_device *tz,enum thermal_notify_event event) {drivers/thermal/thermal_sysfs.c +3
-6@@ -52,10 +52,7 @@ mode_show(struct device *dev, struct device_attribute *attr, char *buf)enum thermal_device_mode mode;int result; -if (!tz->ops->get_mode) -return -EPERM ; - - result = tz->ops->get_mode (tz, &mode); + result =thermal_zone_device_get_mode (tz, &mode);if (result)return result;@@ -74,9 +71,9 @@ mode_store(struct device *dev, struct device_attribute *attr,return -EPERM ;if (!strncmp (buf,"enabled" ,sizeof ("enabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_ENABLED ); + result =thermal_zone_device_enable (tz);else if (!strncmp (buf,"disabled" ,sizeof ("disabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_DISABLED ); + result =thermal_zone_device_disable (tz);else result = -EINVAL ;include/linux/thermal.h +5
-0@@ -143,6 +143,7 @@ struct thermal_attr {* @trip_temp_attrs: attributes for trip points for sysfs: trip temperature * @trip_type_attrs: attributes for trip points for sysfs: trip type * @trip_hyst_attrs: attributes for trip points for sysfs: trip hysteresis +* @mode: current mode of this thermal zone * @devdata: private pointer for device private data * @trips: number of trip points the thermal zone supports * @trips_disabled; bitmap for disabled trips @@ -185,6 +186,7 @@ struct thermal_zone_device {struct thermal_attr *trip_temp_attrs;struct thermal_attr *trip_type_attrs;struct thermal_attr *trip_hyst_attrs; +enum thermal_device_mode mode;void *devdata;int trips;unsigned long trips_disabled;/* bitmap for disabled trips */ @@ -437,6 +439,19 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int, unsigned int);int thermal_zone_unbind_cooling_device (struct thermal_zone_device *,int ,struct thermal_cooling_device *); + +int thermal_zone_device_get_mode (struct thermal_zone_device *tz, +enum thermal_device_mode *mode);
include/linux/thermal.h int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int, · line 454
Quoted 10 lines
include/linux/thermal.h +10
-0+int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode); + +static inline void +thermal_zone_device_store_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) +{ + tz->mode = mode; +} +
Please remove this store_mode function, it is not needed.
Just:
thermal_zone_device_get_mode()thermal_zone_device_set_mode()thermal_zone_device_disable()thermal_zone_device_enable()
And all of them in drivers/thermal/thermal_core.h
Quoted 49 lines
include/linux/thermal.h +33
-0void thermal_zone_device_update (struct thermal_zone_device *,enum thermal_notify_event );void thermal_zone_set_trips (struct thermal_zone_device *);@@ -494,6 +509,17 @@ static inline int thermal_zone_unbind_cooling_device( struct thermal_zone_device *tz, int trip, struct thermal_cooling_device *cdev) { return -ENODEV; } +static inline int thermal_zone_device_get_mode (struct thermal_zone_device *tz, +enum thermal_device_mode *mode) +{return -ENODEV ; } +static inline int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) +{return -ENODEV ; } +static inline void +thermal_zone_device_store_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) +{ } +static inline void thermal_zone_device_update (struct thermal_zone_device *tz,enum thermal_notify_event event) { }@@ -543,4 +569,26 @@ static inline void thermal_notify_framework(struct thermal_zone_device *tz, { }#endif /* CONFIG_THERMAL */ +static inline int thermal_zone_device_enable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_ENABLED ); +} + +static inline int thermal_zone_device_disable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_DISABLED ); +} + +static inline void +thermal_zone_device_store_enabled (struct thermal_zone_device *tz) +{ +thermal_zone_device_store_mode (tz,THERMAL_DEVICE_ENABLED ); +} + +static inline void +thermal_zone_device_store_disabled (struct thermal_zone_device *tz) +{ +thermal_zone_device_store_mode (tz,THERMAL_DEVICE_DISABLED ); +} +#endif /* __THERMAL_H__ */
Signature · 10 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
RFC v2 5/9 thermal: Store mode in thermal_zone_device
In reply to Andrzej Pietrasiewiczstruct thermal_zone_device has a "mode" member now, so use it.
--- drivers/acpi/thermal.c | 48 +++++++++---------- .../ethernet/mellanox/mlxsw/core_thermal.c | 35 ++------------ drivers/platform/x86/acerhdf.c | 24 ++++------ drivers/thermal/da9062-thermal.c | 12 +---- drivers/thermal/imx_thermal.c | 30 +++++------- .../intel/int340x_thermal/int3400_thermal.c | 34 +++++-------- .../thermal/intel/intel_quark_dts_thermal.c | 22 +++------ drivers/thermal/of-thermal.c | 19 ++------ 8 files changed, 71 insertions(+), 153 deletions(-)
drivers/acpi/thermal.c +23 -25
@@ -172,7 +172,6 @@ struct acpi_thermal {struct acpi_thermal_trips trips;struct acpi_handle_list devices;struct thermal_zone_device *thermal_zone; -int tz_enabled;int kelvin_offset;/* in millidegrees */ struct work_struct thermal_check_work; };
@@ -499,8 +498,14 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)static void acpi_thermal_check (void *data) {struct acpi_thermal *tz = data; +enum thermal_device_mode mode; -if (!tz->tz_enabled) +/* +* this driver does not provide ->get_mode(), so calling +* thermal_zone_device_get_mode() always succeeds +*/ +thermal_zone_device_get_mode (tz->thermal_zone, &mode); +if (mode !=THERMAL_DEVICE_ENABLED )return ; thermal_zone_device_update(tz->thermal_zone,
@@ -526,39 +531,33 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)return 0 ; } -static int thermal_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -struct acpi_thermal *tz = thermal->devdata; - - *mode = tz->tz_enabled ?THERMAL_DEVICE_ENABLED : -THERMAL_DEVICE_DISABLED ; - -return 0 ; -} -static int thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {struct acpi_thermal *tz = thermal->devdata; -int enable; +enum thermal_device_mode old_mode; +if (mode !=THERMAL_DEVICE_DISABLED && + mode !=THERMAL_DEVICE_ENABLED ) +return -EINVAL ;/* * enable/disable thermal management from ACPI thermal driver */ -if (mode ==THERMAL_DEVICE_ENABLED ) - enable =1 ; -else if (mode ==THERMAL_DEVICE_DISABLED ) { - enable =0 ; +if (mode ==THERMAL_DEVICE_DISABLED )pr_warn ("thermal zone will be disabled\n" ); - }else -return -EINVAL ; -if (enable != tz->tz_enabled) { - tz->tz_enabled = enable; +/* +* this driver does not provide ->get_mode(), so calling +* thermal_zone_device_get_mode() always succeeds +*/ +thermal_zone_device_get_mode (thermal, &old_mode); + +if (mode != old_mode) { +thermal_zone_device_store_mode (thermal, mode);ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"%s kernel ACPI thermal control\n" , - tz->tz_enabled ?"Enable" :"Disable" )); + mode ==THERMAL_DEVICE_ENABLED ? +"Enable" :"Disable" ));acpi_thermal_check (tz); }return 0 ;
@@ -850,7 +849,6 @@ static struct thermal_zone_device_ops acpi_thermal_zone_ops = { .bind = acpi_thermal_bind_cooling_device, .unbind = acpi_thermal_unbind_cooling_device, .get_temp = thermal_get_temp, - .get_mode = thermal_get_mode, .set_mode = thermal_set_mode, .get_trip_type = thermal_get_trip_type, .get_trip_temp = thermal_get_trip_temp,
@@ -907,7 +905,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)if (ACPI_FAILURE (status))return -ENODEV ; - tz->tz_enabled =1 ; +thermal_zone_device_store_enabled (tz->thermal_zone);dev_info (&tz->device->dev,"registered as thermal_zone%d\n" , tz->thermal_zone->id);
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +5 -30
@@ -98,7 +98,6 @@ struct mlxsw_thermal_module {struct mlxsw_thermal *parent;struct thermal_zone_device *tzdev;struct mlxsw_thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS ]; -enum thermal_device_mode mode;int module;/* Module or gearbox number */ };
@@ -110,7 +109,6 @@ struct mlxsw_thermal {struct thermal_cooling_device *cdevs[MLXSW_MFCR_PWMS_MAX ];u8 cooling_levels[MLXSW_THERMAL_MAX_STATE +1 ];struct mlxsw_thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS ]; -enum thermal_device_mode mode;struct mlxsw_thermal_module *tz_module_arr;u8 tz_module_num;struct mlxsw_thermal_module *tz_gearbox_arr;
@@ -277,16 +275,6 @@ static int mlxsw_thermal_unbind(struct thermal_zone_device *tzdev,return 0 ; } -static int mlxsw_thermal_get_mode (struct thermal_zone_device *tzdev, -enum thermal_device_mode *mode) -{ -struct mlxsw_thermal *thermal = tzdev->devdata; - - *mode = thermal->mode; - -return 0 ; -} -static int mlxsw_thermal_set_mode (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {
@@ -303,7 +291,7 @@ static int mlxsw_thermal_set_mode(struct thermal_zone_device *tzdev,mutex_unlock (&tzdev->lock); - thermal->mode = mode; +thermal_zone_device_store_mode (tzdev, mode);thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED );return 0 ;
@@ -409,7 +397,6 @@ static int mlxsw_thermal_trend_get(struct thermal_zone_device *tzdev,static struct thermal_zone_device_ops mlxsw_thermal_ops = { .bind = mlxsw_thermal_bind, .unbind = mlxsw_thermal_unbind, - .get_mode = mlxsw_thermal_get_mode, .set_mode = mlxsw_thermal_set_mode, .get_temp = mlxsw_thermal_get_temp, .get_trip_type = mlxsw_thermal_get_trip_type,
@@ -468,16 +455,6 @@ static int mlxsw_thermal_module_unbind(struct thermal_zone_device *tzdev,return err; } -static int mlxsw_thermal_module_mode_get (struct thermal_zone_device *tzdev, -enum thermal_device_mode *mode) -{ -struct mlxsw_thermal_module *tz = tzdev->devdata; - - *mode = tz->mode; - -return 0 ; -} -static int mlxsw_thermal_module_mode_set (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {
@@ -495,7 +472,7 @@ static int mlxsw_thermal_module_mode_set(struct thermal_zone_device *tzdev,mutex_unlock (&tzdev->lock); - tz->mode = mode; +thermal_zone_device_store_mode (tzdev, mode);thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED );return 0 ;
@@ -600,7 +577,6 @@ mlxsw_thermal_module_trip_hyst_set(struct thermal_zone_device *tzdev, int trip,static struct thermal_zone_device_ops mlxsw_thermal_module_ops = { .bind = mlxsw_thermal_module_bind, .unbind = mlxsw_thermal_module_unbind, - .get_mode = mlxsw_thermal_module_mode_get, .set_mode = mlxsw_thermal_module_mode_set, .get_temp = mlxsw_thermal_module_temp_get, .get_trip_type = mlxsw_thermal_module_trip_type_get,
@@ -639,7 +615,6 @@ static int mlxsw_thermal_gearbox_temp_get(struct thermal_zone_device *tzdev,static struct thermal_zone_device_ops mlxsw_thermal_gearbox_ops = { .bind = mlxsw_thermal_module_bind, .unbind = mlxsw_thermal_module_unbind, - .get_mode = mlxsw_thermal_module_mode_get, .set_mode = mlxsw_thermal_module_mode_set, .get_temp = mlxsw_thermal_gearbox_temp_get, .get_trip_type = mlxsw_thermal_module_trip_type_get,
@@ -769,7 +744,7 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz)return err; } - module_tz->mode =THERMAL_DEVICE_ENABLED ; +thermal_zone_device_store_enabled (module_tz->tzdev);return 0 ; }
@@ -885,7 +860,7 @@ mlxsw_thermal_gearbox_tz_init(struct mlxsw_thermal_module *gearbox_tz)if (IS_ERR (gearbox_tz->tzdev))return PTR_ERR (gearbox_tz->tzdev); - gearbox_tz->mode =THERMAL_DEVICE_ENABLED ; +thermal_zone_device_store_enabled (gearbox_tz->tzdev);return 0 ; }
@@ -1054,7 +1029,7 @@ int mlxsw_thermal_init(struct mlxsw_core *core,if (err) goto err_unreg_modules_tzdev; - thermal->mode =THERMAL_DEVICE_ENABLED ; +thermal_zone_device_store_enabled (thermal->tzdev); *p_thermal = thermal;return 0 ;
drivers/platform/x86/acerhdf.c +9 -15
@@ -65,8 +65,10 @@#ifdef START_IN_KERNEL_MODE static int kernelmode =1 ; +#define ACERHDF_DEFAULT_MODE THERMAL_DEVICE_ENABLED#else static int kernelmode; +#define ACERHDF_DEFAULT_MODE THERMAL_DEVICE_DISABLED#endif static unsigned int interval =10 ;
@@ -410,18 +412,6 @@ static inline void acerhdf_enable_kernelmode(void)pr_notice ("kernel mode fan control ON\n" ); } -static int acerhdf_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -if (verbose) -pr_notice ("kernel mode fan control %d\n" , kernelmode); - - *mode = (kernelmode) ?THERMAL_DEVICE_ENABLED - :THERMAL_DEVICE_DISABLED ; - -return 0 ; -} -/* * set operation mode; * enabled: the thermal layer of the kernel takes care about
@@ -435,10 +425,13 @@ static int acerhdf_set_mode(struct thermal_zone_device *thermal, mode != THERMAL_DEVICE_ENABLED)return -EINVAL ; -if (mode ==THERMAL_DEVICE_DISABLED && kernelmode) +if (mode ==THERMAL_DEVICE_DISABLED && kernelmode) {acerhdf_revert_to_bios_mode (); -else if (mode ==THERMAL_DEVICE_ENABLED && !kernelmode) +thermal_zone_device_store_enabled (thermal); + }else if (mode ==THERMAL_DEVICE_ENABLED && !kernelmode) {acerhdf_enable_kernelmode (); +thermal_zone_device_store_disabled (thermal); + }return 0 ; }
@@ -492,7 +485,6 @@ static struct thermal_zone_device_ops acerhdf_dev_ops = { .bind = acerhdf_bind, .unbind = acerhdf_unbind, .get_temp = acerhdf_get_ec_temp, - .get_mode = acerhdf_get_mode, .set_mode = acerhdf_set_mode, .get_trip_type = acerhdf_get_trip_type, .get_trip_hyst = acerhdf_get_trip_hyst,
@@ -757,6 +749,8 @@ static int __init acerhdf_register_thermal(void)return -EINVAL ; } +thermal_zone_device_store_mode (thz_dev,ACERHDF_DEFAULT_MODE ); +return 0 ; }
drivers/thermal/da9062-thermal.c +1 -11
@@ -49,7 +49,6 @@ struct da9062_thermal {struct da9062 *hw;struct delayed_work work;struct thermal_zone_device *zone; -enum thermal_device_mode mode;struct mutex lock;/* protection for da9062_thermal temperature */ int temperature;int irq;
@@ -121,14 +120,6 @@ static irqreturn_t da9062_thermal_irq_handler(int irq, void *data)return IRQ_HANDLED ; } -static int da9062_thermal_get_mode (struct thermal_zone_device *z, -enum thermal_device_mode *mode) -{ -struct da9062_thermal *thermal = z->devdata; - *mode = thermal->mode; -return 0 ; -} -static int da9062_thermal_get_trip_type (struct thermal_zone_device *z,int trip,enum thermal_trip_type *type)
@@ -181,7 +172,6 @@ static int da9062_thermal_get_temp(struct thermal_zone_device *z,static struct thermal_zone_device_ops da9062_thermal_ops = { .get_temp = da9062_thermal_get_temp, - .get_mode = da9062_thermal_get_mode, .get_trip_type = da9062_thermal_get_trip_type, .get_trip_temp = da9062_thermal_get_trip_temp, };
@@ -233,7 +223,6 @@ static int da9062_thermal_probe(struct platform_device *pdev) thermal->config = match->data; thermal->hw = chip; - thermal->mode =THERMAL_DEVICE_ENABLED ; thermal->dev = &pdev->dev;INIT_DELAYED_WORK (&thermal->work, da9062_thermal_poll_on);
@@ -248,6 +237,7 @@ static int da9062_thermal_probe(struct platform_device *pdev) ret =PTR_ERR (thermal->zone); goto err; } +thermal_zone_device_store_enabled (thermal->zone); dev_dbg(&pdev->dev, "TJUNC temperature polling period set at %d ms\n",
drivers/thermal/imx_thermal.c +12 -18
@@ -197,7 +197,6 @@ struct imx_thermal_data {struct cpufreq_policy *policy;struct thermal_zone_device *tz;struct thermal_cooling_device *cdev; -enum thermal_device_mode mode;struct regmap *tempmon;u32 c1, c2;/* See formula in imx_init_calib() */ int temp_passive;
@@ -252,11 +251,17 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)struct imx_thermal_data *data = tz->devdata;const struct thermal_soc_data *soc_data = data->socdata;struct regmap *map = data->tempmon; +enum thermal_device_mode mode;unsigned int n_meas;bool wait;u32 val; -if (data->mode ==THERMAL_DEVICE_ENABLED ) { +/* +* this driver does not provide ->get_mode(), so calling +* thermal_zone_device_get_mode() always succeeds +*/ +thermal_zone_device_get_mode (tz, &mode); +if (mode ==THERMAL_DEVICE_ENABLED ) {/* Check if a measurement is currently in progress */ regmap_read (map, soc_data->temp_data, &val); wait = !(val & soc_data->temp_valid_mask);
@@ -283,7 +288,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)regmap_read (map, soc_data->temp_data, &val); -if (data->mode !=THERMAL_DEVICE_ENABLED ) { +if (mode !=THERMAL_DEVICE_ENABLED ) {regmap_write (map, soc_data->sensor_ctrl +REG_CLR , soc_data->measure_temp_mask); regmap_write(map, soc_data->sensor_ctrl + REG_SET,
@@ -331,16 +336,6 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)return 0 ; } -static int imx_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -struct imx_thermal_data *data = tz->devdata; - - *mode = data->mode; - -return 0 ; -} -static int imx_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {
@@ -378,7 +373,7 @@ static int imx_set_mode(struct thermal_zone_device *tz,return -EINVAL ; } - data->mode = mode; +thermal_zone_device_store_mode (tz, mode);thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED );return 0 ;
@@ -469,7 +464,6 @@ static struct thermal_zone_device_ops imx_tz_ops = { .bind = imx_bind, .unbind = imx_unbind, .get_temp = imx_get_temp, - .get_mode = imx_get_mode, .set_mode = imx_set_mode, .get_trip_type = imx_get_trip_type, .get_trip_temp = imx_get_trip_temp,
@@ -833,7 +827,7 @@ static int imx_thermal_probe(struct platform_device *pdev) data->socdata->measure_temp_mask); data->irq_enabled = true; - data->mode =THERMAL_DEVICE_ENABLED ; +thermal_zone_device_store_enabled (data->tz); ret = devm_request_threaded_irq(&pdev->dev, data->irq, imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,
@@ -887,7 +881,7 @@ static int __maybe_unused imx_thermal_suspend(struct device *dev) data->socdata->measure_temp_mask);regmap_write (map, data->socdata->sensor_ctrl +REG_SET , data->socdata->power_down_mask); - data->mode =THERMAL_DEVICE_DISABLED ; +thermal_zone_device_store_disabled (data->tz);clk_disable_unprepare (data->thermal_clk);return 0 ;
@@ -907,7 +901,7 @@ static int __maybe_unused imx_thermal_resume(struct device *dev) data->socdata->power_down_mask);regmap_write (map, data->socdata->sensor_ctrl +REG_SET , data->socdata->measure_temp_mask); - data->mode =THERMAL_DEVICE_ENABLED ; +thermal_zone_device_store_enabled (data->tz);return 0 ; }
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +12 -22
@@ -44,7 +44,6 @@ static char *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = {struct int3400_thermal_priv {struct acpi_device *adev;struct thermal_zone_device *thermal; -int mode;int art_count;struct art *arts;int trt_count;
@@ -230,42 +229,33 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal,return 0 ; } -static int int3400_thermal_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -struct int3400_thermal_priv *priv = thermal->devdata; - - *mode = priv->mode; - -return 0 ; -} -static int int3400_thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {struct int3400_thermal_priv *priv = thermal->devdata; -bool enable; +enum thermal_device_mode old_mode;int result =0 ; -if (mode ==THERMAL_DEVICE_ENABLED ) - enable = true; -else if (mode ==THERMAL_DEVICE_DISABLED ) - enable = false; -else +if (mode !=THERMAL_DEVICE_ENABLED && + mode !=THERMAL_DEVICE_DISABLED )return -EINVAL ; -if (enable != priv->mode) { - priv->mode = enable; +/* +* this driver does not provide ->get_mode(), so calling +* thermal_zone_device_get_mode() always succeeds +*/ +thermal_zone_device_get_mode (thermal, &old_mode); +if (mode != old_mode) { +thermal_zone_device_store_mode (thermal, mode); result =int3400_thermal_run_osc (priv->adev->handle, - priv->current_uuid_index, - enable); + priv->current_uuid_index, + mode ==THERMAL_DEVICE_ENABLED ); }return result; }static struct thermal_zone_device_ops int3400_thermal_ops = { .get_temp = int3400_thermal_get_temp, - .get_mode = int3400_thermal_get_mode, .set_mode = int3400_thermal_set_mode, };
drivers/thermal/intel/intel_quark_dts_thermal.c +6 -16
@@ -103,7 +103,6 @@ struct soc_sensor_entry {bool locked;u32 store_ptps;u32 store_dts_enable; -enum thermal_device_mode mode;struct thermal_zone_device *tzone; };
@@ -128,7 +127,7 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)return ret;if (out &QRK_DTS_ENABLE_BIT ) { - aux_entry->mode =THERMAL_DEVICE_ENABLED ; +thermal_zone_device_store_enabled (tzd);return 0 ; }
@@ -139,9 +138,9 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)if (ret)return ret; - aux_entry->mode =THERMAL_DEVICE_ENABLED ; +thermal_zone_device_store_enabled (tzd); }else { - aux_entry->mode =THERMAL_DEVICE_DISABLED ; +thermal_zone_device_store_disabled (tzd);pr_info ("DTS is locked. Cannot enable DTS\n" ); ret = -EPERM ; }
@@ -161,7 +160,7 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)return ret;if (!(out &QRK_DTS_ENABLE_BIT )) { - aux_entry->mode =THERMAL_DEVICE_DISABLED ; +thermal_zone_device_store_disabled (tzd);return 0 ; }
@@ -173,9 +172,9 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)if (ret)return ret; - aux_entry->mode =THERMAL_DEVICE_DISABLED ; +thermal_zone_device_store_disabled (tzd); }else { - aux_entry->mode =THERMAL_DEVICE_ENABLED ; +thermal_zone_device_store_enabled (tzd);pr_info ("DTS is locked. Cannot disable DTS\n" ); ret = -EPERM ; }
@@ -309,14 +308,6 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,return 0 ; } -static int sys_get_mode (struct thermal_zone_device *tzd, -enum thermal_device_mode *mode) -{ -struct soc_sensor_entry *aux_entry = tzd->devdata; - *mode = aux_entry->mode; -return 0 ; -} -static int sys_set_mode (struct thermal_zone_device *tzd,enum thermal_device_mode mode) {
@@ -341,7 +332,6 @@ static struct thermal_zone_device_ops tzone_ops = { .get_trip_type = sys_get_trip_type, .set_trip_temp = sys_set_trip_temp, .get_crit_temp = sys_get_crit_temp, - .get_mode = sys_get_mode, .set_mode = sys_set_mode, };
drivers/thermal/of-thermal.c +3 -16
@@ -51,7 +51,6 @@ struct __thermal_bind_params {/** * struct __thermal_zone - internal representation of a thermal zone -* @mode: current thermal zone device mode (enabled/disabled) * @passive_delay: polling interval while passive cooling is activated * @polling_delay: zone polling interval * @slope: slope of the temperature adjustment curve
@@ -65,7 +64,6 @@ struct __thermal_bind_params {*/ struct __thermal_zone { -enum thermal_device_mode mode;int passive_delay;int polling_delay;int slope;
@@ -269,16 +267,6 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,return 0 ; } -static int of_thermal_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -struct __thermal_zone *data = tz->devdata; - - *mode = data->mode; - -return 0 ; -} -static int of_thermal_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {
@@ -298,7 +286,7 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz,mutex_unlock (&tz->lock); - data->mode = mode; +thermal_zone_device_store_mode (tz, mode);thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED );return 0 ;
@@ -395,7 +383,6 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz, }static struct thermal_zone_device_ops of_thermal_ops = { - .get_mode = of_thermal_get_mode, .set_mode = of_thermal_set_mode, .get_trip_type = of_thermal_get_trip_type,
@@ -556,7 +543,7 @@ thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data, tzd =thermal_zone_of_add_sensor (child, sensor_np, data, ops);if (!IS_ERR (tzd)) - tzd->ops->set_mode (tzd,THERMAL_DEVICE_ENABLED ); +thermal_zone_device_enable (tzd);of_node_put (child); goto exit;
@@ -981,7 +968,6 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) finish:of_node_put (child); - tz->mode =THERMAL_DEVICE_DISABLED ;return tz;
@@ -1136,6 +1122,7 @@ int __init of_parse_thermal_zones(void)of_thermal_free_zone (tz);/* attempting to build remaining zones still */ } +thermal_zone_device_store_disabled (zone); }of_node_put (np);
Signature · 1 line
2.17.1
Re: [RFC v2 5/9] thermal: Store mode in thermal_zone_device
Quoted 3 lines · Andrzej Pietrasiewicz
struct
thermal_zone_devicehas a "mode" member now, so use it.Signed-off-by Andrzej Pietrasiewicz <[email protected]>
At this point, I suggest to not go further with the changes from patch 5-9 but add a new 'mode' field in the struct thermal_zone_params.
And then in the function thermal_zone_device_register()
{
...
if (tzp)
thermal_zone_set_mode(tzp->mode);
...}
The important thing is to prevent exporting the functions thermal_zone_device_enable / disable, so they stay in the thermal framework internals, thus forcing to centralize the control of the thermal zones from the framework and not from the device drivers.
Temporarly, until the polling is disabled for disabled thermal zones, the acpi driver can stay in the state it is. It may need special attention afterwards.
But I believe setting the mode from the register function will help to clean up a lot of drivers.
Quoted 677 lines
--- drivers/acpi/thermal.c | 48 +++++++++---------- .../ethernet/mellanox/mlxsw/core_thermal.c | 35 ++------------ drivers/platform/x86/acerhdf.c | 24 ++++------ drivers/thermal/da9062-thermal.c | 12 +---- drivers/thermal/imx_thermal.c | 30 +++++------- .../intel/int340x_thermal/int3400_thermal.c | 34 +++++-------- .../thermal/intel/intel_quark_dts_thermal.c | 22 +++------ drivers/thermal/of-thermal.c | 19 ++------ 8 files changed, 71 insertions(+), 153 deletions(-)drivers/acpi/thermal.c +23
-25@@ -172,7 +172,6 @@ struct acpi_thermal {struct acpi_thermal_trips trips;struct acpi_handle_list devices;struct thermal_zone_device *thermal_zone; -int tz_enabled;int kelvin_offset;/* in millidegrees */ struct work_struct thermal_check_work; };@@ -499,8 +498,14 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)static void acpi_thermal_check (void *data) {struct acpi_thermal *tz = data; +enum thermal_device_mode mode; -if (!tz->tz_enabled) +/* +* this driver does not provide ->get_mode(), so calling +* thermal_zone_device_get_mode() always succeeds +*/ +thermal_zone_device_get_mode (tz->thermal_zone, &mode); +if (mode !=THERMAL_DEVICE_ENABLED )return ; thermal_zone_device_update(tz->thermal_zone,@@ -526,39 +531,33 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)return 0 ; } -static int thermal_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -struct acpi_thermal *tz = thermal->devdata; - - *mode = tz->tz_enabled ?THERMAL_DEVICE_ENABLED : -THERMAL_DEVICE_DISABLED ; - -return 0 ; -} -static int thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {struct acpi_thermal *tz = thermal->devdata; -int enable; +enum thermal_device_mode old_mode; +if (mode !=THERMAL_DEVICE_DISABLED && + mode !=THERMAL_DEVICE_ENABLED ) +return -EINVAL ;/* * enable/disable thermal management from ACPI thermal driver */ -if (mode ==THERMAL_DEVICE_ENABLED ) - enable =1 ; -else if (mode ==THERMAL_DEVICE_DISABLED ) { - enable =0 ; +if (mode ==THERMAL_DEVICE_DISABLED )pr_warn ("thermal zone will be disabled\n" ); - }else -return -EINVAL ; -if (enable != tz->tz_enabled) { - tz->tz_enabled = enable; +/* +* this driver does not provide ->get_mode(), so calling +* thermal_zone_device_get_mode() always succeeds +*/ +thermal_zone_device_get_mode (thermal, &old_mode); + +if (mode != old_mode) { +thermal_zone_device_store_mode (thermal, mode);ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"%s kernel ACPI thermal control\n" , - tz->tz_enabled ?"Enable" :"Disable" )); + mode ==THERMAL_DEVICE_ENABLED ? +"Enable" :"Disable" ));acpi_thermal_check (tz); }return 0 ;@@ -850,7 +849,6 @@ static struct thermal_zone_device_ops acpi_thermal_zone_ops = { .bind = acpi_thermal_bind_cooling_device, .unbind = acpi_thermal_unbind_cooling_device, .get_temp = thermal_get_temp, - .get_mode = thermal_get_mode, .set_mode = thermal_set_mode, .get_trip_type = thermal_get_trip_type, .get_trip_temp = thermal_get_trip_temp,@@ -907,7 +905,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)if (ACPI_FAILURE (status))return -ENODEV ; - tz->tz_enabled =1 ; +thermal_zone_device_store_enabled (tz->thermal_zone);dev_info (&tz->device->dev,"registered as thermal_zone%d\n" , tz->thermal_zone->id);drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +5
-30@@ -98,7 +98,6 @@ struct mlxsw_thermal_module {struct mlxsw_thermal *parent;struct thermal_zone_device *tzdev;struct mlxsw_thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS ]; -enum thermal_device_mode mode;int module;/* Module or gearbox number */ };@@ -110,7 +109,6 @@ struct mlxsw_thermal {struct thermal_cooling_device *cdevs[MLXSW_MFCR_PWMS_MAX ];u8 cooling_levels[MLXSW_THERMAL_MAX_STATE +1 ];struct mlxsw_thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS ]; -enum thermal_device_mode mode;struct mlxsw_thermal_module *tz_module_arr;u8 tz_module_num;struct mlxsw_thermal_module *tz_gearbox_arr;@@ -277,16 +275,6 @@ static int mlxsw_thermal_unbind(struct thermal_zone_device *tzdev,return 0 ; } -static int mlxsw_thermal_get_mode (struct thermal_zone_device *tzdev, -enum thermal_device_mode *mode) -{ -struct mlxsw_thermal *thermal = tzdev->devdata; - - *mode = thermal->mode; - -return 0 ; -} -static int mlxsw_thermal_set_mode (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {@@ -303,7 +291,7 @@ static int mlxsw_thermal_set_mode(struct thermal_zone_device *tzdev,mutex_unlock (&tzdev->lock); - thermal->mode = mode; +thermal_zone_device_store_mode (tzdev, mode);thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED );return 0 ;@@ -409,7 +397,6 @@ static int mlxsw_thermal_trend_get(struct thermal_zone_device *tzdev,static struct thermal_zone_device_ops mlxsw_thermal_ops = { .bind = mlxsw_thermal_bind, .unbind = mlxsw_thermal_unbind, - .get_mode = mlxsw_thermal_get_mode, .set_mode = mlxsw_thermal_set_mode, .get_temp = mlxsw_thermal_get_temp, .get_trip_type = mlxsw_thermal_get_trip_type,@@ -468,16 +455,6 @@ static int mlxsw_thermal_module_unbind(struct thermal_zone_device *tzdev,return err; } -static int mlxsw_thermal_module_mode_get (struct thermal_zone_device *tzdev, -enum thermal_device_mode *mode) -{ -struct mlxsw_thermal_module *tz = tzdev->devdata; - - *mode = tz->mode; - -return 0 ; -} -static int mlxsw_thermal_module_mode_set (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {@@ -495,7 +472,7 @@ static int mlxsw_thermal_module_mode_set(struct thermal_zone_device *tzdev,mutex_unlock (&tzdev->lock); - tz->mode = mode; +thermal_zone_device_store_mode (tzdev, mode);thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED );return 0 ;@@ -600,7 +577,6 @@ mlxsw_thermal_module_trip_hyst_set(struct thermal_zone_device *tzdev, int trip,static struct thermal_zone_device_ops mlxsw_thermal_module_ops = { .bind = mlxsw_thermal_module_bind, .unbind = mlxsw_thermal_module_unbind, - .get_mode = mlxsw_thermal_module_mode_get, .set_mode = mlxsw_thermal_module_mode_set, .get_temp = mlxsw_thermal_module_temp_get, .get_trip_type = mlxsw_thermal_module_trip_type_get,@@ -639,7 +615,6 @@ static int mlxsw_thermal_gearbox_temp_get(struct thermal_zone_device *tzdev,static struct thermal_zone_device_ops mlxsw_thermal_gearbox_ops = { .bind = mlxsw_thermal_module_bind, .unbind = mlxsw_thermal_module_unbind, - .get_mode = mlxsw_thermal_module_mode_get, .set_mode = mlxsw_thermal_module_mode_set, .get_temp = mlxsw_thermal_gearbox_temp_get, .get_trip_type = mlxsw_thermal_module_trip_type_get,@@ -769,7 +744,7 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz)return err; } - module_tz->mode =THERMAL_DEVICE_ENABLED ; +thermal_zone_device_store_enabled (module_tz->tzdev);return 0 ; }@@ -885,7 +860,7 @@ mlxsw_thermal_gearbox_tz_init(struct mlxsw_thermal_module *gearbox_tz)if (IS_ERR (gearbox_tz->tzdev))return PTR_ERR (gearbox_tz->tzdev); - gearbox_tz->mode =THERMAL_DEVICE_ENABLED ; +thermal_zone_device_store_enabled (gearbox_tz->tzdev);return 0 ; }@@ -1054,7 +1029,7 @@ int mlxsw_thermal_init(struct mlxsw_core *core,if (err) goto err_unreg_modules_tzdev; - thermal->mode =THERMAL_DEVICE_ENABLED ; +thermal_zone_device_store_enabled (thermal->tzdev); *p_thermal = thermal;return 0 ;drivers/platform/x86/acerhdf.c +9
-15@@ -65,8 +65,10 @@#ifdef START_IN_KERNEL_MODE static int kernelmode =1 ; +#define ACERHDF_DEFAULT_MODE THERMAL_DEVICE_ENABLED#else static int kernelmode; +#define ACERHDF_DEFAULT_MODE THERMAL_DEVICE_DISABLED#endif static unsigned int interval =10 ;@@ -410,18 +412,6 @@ static inline void acerhdf_enable_kernelmode(void)pr_notice ("kernel mode fan control ON\n" ); } -static int acerhdf_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -if (verbose) -pr_notice ("kernel mode fan control %d\n" , kernelmode); - - *mode = (kernelmode) ?THERMAL_DEVICE_ENABLED - :THERMAL_DEVICE_DISABLED ; - -return 0 ; -} -/* * set operation mode; * enabled: the thermal layer of the kernel takes care about @@ -435,10 +425,13 @@ static int acerhdf_set_mode(struct thermal_zone_device *thermal, mode != THERMAL_DEVICE_ENABLED)return -EINVAL ; -if (mode ==THERMAL_DEVICE_DISABLED && kernelmode) +if (mode ==THERMAL_DEVICE_DISABLED && kernelmode) {acerhdf_revert_to_bios_mode (); -else if (mode ==THERMAL_DEVICE_ENABLED && !kernelmode) +thermal_zone_device_store_enabled (thermal); + }else if (mode ==THERMAL_DEVICE_ENABLED && !kernelmode) {acerhdf_enable_kernelmode (); +thermal_zone_device_store_disabled (thermal); + }return 0 ; }@@ -492,7 +485,6 @@ static struct thermal_zone_device_ops acerhdf_dev_ops = { .bind = acerhdf_bind, .unbind = acerhdf_unbind, .get_temp = acerhdf_get_ec_temp, - .get_mode = acerhdf_get_mode, .set_mode = acerhdf_set_mode, .get_trip_type = acerhdf_get_trip_type, .get_trip_hyst = acerhdf_get_trip_hyst,@@ -757,6 +749,8 @@ static int __init acerhdf_register_thermal(void)return -EINVAL ; } +thermal_zone_device_store_mode (thz_dev,ACERHDF_DEFAULT_MODE ); +return 0 ; }drivers/thermal/da9062-thermal.c +1
-11@@ -49,7 +49,6 @@ struct da9062_thermal {struct da9062 *hw;struct delayed_work work;struct thermal_zone_device *zone; -enum thermal_device_mode mode;struct mutex lock;/* protection for da9062_thermal temperature */ int temperature;int irq;@@ -121,14 +120,6 @@ static irqreturn_t da9062_thermal_irq_handler(int irq, void *data)return IRQ_HANDLED ; } -static int da9062_thermal_get_mode (struct thermal_zone_device *z, -enum thermal_device_mode *mode) -{ -struct da9062_thermal *thermal = z->devdata; - *mode = thermal->mode; -return 0 ; -} -static int da9062_thermal_get_trip_type (struct thermal_zone_device *z,int trip,enum thermal_trip_type *type)@@ -181,7 +172,6 @@ static int da9062_thermal_get_temp(struct thermal_zone_device *z,static struct thermal_zone_device_ops da9062_thermal_ops = { .get_temp = da9062_thermal_get_temp, - .get_mode = da9062_thermal_get_mode, .get_trip_type = da9062_thermal_get_trip_type, .get_trip_temp = da9062_thermal_get_trip_temp, };@@ -233,7 +223,6 @@ static int da9062_thermal_probe(struct platform_device *pdev) thermal->config = match->data; thermal->hw = chip; - thermal->mode =THERMAL_DEVICE_ENABLED ; thermal->dev = &pdev->dev;INIT_DELAYED_WORK (&thermal->work, da9062_thermal_poll_on);@@ -248,6 +237,7 @@ static int da9062_thermal_probe(struct platform_device *pdev) ret =PTR_ERR (thermal->zone); goto err; } +thermal_zone_device_store_enabled (thermal->zone); dev_dbg(&pdev->dev, "TJUNC temperature polling period set at %d ms\n",drivers/thermal/imx_thermal.c +12
-18@@ -197,7 +197,6 @@ struct imx_thermal_data {struct cpufreq_policy *policy;struct thermal_zone_device *tz;struct thermal_cooling_device *cdev; -enum thermal_device_mode mode;struct regmap *tempmon;u32 c1, c2;/* See formula in imx_init_calib() */ int temp_passive;@@ -252,11 +251,17 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)struct imx_thermal_data *data = tz->devdata;const struct thermal_soc_data *soc_data = data->socdata;struct regmap *map = data->tempmon; +enum thermal_device_mode mode;unsigned int n_meas;bool wait;u32 val; -if (data->mode ==THERMAL_DEVICE_ENABLED ) { +/* +* this driver does not provide ->get_mode(), so calling +* thermal_zone_device_get_mode() always succeeds +*/ +thermal_zone_device_get_mode (tz, &mode); +if (mode ==THERMAL_DEVICE_ENABLED ) {/* Check if a measurement is currently in progress */ regmap_read (map, soc_data->temp_data, &val); wait = !(val & soc_data->temp_valid_mask);@@ -283,7 +288,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)regmap_read (map, soc_data->temp_data, &val); -if (data->mode !=THERMAL_DEVICE_ENABLED ) { +if (mode !=THERMAL_DEVICE_ENABLED ) {regmap_write (map, soc_data->sensor_ctrl +REG_CLR , soc_data->measure_temp_mask); regmap_write(map, soc_data->sensor_ctrl + REG_SET,@@ -331,16 +336,6 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)return 0 ; } -static int imx_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -struct imx_thermal_data *data = tz->devdata; - - *mode = data->mode; - -return 0 ; -} -static int imx_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {@@ -378,7 +373,7 @@ static int imx_set_mode(struct thermal_zone_device *tz,return -EINVAL ; } - data->mode = mode; +thermal_zone_device_store_mode (tz, mode);thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED );return 0 ;@@ -469,7 +464,6 @@ static struct thermal_zone_device_ops imx_tz_ops = { .bind = imx_bind, .unbind = imx_unbind, .get_temp = imx_get_temp, - .get_mode = imx_get_mode, .set_mode = imx_set_mode, .get_trip_type = imx_get_trip_type, .get_trip_temp = imx_get_trip_temp,@@ -833,7 +827,7 @@ static int imx_thermal_probe(struct platform_device *pdev) data->socdata->measure_temp_mask); data->irq_enabled = true; - data->mode =THERMAL_DEVICE_ENABLED ; +thermal_zone_device_store_enabled (data->tz); ret = devm_request_threaded_irq(&pdev->dev, data->irq, imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,@@ -887,7 +881,7 @@ static int __maybe_unused imx_thermal_suspend(struct device *dev) data->socdata->measure_temp_mask);regmap_write (map, data->socdata->sensor_ctrl +REG_SET , data->socdata->power_down_mask); - data->mode =THERMAL_DEVICE_DISABLED ; +thermal_zone_device_store_disabled (data->tz);clk_disable_unprepare (data->thermal_clk);return 0 ;@@ -907,7 +901,7 @@ static int __maybe_unused imx_thermal_resume(struct device *dev) data->socdata->power_down_mask);regmap_write (map, data->socdata->sensor_ctrl +REG_SET , data->socdata->measure_temp_mask); - data->mode =THERMAL_DEVICE_ENABLED ; +thermal_zone_device_store_enabled (data->tz);return 0 ; }drivers/thermal/intel/int340x_thermal/int3400_thermal.c +12
-22@@ -44,7 +44,6 @@ static char *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = {struct int3400_thermal_priv {struct acpi_device *adev;struct thermal_zone_device *thermal; -int mode;int art_count;struct art *arts;int trt_count;@@ -230,42 +229,33 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal,return 0 ; } -static int int3400_thermal_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -struct int3400_thermal_priv *priv = thermal->devdata; - - *mode = priv->mode; - -return 0 ; -} -static int int3400_thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {struct int3400_thermal_priv *priv = thermal->devdata; -bool enable; +enum thermal_device_mode old_mode;int result =0 ; -if (mode ==THERMAL_DEVICE_ENABLED ) - enable = true; -else if (mode ==THERMAL_DEVICE_DISABLED ) - enable = false; -else +if (mode !=THERMAL_DEVICE_ENABLED && + mode !=THERMAL_DEVICE_DISABLED )return -EINVAL ; -if (enable != priv->mode) { - priv->mode = enable; +/* +* this driver does not provide ->get_mode(), so calling +* thermal_zone_device_get_mode() always succeeds +*/ +thermal_zone_device_get_mode (thermal, &old_mode); +if (mode != old_mode) { +thermal_zone_device_store_mode (thermal, mode); result =int3400_thermal_run_osc (priv->adev->handle, - priv->current_uuid_index, - enable); + priv->current_uuid_index, + mode ==THERMAL_DEVICE_ENABLED ); }return result; }static struct thermal_zone_device_ops int3400_thermal_ops = { .get_temp = int3400_thermal_get_temp, - .get_mode = int3400_thermal_get_mode, .set_mode = int3400_thermal_set_mode, };drivers/thermal/intel/intel_quark_dts_thermal.c +6
-16@@ -103,7 +103,6 @@ struct soc_sensor_entry {bool locked;u32 store_ptps;u32 store_dts_enable; -enum thermal_device_mode mode;struct thermal_zone_device *tzone; };@@ -128,7 +127,7 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)return ret;if (out &QRK_DTS_ENABLE_BIT ) { - aux_entry->mode =THERMAL_DEVICE_ENABLED ; +thermal_zone_device_store_enabled (tzd);return 0 ; }@@ -139,9 +138,9 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)if (ret)return ret; - aux_entry->mode =THERMAL_DEVICE_ENABLED ; +thermal_zone_device_store_enabled (tzd); }else { - aux_entry->mode =THERMAL_DEVICE_DISABLED ; +thermal_zone_device_store_disabled (tzd);pr_info ("DTS is locked. Cannot enable DTS\n" ); ret = -EPERM ; }@@ -161,7 +160,7 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)return ret;if (!(out &QRK_DTS_ENABLE_BIT )) { - aux_entry->mode =THERMAL_DEVICE_DISABLED ; +thermal_zone_device_store_disabled (tzd);return 0 ; }@@ -173,9 +172,9 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)if (ret)return ret; - aux_entry->mode =THERMAL_DEVICE_DISABLED ; +thermal_zone_device_store_disabled (tzd); }else { - aux_entry->mode =THERMAL_DEVICE_ENABLED ; +thermal_zone_device_store_enabled (tzd);pr_info ("DTS is locked. Cannot disable DTS\n" ); ret = -EPERM ; }@@ -309,14 +308,6 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,return 0 ; } -static int sys_get_mode (struct thermal_zone_device *tzd, -enum thermal_device_mode *mode) -{ -struct soc_sensor_entry *aux_entry = tzd->devdata; - *mode = aux_entry->mode; -return 0 ; -} -static int sys_set_mode (struct thermal_zone_device *tzd,enum thermal_device_mode mode) {@@ -341,7 +332,6 @@ static struct thermal_zone_device_ops tzone_ops = { .get_trip_type = sys_get_trip_type, .set_trip_temp = sys_set_trip_temp, .get_crit_temp = sys_get_crit_temp, - .get_mode = sys_get_mode, .set_mode = sys_set_mode, };drivers/thermal/of-thermal.c +3
-16@@ -51,7 +51,6 @@ struct __thermal_bind_params {/** * struct __thermal_zone - internal representation of a thermal zone -* @mode: current thermal zone device mode (enabled/disabled) * @passive_delay: polling interval while passive cooling is activated * @polling_delay: zone polling interval * @slope: slope of the temperature adjustment curve @@ -65,7 +64,6 @@ struct __thermal_bind_params {*/ struct __thermal_zone { -enum thermal_device_mode mode;int passive_delay;int polling_delay;int slope;@@ -269,16 +267,6 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,return 0 ; } -static int of_thermal_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -struct __thermal_zone *data = tz->devdata; - - *mode = data->mode; - -return 0 ; -} -static int of_thermal_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {@@ -298,7 +286,7 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz,mutex_unlock (&tz->lock); - data->mode = mode; +thermal_zone_device_store_mode (tz, mode);thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED );return 0 ;@@ -395,7 +383,6 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz, }static struct thermal_zone_device_ops of_thermal_ops = { - .get_mode = of_thermal_get_mode, .set_mode = of_thermal_set_mode, .get_trip_type = of_thermal_get_trip_type,@@ -556,7 +543,7 @@ thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data, tzd =thermal_zone_of_add_sensor (child, sensor_np, data, ops);if (!IS_ERR (tzd)) - tzd->ops->set_mode (tzd,THERMAL_DEVICE_ENABLED ); +thermal_zone_device_enable (tzd);of_node_put (child); goto exit;@@ -981,7 +968,6 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) finish:of_node_put (child); - tz->mode =THERMAL_DEVICE_DISABLED ;return tz;@@ -1136,6 +1122,7 @@ int __init of_parse_thermal_zones(void)of_thermal_free_zone (tz);/* attempting to build remaining zones still */ } +thermal_zone_device_store_disabled (zone); }of_node_put (np);
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
v3 cover Stop monitoring disabled devices
This is the third iteration of this RFC. It has been substantially rewritten compared to v2.
The first patch makes all the drivers store their mode in struct thermal_zone_device. Such a move has consequences: driver-specific variables for storing mode are not necessary. Consequently get_mode() methods become obsolete. Then sysfs "mode" attribute stops depending on get_mode() being provided, because it is always provided from now on.
The first patch also introduces the initial mode to be optionally passed to thermal_zone_device_register().
Given all the groundwork done in patch 1/2 patch 2/2 becomes very simple.
This series addresses comments from Daniel and Bartlomiej - thank you guys!
Andrzej Pietrasiewicz (2):
thermal: core: Let thermal zone device's mode be stored in its struct
thermal: core: Stop polling DISABLED thermal devices
drivers/acpi/thermal.c | 46 +++++--------- .../ethernet/mellanox/mlxsw/core_thermal.c | 57 ++++-------------- drivers/platform/x86/acerhdf.c | 17 +----- drivers/thermal/da9062-thermal.c | 16 ++--- drivers/thermal/imx_thermal.c | 29 +++------ .../intel/int340x_thermal/int3400_thermal.c | 30 ++-------- .../thermal/intel/intel_quark_dts_thermal.c | 22 ++----- drivers/thermal/of-thermal.c | 30 +++------- drivers/thermal/thermal_core.c | 60 +++++++++++++++++-- drivers/thermal/thermal_core.h | 16 +++++ drivers/thermal/thermal_sysfs.c | 29 +-------- include/linux/thermal.h | 7 ++- 12 files changed, 139 insertions(+), 220 deletions(-)
Signature · 1 line
2.17.1
RFC v3 1/2 thermal: core: Let thermal zone device's mode be stored in its struct
Thermal zone devices' mode is stored in individual drivers. This patch changes it so that mode is stored in struct thermal_zone_device instead.
As a result all driver-specific variables storing the mode are not needed and are removed. Consequently, the get_mode() implementations have nothing to operate on and need to be removed, too.
Some thermal framework specific functions are introduced:
thermal_zone_device_get_mode()thermal_zone_device_set_mode()thermal_zone_device_enable()thermal_zone_device_disable()
thermal_zone_device_get_mode() and its "set" counterpart take tzd's lock and the "set" calls driver's set_mode() if provided, so the latter must not take this lock again. At the end of the "set" thermal_zone_device_update() is called so drivers don't need to repeat this invocation in their specific set_mode() implementations.
The scope of the above 4 functions is purposedly limited to the thermal framework and drivers are not supposed to call them. This encapsulation does not fully work at the moment for some drivers, though:
- platform/x86/acerhdf.c
- drivers/thermal/imx_thermal.c
- drivers/thermal/intel/intel_quark_dts_thermal.c
- drivers/thermal/of-thermal.c
and they manipulate struct thermal_zone_device's members directly.
struct thermal_zone_params gains a new member called initial_mode, which is used to set tzd's mode at registration time.
The sysfs "mode" attribute is always exposed from now on, because all thermal zone devices now have their get_mode() implemented at the generic level and it is always available. Exposing "mode" doesn't hurt the drivers which don't provide their own set_mode(), because writing to "mode" will result in -EPERM, as expected.
--- drivers/acpi/thermal.c | 46 +++++---------- .../ethernet/mellanox/mlxsw/core_thermal.c | 57 ++++--------------- drivers/platform/x86/acerhdf.c | 17 +----- drivers/thermal/da9062-thermal.c | 16 ++---- drivers/thermal/imx_thermal.c | 29 +++------- .../intel/int340x_thermal/int3400_thermal.c | 30 ++-------- .../thermal/intel/intel_quark_dts_thermal.c | 22 ++----- drivers/thermal/of-thermal.c | 30 +++------- drivers/thermal/thermal_core.c | 44 +++++++++++++- drivers/thermal/thermal_core.h | 16 ++++++ drivers/thermal/thermal_sysfs.c | 29 +--------- include/linux/thermal.h | 7 ++- 12 files changed, 125 insertions(+), 218 deletions(-)
drivers/acpi/thermal.c +14 -32
@@ -172,7 +172,6 @@ struct acpi_thermal {struct acpi_thermal_trips trips;struct acpi_handle_list devices;struct thermal_zone_device *thermal_zone; -int tz_enabled;int kelvin_offset;/* in millidegrees */ struct work_struct thermal_check_work; };
@@ -500,7 +499,7 @@ static void acpi_thermal_check(void *data) {struct acpi_thermal *tz = data; -if (!tz->tz_enabled) +if (tz->thermal_zone->mode !=THERMAL_DEVICE_ENABLED )return ; thermal_zone_device_update(tz->thermal_zone,
@@ -526,46 +525,29 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)return 0 ; } -static int thermal_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -struct acpi_thermal *tz = thermal->devdata; - -if (!tz) -return -EINVAL ; - - *mode = tz->tz_enabled ?THERMAL_DEVICE_ENABLED : -THERMAL_DEVICE_DISABLED ; - -return 0 ; -} -static int thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {struct acpi_thermal *tz = thermal->devdata; -int enable;if (!tz)return -EINVAL ; +if (mode !=THERMAL_DEVICE_DISABLED && + mode !=THERMAL_DEVICE_ENABLED ) +return -EINVAL ; +/* * enable/disable thermal management from ACPI thermal driver */ -if (mode ==THERMAL_DEVICE_ENABLED ) - enable =1 ; -else if (mode ==THERMAL_DEVICE_DISABLED ) { - enable =0 ; +if (mode ==THERMAL_DEVICE_DISABLED )pr_warn ("thermal zone will be disabled\n" ); - }else -return -EINVAL ; -if (enable != tz->tz_enabled) { - tz->tz_enabled = enable; +if (mode != thermal->mode) {ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"%s kernel ACPI thermal control\n" , - tz->tz_enabled ?"Enable" :"Disable" )); -acpi_thermal_check (tz); + mode ==THERMAL_DEVICE_ENABLED ? +"Enable" :"Disable" )); }return 0 ; }
@@ -856,7 +838,6 @@ static struct thermal_zone_device_ops acpi_thermal_zone_ops = { .bind = acpi_thermal_bind_cooling_device, .unbind = acpi_thermal_unbind_cooling_device, .get_temp = thermal_get_temp, - .get_mode = thermal_get_mode, .set_mode = thermal_set_mode, .get_trip_type = thermal_get_trip_type, .get_trip_temp = thermal_get_trip_temp,
@@ -870,6 +851,9 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)int trips =0 ;int result;acpi_status status; +struct thermal_zone_params prms = { + .initial_mode =THERMAL_DEVICE_ENABLED , + };int i;if (tz->trips.critical.flags.valid)
@@ -887,13 +871,13 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)if (tz->trips.passive.flags.valid) tz->thermal_zone =thermal_zone_device_register ("acpitz" , trips,0 , tz, - &acpi_thermal_zone_ops,NULL , + &acpi_thermal_zone_ops, &prms, tz->trips.passive.tsp*100 , tz->polling_frequency*100 );else tz->thermal_zone =thermal_zone_device_register ("acpitz" , trips,0 , tz, - &acpi_thermal_zone_ops,NULL , + &acpi_thermal_zone_ops, &prms,0 , tz->polling_frequency*100 );if (IS_ERR (tz->thermal_zone))return -ENODEV ;
@@ -913,8 +897,6 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)if (ACPI_FAILURE (status))return -ENODEV ; - tz->tz_enabled =1 ; -dev_info (&tz->device->dev,"registered as thermal_zone%d\n" , tz->thermal_zone->id);return 0 ;
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +12 -45
170 lines not on this page · raw message
drivers/platform/x86/acerhdf.c +3 -14
@@ -406,22 +406,9 @@ static inline void acerhdf_enable_kernelmode(void) kernelmode =1 ; thz_dev->polling_delay = interval*1000 ; -thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );pr_notice ("kernel mode fan control ON\n" ); } -static int acerhdf_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -if (verbose) -pr_notice ("kernel mode fan control %d\n" , kernelmode); - - *mode = (kernelmode) ?THERMAL_DEVICE_ENABLED - :THERMAL_DEVICE_DISABLED ; - -return 0 ; -} -/* * set operation mode; * enabled: the thermal layer of the kernel takes care about
@@ -488,7 +475,6 @@ static struct thermal_zone_device_ops acerhdf_dev_ops = { .bind = acerhdf_bind, .unbind = acerhdf_unbind, .get_temp = acerhdf_get_ec_temp, - .get_mode = acerhdf_get_mode, .set_mode = acerhdf_set_mode, .get_trip_type = acerhdf_get_trip_type, .get_trip_hyst = acerhdf_get_trip_hyst,
@@ -554,6 +540,7 @@ static int acerhdf_set_cur_state(struct thermal_cooling_device *cdev, err_out:acerhdf_revert_to_bios_mode (); + thz_dev->mode =THERMAL_DEVICE_DISABLED ;return -EINVAL ; }
@@ -739,6 +726,8 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (cl_dev))return -EINVAL ; + acerhdf_zone_params.initial_mode = + kernelmode ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ; thz_dev = thermal_zone_device_register("acerhdf", 2, 0, NULL, &acerhdf_dev_ops, &acerhdf_zone_params, 0,
drivers/thermal/da9062-thermal.c +4 -12
@@ -49,7 +49,6 @@ struct da9062_thermal {struct da9062 *hw;struct delayed_work work;struct thermal_zone_device *zone; -enum thermal_device_mode mode;struct mutex lock;/* protection for da9062_thermal temperature */ int temperature;int irq;
@@ -121,14 +120,6 @@ static irqreturn_t da9062_thermal_irq_handler(int irq, void *data)return IRQ_HANDLED ; } -static int da9062_thermal_get_mode (struct thermal_zone_device *z, -enum thermal_device_mode *mode) -{ -struct da9062_thermal *thermal = z->devdata; - *mode = thermal->mode; -return 0 ; -} -static int da9062_thermal_get_trip_type (struct thermal_zone_device *z,int trip,enum thermal_trip_type *type)
@@ -181,7 +172,6 @@ static int da9062_thermal_get_temp(struct thermal_zone_device *z,static struct thermal_zone_device_ops da9062_thermal_ops = { .get_temp = da9062_thermal_get_temp, - .get_mode = da9062_thermal_get_mode, .get_trip_type = da9062_thermal_get_trip_type, .get_trip_temp = da9062_thermal_get_trip_temp, };
@@ -199,6 +189,9 @@ MODULE_DEVICE_TABLE(of, da9062_compatible_reg_id_table);static int da9062_thermal_probe (struct platform_device *pdev) { +struct thermal_zone_params tzp = { + .initial_mode =THERMAL_DEVICE_ENABLED , + };struct da9062 *chip =dev_get_drvdata (pdev->dev.parent);struct da9062_thermal *thermal;unsigned int pp_tmp =DA9062_DEFAULT_POLLING_MS_PERIOD ;
@@ -233,7 +226,6 @@ static int da9062_thermal_probe(struct platform_device *pdev) thermal->config = match->data; thermal->hw = chip; - thermal->mode =THERMAL_DEVICE_ENABLED ; thermal->dev = &pdev->dev;INIT_DELAYED_WORK (&thermal->work, da9062_thermal_poll_on);
@@ -241,7 +233,7 @@ static int da9062_thermal_probe(struct platform_device *pdev) thermal->zone =thermal_zone_device_register (thermal->config->name,1 ,0 , thermal, - &da9062_thermal_ops,NULL , pp_tmp, + &da9062_thermal_ops, &tzp, pp_tmp,0 );if (IS_ERR (thermal->zone)) {dev_err (&pdev->dev,"Cannot register thermal zone device\n" );
drivers/thermal/imx_thermal.c +8 -21
@@ -197,7 +197,6 @@ struct imx_thermal_data {struct cpufreq_policy *policy;struct thermal_zone_device *tz;struct thermal_cooling_device *cdev; -enum thermal_device_mode mode;struct regmap *tempmon;u32 c1, c2;/* See formula in imx_init_calib() */ int temp_passive;
@@ -256,7 +255,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)bool wait;u32 val; -if (data->mode ==THERMAL_DEVICE_ENABLED ) { +if (tz->mode ==THERMAL_DEVICE_ENABLED ) {/* Check if a measurement is currently in progress */ regmap_read (map, soc_data->temp_data, &val); wait = !(val & soc_data->temp_valid_mask);
@@ -283,7 +282,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)regmap_read (map, soc_data->temp_data, &val); -if (data->mode !=THERMAL_DEVICE_ENABLED ) { +if (tz->mode !=THERMAL_DEVICE_ENABLED ) {regmap_write (map, soc_data->sensor_ctrl +REG_CLR , soc_data->measure_temp_mask); regmap_write(map, soc_data->sensor_ctrl + REG_SET,
@@ -331,16 +330,6 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)return 0 ; } -static int imx_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -struct imx_thermal_data *data = tz->devdata; - - *mode = data->mode; - -return 0 ; -} -static int imx_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {
@@ -376,9 +365,6 @@ static int imx_set_mode(struct thermal_zone_device *tz, } } - data->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }
@@ -467,7 +453,6 @@ static struct thermal_zone_device_ops imx_tz_ops = { .bind = imx_bind, .unbind = imx_unbind, .get_temp = imx_get_temp, - .get_mode = imx_get_mode, .set_mode = imx_set_mode, .get_trip_type = imx_get_trip_type, .get_trip_temp = imx_get_trip_temp,
@@ -691,6 +676,9 @@ static inline void imx_thermal_unregister_legacy_cooling(struct imx_thermal_datastatic int imx_thermal_probe (struct platform_device *pdev) { +struct thermal_zone_params tzp = { + .initial_mode =THERMAL_DEVICE_ENABLED , + };struct imx_thermal_data *data;struct regmap *map;int measure_freq;
@@ -799,7 +787,7 @@ static int imx_thermal_probe(struct platform_device *pdev) data->tz =thermal_zone_device_register ("imx_thermal_zone" ,IMX_TRIP_NUM ,BIT (IMX_TRIP_PASSIVE ), data, - &imx_tz_ops,NULL , + &imx_tz_ops, &tzp,IMX_PASSIVE_DELAY ,IMX_POLLING_DELAY );if (IS_ERR (data->tz)) {
@@ -831,7 +819,6 @@ static int imx_thermal_probe(struct platform_device *pdev) data->socdata->measure_temp_mask); data->irq_enabled = true; - data->mode =THERMAL_DEVICE_ENABLED ; ret = devm_request_threaded_irq(&pdev->dev, data->irq, imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,
@@ -885,7 +872,7 @@ static int __maybe_unused imx_thermal_suspend(struct device *dev) data->socdata->measure_temp_mask);regmap_write (map, data->socdata->sensor_ctrl +REG_SET , data->socdata->power_down_mask); - data->mode =THERMAL_DEVICE_DISABLED ; + data->tz->mode =THERMAL_DEVICE_DISABLED ;clk_disable_unprepare (data->thermal_clk);return 0 ;
@@ -905,7 +892,7 @@ static int __maybe_unused imx_thermal_resume(struct device *dev) data->socdata->power_down_mask);regmap_write (map, data->socdata->sensor_ctrl +REG_SET , data->socdata->measure_temp_mask); - data->mode =THERMAL_DEVICE_ENABLED ; + data->tz->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +5 -25
@@ -44,7 +44,6 @@ static char *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = {struct int3400_thermal_priv {struct acpi_device *adev;struct thermal_zone_device *thermal; -int mode;int art_count;struct art *arts;int trt_count;
@@ -230,48 +229,29 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal,return 0 ; } -static int int3400_thermal_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -struct int3400_thermal_priv *priv = thermal->devdata; - -if (!priv) -return -EINVAL ; - - *mode = priv->mode; - -return 0 ; -} -static int int3400_thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {struct int3400_thermal_priv *priv = thermal->devdata; -bool enable;int result =0 ;if (!priv)return -EINVAL ; -if (mode ==THERMAL_DEVICE_ENABLED ) - enable = true; -else if (mode ==THERMAL_DEVICE_DISABLED ) - enable = false; -else +if (mode !=THERMAL_DEVICE_ENABLED && + mode !=THERMAL_DEVICE_DISABLED )return -EINVAL ; -if (enable != priv->mode) { - priv->mode = enable; +if (mode != thermal->mode) { result =int3400_thermal_run_osc (priv->adev->handle, - priv->current_uuid_index, - enable); + priv->current_uuid_index, + mode ==THERMAL_DEVICE_ENABLED ); }return result; }static struct thermal_zone_device_ops int3400_thermal_ops = { .get_temp = int3400_thermal_get_temp, - .get_mode = int3400_thermal_get_mode, .set_mode = int3400_thermal_set_mode, };
drivers/thermal/intel/intel_quark_dts_thermal.c +6 -16
@@ -103,7 +103,6 @@ struct soc_sensor_entry {bool locked;u32 store_ptps;u32 store_dts_enable; -enum thermal_device_mode mode;struct thermal_zone_device *tzone; };
@@ -128,7 +127,7 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)return ret;if (out &QRK_DTS_ENABLE_BIT ) { - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }
@@ -139,9 +138,9 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)if (ret)return ret; - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ; }else { - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ;pr_info ("DTS is locked. Cannot enable DTS\n" ); ret = -EPERM ; }
@@ -161,7 +160,7 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)return ret;if (!(out &QRK_DTS_ENABLE_BIT )) { - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ;return 0 ; }
@@ -173,9 +172,9 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)if (ret)return ret; - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ; }else { - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ;pr_info ("DTS is locked. Cannot disable DTS\n" ); ret = -EPERM ; }
@@ -309,14 +308,6 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,return 0 ; } -static int sys_get_mode (struct thermal_zone_device *tzd, -enum thermal_device_mode *mode) -{ -struct soc_sensor_entry *aux_entry = tzd->devdata; - *mode = aux_entry->mode; -return 0 ; -} -static int sys_set_mode (struct thermal_zone_device *tzd,enum thermal_device_mode mode) {
@@ -338,7 +329,6 @@ static struct thermal_zone_device_ops tzone_ops = { .get_trip_type = sys_get_trip_type, .set_trip_temp = sys_set_trip_temp, .get_crit_temp = sys_get_crit_temp, - .get_mode = sys_get_mode, .set_mode = sys_set_mode, };
drivers/thermal/of-thermal.c +8 -22
@@ -51,7 +51,6 @@ struct __thermal_bind_params {/** * struct __thermal_zone - internal representation of a thermal zone -* @mode: current thermal zone device mode (enabled/disabled) * @passive_delay: polling interval while passive cooling is activated * @polling_delay: zone polling interval * @slope: slope of the temperature adjustment curve
@@ -65,7 +64,6 @@ struct __thermal_bind_params {*/ struct __thermal_zone { -enum thermal_device_mode mode;int passive_delay;int polling_delay;int slope;
@@ -269,23 +267,11 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,return 0 ; } -static int of_thermal_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -struct __thermal_zone *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 *data = tz->devdata; -mutex_lock (&tz->lock); -if (mode ==THERMAL_DEVICE_ENABLED ) { tz->polling_delay = data->polling_delay; tz->passive_delay = data->passive_delay;
@@ -294,11 +280,6 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz, tz->passive_delay =0 ; } -mutex_unlock (&tz->lock); - - data->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }
@@ -393,7 +374,6 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz, }static struct thermal_zone_device_ops of_thermal_ops = { - .get_mode = of_thermal_get_mode, .set_mode = of_thermal_set_mode, .get_trip_type = of_thermal_get_trip_type,
@@ -553,8 +533,14 @@ thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data,if (id == sensor_id) { tzd =thermal_zone_of_add_sensor (child, sensor_np, data, ops); -if (!IS_ERR (tzd)) +if (!IS_ERR (tzd)) { +mutex_lock (&tzd->lock); tzd->ops->set_mode (tzd,THERMAL_DEVICE_ENABLED ); + tzd->mode =THERMAL_DEVICE_ENABLED ; +mutex_unlock (&tzd->lock); +thermal_zone_device_update (tzd, +THERMAL_EVENT_UNSPECIFIED ); + }of_node_put (child); goto exit;
@@ -979,7 +965,6 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) finish:of_node_put (child); - tz->mode =THERMAL_DEVICE_DISABLED ;return tz;
@@ -1120,6 +1105,7 @@ int __init of_parse_thermal_zones(void)/* these two are left for temperature drivers to use */ tzp->slope = tz->slope; tzp->offset = tz->offset; + tzp->initial_mode =THERMAL_DEVICE_DISABLED ; zone = thermal_zone_device_register(child->name, tz->ntrips, mask, tz,
drivers/thermal/thermal_core.c +41 -3
62 lines not on this page · raw message
drivers/thermal/thermal_core.h +16 -0
@@ -141,6 +141,22 @@ thermal_cooling_device_stats_update(struct thermal_cooling_device *cdev, unsigned long new_state) {}#endif /* CONFIG_THERMAL_STATISTICS */ +enum thermal_device_mode +thermal_zone_device_get_mode (struct thermal_zone_device *tz); + +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode); + +static inline int thermal_zone_device_enable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_ENABLED ); +} + +static inline int thermal_zone_device_disable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_DISABLED ); +} +/* device tree support */ #ifdef CONFIG_THERMAL_OF int of_parse_thermal_zones (void );
drivers/thermal/thermal_sysfs.c +3 -26
@@ -50,14 +50,8 @@ mode_show(struct device *dev, struct device_attribute *attr, char *buf) {struct thermal_zone_device *tz =to_thermal_zone (dev);enum thermal_device_mode mode; -int result; - -if (!tz->ops->get_mode) -return -EPERM ; - result = tz->ops->get_mode (tz, &mode); -if (result) -return result; + mode =thermal_zone_device_get_mode (tz);return sprintf (buf,"%s\n" , mode ==THERMAL_DEVICE_ENABLED ?"enabled" :"disabled" );
@@ -74,9 +68,9 @@ mode_store(struct device *dev, struct device_attribute *attr,return -EPERM ;if (!strncmp (buf,"enabled" ,sizeof ("enabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_ENABLED ); + result =thermal_zone_device_enable (tz);else if (!strncmp (buf,"disabled" ,sizeof ("disabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_DISABLED ); + result =thermal_zone_device_disable (tz);else result = -EINVAL ;
@@ -428,30 +422,13 @@ static struct attribute_group thermal_zone_attribute_group = { .attrs = thermal_zone_dev_attrs, }; -/* We expose mode only if .get_mode is present */ static struct attribute *thermal_zone_mode_attrs[] = { &dev_attr_mode.attr,NULL , }; -static umode_t thermal_zone_mode_is_visible (struct kobject *kobj, -struct attribute *attr, -int attrno) -{ - struct device *dev = container_of(kobj, struct device, kobj); -struct thermal_zone_device *tz; - - tz = container_of(dev, struct thermal_zone_device, device); - -if (tz->ops->get_mode) -return attr->mode; - -return 0 ; -} -static struct attribute_group thermal_zone_mode_attribute_group = { .attrs = thermal_zone_mode_attrs, - .is_visible = thermal_zone_mode_is_visible, };/* We expose passive only if passive trips are present */
include/linux/thermal.h +5 -2
@@ -76,8 +76,6 @@ struct thermal_zone_device_ops { struct thermal_cooling_device *);int (*get_temp) (struct thermal_zone_device *,int *);int (*set_trips) (struct thermal_zone_device *,int ,int ); -int (*get_mode) (struct thermal_zone_device *, -enum thermal_device_mode *);int (*set_mode) (struct thermal_zone_device *,enum thermal_device_mode ); int (*get_trip_type) (struct thermal_zone_device *, int,
@@ -128,6 +126,7 @@ struct thermal_cooling_device {* @trip_temp_attrs: attributes for trip points for sysfs: trip temperature * @trip_type_attrs: attributes for trip points for sysfs: trip type * @trip_hyst_attrs: attributes for trip points for sysfs: trip hysteresis +* @mode: current mode of this thermal zone * @devdata: private pointer for device private data * @trips: number of trip points the thermal zone supports * @trips_disabled; bitmap for disabled trips
@@ -170,6 +169,7 @@ struct thermal_zone_device {struct thermal_attr *trip_temp_attrs;struct thermal_attr *trip_type_attrs;struct thermal_attr *trip_hyst_attrs; +enum thermal_device_mode mode;void *devdata;int trips;unsigned long trips_disabled;/* bitmap for disabled trips */
@@ -264,6 +264,9 @@ struct thermal_zone_params {int num_tbps;/* Number of tbp entries */ struct thermal_bind_params *tbp; +/* Initial mode of this thermal zone device */ +enum thermal_device_mode initial_mode; +/* * Sustainable power (heat) that this thermal zone can dissipate in * mW
Signature · 1 line
2.17.1
Re: [RFC v3 1/2] thermal: core: Let thermal zone device's mode be stored in its struct
Quoted 21 lines · Andrzej Pietrasiewicz
Thermal zone devices' mode is stored in individual drivers. This patch changes it so that mode is stored in struct
thermal_zone_deviceinstead.As a result all driver-specific variables storing the mode are not needed and are removed. Consequently, the
get_mode()implementations have nothing to operate on and need to be removed, too.Some thermal framework specific functions are introduced:
thermal_zone_device_get_mode()thermal_zone_device_set_mode()thermal_zone_device_enable()thermal_zone_device_disable()
thermal_zone_device_get_mode()and its "set" counterpart take tzd's lock and the "set" calls driver'sset_mode()if provided, so the latter must not take this lock again. At the end of the "set"thermal_zone_device_update()is called so drivers don't need to repeat this invocation in their specificset_mode()implementations.
Quoted 6 lines
The scope of the above 4 functions is purposedly limited to the thermal framework and drivers are not supposed to call them. This encapsulation does not fully work at the moment for some drivers, though:
-
platform/x86/acerhdf.c
for PDx86 bits.
Quoted 1,002 lines
-
drivers/thermal/imx_thermal.c
-drivers/thermal/intel/intel_quark_dts_thermal.c
-drivers/thermal/of-thermal.cand they manipulate struct thermal_zone_device's members directly.
struct
thermal_zone_paramsgains a new member calledinitial_mode, which is used to set tzd's mode at registration time.The sysfs "mode" attribute is always exposed from now on, because all thermal zone devices now have their
get_mode()implemented at the generic level and it is always available. Exposing "mode" doesn't hurt the drivers which don't provide their ownset_mode(), because writing to "mode" will result in-EPERM, as expected.Signed-off-by Andrzej Pietrasiewicz <[email protected]>--- drivers/acpi/thermal.c | 46 +++++---------- .../ethernet/mellanox/mlxsw/core_thermal.c | 57 ++++--------------- drivers/platform/x86/acerhdf.c | 17 +----- drivers/thermal/da9062-thermal.c | 16 ++---- drivers/thermal/imx_thermal.c | 29 +++------- .../intel/int340x_thermal/int3400_thermal.c | 30 ++-------- .../thermal/intel/intel_quark_dts_thermal.c | 22 ++----- drivers/thermal/of-thermal.c | 30 +++------- drivers/thermal/thermal_core.c | 44 +++++++++++++- drivers/thermal/thermal_core.h | 16 ++++++ drivers/thermal/thermal_sysfs.c | 29 +--------- include/linux/thermal.h | 7 ++- 12 files changed, 125 insertions(+), 218 deletions(-)drivers/acpi/thermal.c +14
-32@@ -172,7 +172,6 @@ struct acpi_thermal {struct acpi_thermal_trips trips;struct acpi_handle_list devices;struct thermal_zone_device *thermal_zone; -int tz_enabled;int kelvin_offset;/* in millidegrees */ struct work_struct thermal_check_work; };@@ -500,7 +499,7 @@ static void acpi_thermal_check(void *data) {struct acpi_thermal *tz = data; -if (!tz->tz_enabled) +if (tz->thermal_zone->mode !=THERMAL_DEVICE_ENABLED )return ; thermal_zone_device_update(tz->thermal_zone,@@ -526,46 +525,29 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)return 0 ; } -static int thermal_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -struct acpi_thermal *tz = thermal->devdata; - -if (!tz) -return -EINVAL ; - - *mode = tz->tz_enabled ?THERMAL_DEVICE_ENABLED : -THERMAL_DEVICE_DISABLED ; - -return 0 ; -} -static int thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {struct acpi_thermal *tz = thermal->devdata; -int enable;if (!tz)return -EINVAL ; +if (mode !=THERMAL_DEVICE_DISABLED && + mode !=THERMAL_DEVICE_ENABLED ) +return -EINVAL ; +/* * enable/disable thermal management from ACPI thermal driver */ -if (mode ==THERMAL_DEVICE_ENABLED ) - enable =1 ; -else if (mode ==THERMAL_DEVICE_DISABLED ) { - enable =0 ; +if (mode ==THERMAL_DEVICE_DISABLED )pr_warn ("thermal zone will be disabled\n" ); - }else -return -EINVAL ; -if (enable != tz->tz_enabled) { - tz->tz_enabled = enable; +if (mode != thermal->mode) {ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"%s kernel ACPI thermal control\n" , - tz->tz_enabled ?"Enable" :"Disable" )); -acpi_thermal_check (tz); + mode ==THERMAL_DEVICE_ENABLED ? +"Enable" :"Disable" )); }return 0 ; }@@ -856,7 +838,6 @@ static struct thermal_zone_device_ops acpi_thermal_zone_ops = { .bind = acpi_thermal_bind_cooling_device, .unbind = acpi_thermal_unbind_cooling_device, .get_temp = thermal_get_temp, - .get_mode = thermal_get_mode, .set_mode = thermal_set_mode, .get_trip_type = thermal_get_trip_type, .get_trip_temp = thermal_get_trip_temp,@@ -870,6 +851,9 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)int trips =0 ;int result;acpi_status status; +struct thermal_zone_params prms = { + .initial_mode =THERMAL_DEVICE_ENABLED , + };int i;if (tz->trips.critical.flags.valid)@@ -887,13 +871,13 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)if (tz->trips.passive.flags.valid) tz->thermal_zone =thermal_zone_device_register ("acpitz" , trips,0 , tz, - &acpi_thermal_zone_ops,NULL , + &acpi_thermal_zone_ops, &prms, tz->trips.passive.tsp*100 , tz->polling_frequency*100 );else tz->thermal_zone =thermal_zone_device_register ("acpitz" , trips,0 , tz, - &acpi_thermal_zone_ops,NULL , + &acpi_thermal_zone_ops, &prms,0 , tz->polling_frequency*100 );if (IS_ERR (tz->thermal_zone))return -ENODEV ;@@ -913,8 +897,6 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)if (ACPI_FAILURE (status))return -ENODEV ; - tz->tz_enabled =1 ; -dev_info (&tz->device->dev,"registered as thermal_zone%d\n" , tz->thermal_zone->id);return 0 ;drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +12
-45@@ -98,7 +98,6 @@ struct mlxsw_thermal_module {struct mlxsw_thermal *parent;struct thermal_zone_device *tzdev;struct mlxsw_thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS ]; -enum thermal_device_mode mode;int module;/* Module or gearbox number */ };@@ -110,7 +109,6 @@ struct mlxsw_thermal {struct thermal_cooling_device *cdevs[MLXSW_MFCR_PWMS_MAX ];u8 cooling_levels[MLXSW_THERMAL_MAX_STATE +1 ];struct mlxsw_thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS ]; -enum thermal_device_mode mode;struct mlxsw_thermal_module *tz_module_arr;u8 tz_module_num;struct mlxsw_thermal_module *tz_gearbox_arr;@@ -277,33 +275,16 @@ static int mlxsw_thermal_unbind(struct thermal_zone_device *tzdev,return 0 ; } -static int mlxsw_thermal_get_mode (struct thermal_zone_device *tzdev, -enum thermal_device_mode *mode) -{ -struct mlxsw_thermal *thermal = tzdev->devdata; - - *mode = thermal->mode; - -return 0 ; -} -static int mlxsw_thermal_set_mode (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {struct mlxsw_thermal *thermal = tzdev->devdata; -mutex_lock (&tzdev->lock); -if (mode ==THERMAL_DEVICE_ENABLED ) tzdev->polling_delay = thermal->polling_delay;else tzdev->polling_delay =0 ; -mutex_unlock (&tzdev->lock); - - thermal->mode = mode; -thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }@@ -407,7 +388,6 @@ static int mlxsw_thermal_trend_get(struct thermal_zone_device *tzdev,static struct thermal_zone_device_ops mlxsw_thermal_ops = { .bind = mlxsw_thermal_bind, .unbind = mlxsw_thermal_unbind, - .get_mode = mlxsw_thermal_get_mode, .set_mode = mlxsw_thermal_set_mode, .get_temp = mlxsw_thermal_get_temp, .get_trip_type = mlxsw_thermal_get_trip_type,@@ -466,34 +446,17 @@ static int mlxsw_thermal_module_unbind(struct thermal_zone_device *tzdev,return err; } -static int mlxsw_thermal_module_mode_get (struct thermal_zone_device *tzdev, -enum thermal_device_mode *mode) -{ -struct mlxsw_thermal_module *tz = tzdev->devdata; - - *mode = tz->mode; - -return 0 ; -} -static int mlxsw_thermal_module_mode_set (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {struct mlxsw_thermal_module *tz = tzdev->devdata;struct mlxsw_thermal *thermal = tz->parent; -mutex_lock (&tzdev->lock); -if (mode ==THERMAL_DEVICE_ENABLED ) tzdev->polling_delay = thermal->polling_delay;else tzdev->polling_delay =0 ; -mutex_unlock (&tzdev->lock); - - tz->mode = mode; -thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }@@ -596,7 +559,6 @@ mlxsw_thermal_module_trip_hyst_set(struct thermal_zone_device *tzdev, int trip,static struct thermal_zone_device_ops mlxsw_thermal_module_ops = { .bind = mlxsw_thermal_module_bind, .unbind = mlxsw_thermal_module_unbind, - .get_mode = mlxsw_thermal_module_mode_get, .set_mode = mlxsw_thermal_module_mode_set, .get_temp = mlxsw_thermal_module_temp_get, .get_trip_type = mlxsw_thermal_module_trip_type_get,@@ -635,7 +597,6 @@ static int mlxsw_thermal_gearbox_temp_get(struct thermal_zone_device *tzdev,static struct thermal_zone_device_ops mlxsw_thermal_gearbox_ops = { .bind = mlxsw_thermal_module_bind, .unbind = mlxsw_thermal_module_unbind, - .get_mode = mlxsw_thermal_module_mode_get, .set_mode = mlxsw_thermal_module_mode_set, .get_temp = mlxsw_thermal_gearbox_temp_get, .get_trip_type = mlxsw_thermal_module_trip_type_get,@@ -749,6 +710,9 @@ static const struct thermal_cooling_device_ops mlxsw_cooling_ops = {static int mlxsw_thermal_module_tz_init (struct mlxsw_thermal_module *module_tz) { +struct thermal_zone_params tzp = { + .initial_mode =THERMAL_DEVICE_ENABLED , + };char tz_name[MLXSW_THERMAL_ZONE_MAX_NAME ];int err;@@ -759,13 +723,12 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz)MLXSW_THERMAL_TRIP_MASK , module_tz, &mlxsw_thermal_module_ops, - NULL, 0, 0); + &tzp, 0, 0);if (IS_ERR (module_tz->tzdev)) { err =PTR_ERR (module_tz->tzdev);return err; } - module_tz->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }@@ -868,6 +831,9 @@ mlxsw_thermal_modules_fini(struct mlxsw_thermal *thermal)static int mlxsw_thermal_gearbox_tz_init (struct mlxsw_thermal_module *gearbox_tz) { +struct thermal_zone_params tzp = { + .initial_mode =THERMAL_DEVICE_ENABLED , + };char tz_name[MLXSW_THERMAL_ZONE_MAX_NAME ]; snprintf(tz_name, sizeof(tz_name), "mlxsw-gearbox%d",@@ -877,11 +843,10 @@ mlxsw_thermal_gearbox_tz_init(struct mlxsw_thermal_module *gearbox_tz)MLXSW_THERMAL_TRIP_MASK , gearbox_tz, &mlxsw_thermal_gearbox_ops, - NULL, 0, 0); + &tzp, 0, 0);if (IS_ERR (gearbox_tz->tzdev))return PTR_ERR (gearbox_tz->tzdev); - gearbox_tz->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }@@ -960,6 +925,9 @@ int mlxsw_thermal_init(struct mlxsw_core *core,const struct mlxsw_bus_info *bus_info, struct mlxsw_thermal **p_thermal) { + struct thermal_zone_params tzp = { + .initial_mode =THERMAL_DEVICE_ENABLED , + };char mfcr_pl[MLXSW_REG_MFCR_LEN ] = {0 };enum mlxsw_reg_mfcr_pwm_frequency freq;struct device *dev = bus_info->dev;@@ -1034,7 +1002,7 @@ int mlxsw_thermal_init(struct mlxsw_core *core,MLXSW_THERMAL_TRIP_MASK , thermal, &mlxsw_thermal_ops, -NULL ,0 , + &tzp,0 , thermal->polling_delay);if (IS_ERR (thermal->tzdev)) { err =PTR_ERR (thermal->tzdev);@@ -1050,7 +1018,6 @@ int mlxsw_thermal_init(struct mlxsw_core *core,if (err) goto err_unreg_modules_tzdev; - thermal->mode =THERMAL_DEVICE_ENABLED ; *p_thermal = thermal;return 0 ;drivers/platform/x86/acerhdf.c +3
-14@@ -406,22 +406,9 @@ static inline void acerhdf_enable_kernelmode(void) kernelmode =1 ; thz_dev->polling_delay = interval*1000 ; -thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );pr_notice ("kernel mode fan control ON\n" ); } -static int acerhdf_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -if (verbose) -pr_notice ("kernel mode fan control %d\n" , kernelmode); - - *mode = (kernelmode) ?THERMAL_DEVICE_ENABLED - :THERMAL_DEVICE_DISABLED ; - -return 0 ; -} -/* * set operation mode; * enabled: the thermal layer of the kernel takes care about @@ -488,7 +475,6 @@ static struct thermal_zone_device_ops acerhdf_dev_ops = { .bind = acerhdf_bind, .unbind = acerhdf_unbind, .get_temp = acerhdf_get_ec_temp, - .get_mode = acerhdf_get_mode, .set_mode = acerhdf_set_mode, .get_trip_type = acerhdf_get_trip_type, .get_trip_hyst = acerhdf_get_trip_hyst,@@ -554,6 +540,7 @@ static int acerhdf_set_cur_state(struct thermal_cooling_device *cdev, err_out:acerhdf_revert_to_bios_mode (); + thz_dev->mode =THERMAL_DEVICE_DISABLED ;return -EINVAL ; }@@ -739,6 +726,8 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (cl_dev))return -EINVAL ; + acerhdf_zone_params.initial_mode = + kernelmode ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ; thz_dev = thermal_zone_device_register("acerhdf", 2, 0, NULL, &acerhdf_dev_ops, &acerhdf_zone_params, 0,drivers/thermal/da9062-thermal.c +4
-12@@ -49,7 +49,6 @@ struct da9062_thermal {struct da9062 *hw;struct delayed_work work;struct thermal_zone_device *zone; -enum thermal_device_mode mode;struct mutex lock;/* protection for da9062_thermal temperature */ int temperature;int irq;@@ -121,14 +120,6 @@ static irqreturn_t da9062_thermal_irq_handler(int irq, void *data)return IRQ_HANDLED ; } -static int da9062_thermal_get_mode (struct thermal_zone_device *z, -enum thermal_device_mode *mode) -{ -struct da9062_thermal *thermal = z->devdata; - *mode = thermal->mode; -return 0 ; -} -static int da9062_thermal_get_trip_type (struct thermal_zone_device *z,int trip,enum thermal_trip_type *type)@@ -181,7 +172,6 @@ static int da9062_thermal_get_temp(struct thermal_zone_device *z,static struct thermal_zone_device_ops da9062_thermal_ops = { .get_temp = da9062_thermal_get_temp, - .get_mode = da9062_thermal_get_mode, .get_trip_type = da9062_thermal_get_trip_type, .get_trip_temp = da9062_thermal_get_trip_temp, };@@ -199,6 +189,9 @@ MODULE_DEVICE_TABLE(of, da9062_compatible_reg_id_table);static int da9062_thermal_probe (struct platform_device *pdev) { +struct thermal_zone_params tzp = { + .initial_mode =THERMAL_DEVICE_ENABLED , + };struct da9062 *chip =dev_get_drvdata (pdev->dev.parent);struct da9062_thermal *thermal;unsigned int pp_tmp =DA9062_DEFAULT_POLLING_MS_PERIOD ;@@ -233,7 +226,6 @@ static int da9062_thermal_probe(struct platform_device *pdev) thermal->config = match->data; thermal->hw = chip; - thermal->mode =THERMAL_DEVICE_ENABLED ; thermal->dev = &pdev->dev;INIT_DELAYED_WORK (&thermal->work, da9062_thermal_poll_on);@@ -241,7 +233,7 @@ static int da9062_thermal_probe(struct platform_device *pdev) thermal->zone =thermal_zone_device_register (thermal->config->name,1 ,0 , thermal, - &da9062_thermal_ops,NULL , pp_tmp, + &da9062_thermal_ops, &tzp, pp_tmp,0 );if (IS_ERR (thermal->zone)) {dev_err (&pdev->dev,"Cannot register thermal zone device\n" );drivers/thermal/imx_thermal.c +8
-21@@ -197,7 +197,6 @@ struct imx_thermal_data {struct cpufreq_policy *policy;struct thermal_zone_device *tz;struct thermal_cooling_device *cdev; -enum thermal_device_mode mode;struct regmap *tempmon;u32 c1, c2;/* See formula in imx_init_calib() */ int temp_passive;@@ -256,7 +255,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)bool wait;u32 val; -if (data->mode ==THERMAL_DEVICE_ENABLED ) { +if (tz->mode ==THERMAL_DEVICE_ENABLED ) {/* Check if a measurement is currently in progress */ regmap_read (map, soc_data->temp_data, &val); wait = !(val & soc_data->temp_valid_mask);@@ -283,7 +282,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)regmap_read (map, soc_data->temp_data, &val); -if (data->mode !=THERMAL_DEVICE_ENABLED ) { +if (tz->mode !=THERMAL_DEVICE_ENABLED ) {regmap_write (map, soc_data->sensor_ctrl +REG_CLR , soc_data->measure_temp_mask); regmap_write(map, soc_data->sensor_ctrl + REG_SET,@@ -331,16 +330,6 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)return 0 ; } -static int imx_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -struct imx_thermal_data *data = tz->devdata; - - *mode = data->mode; - -return 0 ; -} -static int imx_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {@@ -376,9 +365,6 @@ static int imx_set_mode(struct thermal_zone_device *tz, } } - data->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }@@ -467,7 +453,6 @@ static struct thermal_zone_device_ops imx_tz_ops = { .bind = imx_bind, .unbind = imx_unbind, .get_temp = imx_get_temp, - .get_mode = imx_get_mode, .set_mode = imx_set_mode, .get_trip_type = imx_get_trip_type, .get_trip_temp = imx_get_trip_temp,@@ -691,6 +676,9 @@ static inline void imx_thermal_unregister_legacy_cooling(struct imx_thermal_datastatic int imx_thermal_probe (struct platform_device *pdev) { +struct thermal_zone_params tzp = { + .initial_mode =THERMAL_DEVICE_ENABLED , + };struct imx_thermal_data *data;struct regmap *map;int measure_freq;@@ -799,7 +787,7 @@ static int imx_thermal_probe(struct platform_device *pdev) data->tz =thermal_zone_device_register ("imx_thermal_zone" ,IMX_TRIP_NUM ,BIT (IMX_TRIP_PASSIVE ), data, - &imx_tz_ops,NULL , + &imx_tz_ops, &tzp,IMX_PASSIVE_DELAY ,IMX_POLLING_DELAY );if (IS_ERR (data->tz)) {@@ -831,7 +819,6 @@ static int imx_thermal_probe(struct platform_device *pdev) data->socdata->measure_temp_mask); data->irq_enabled = true; - data->mode =THERMAL_DEVICE_ENABLED ; ret = devm_request_threaded_irq(&pdev->dev, data->irq, imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,@@ -885,7 +872,7 @@ static int __maybe_unused imx_thermal_suspend(struct device *dev) data->socdata->measure_temp_mask);regmap_write (map, data->socdata->sensor_ctrl +REG_SET , data->socdata->power_down_mask); - data->mode =THERMAL_DEVICE_DISABLED ; + data->tz->mode =THERMAL_DEVICE_DISABLED ;clk_disable_unprepare (data->thermal_clk);return 0 ;@@ -905,7 +892,7 @@ static int __maybe_unused imx_thermal_resume(struct device *dev) data->socdata->power_down_mask);regmap_write (map, data->socdata->sensor_ctrl +REG_SET , data->socdata->measure_temp_mask); - data->mode =THERMAL_DEVICE_ENABLED ; + data->tz->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }drivers/thermal/intel/int340x_thermal/int3400_thermal.c +5
-25@@ -44,7 +44,6 @@ static char *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = {struct int3400_thermal_priv {struct acpi_device *adev;struct thermal_zone_device *thermal; -int mode;int art_count;struct art *arts;int trt_count;@@ -230,48 +229,29 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal,return 0 ; } -static int int3400_thermal_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -struct int3400_thermal_priv *priv = thermal->devdata; - -if (!priv) -return -EINVAL ; - - *mode = priv->mode; - -return 0 ; -} -static int int3400_thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {struct int3400_thermal_priv *priv = thermal->devdata; -bool enable;int result =0 ;if (!priv)return -EINVAL ; -if (mode ==THERMAL_DEVICE_ENABLED ) - enable = true; -else if (mode ==THERMAL_DEVICE_DISABLED ) - enable = false; -else +if (mode !=THERMAL_DEVICE_ENABLED && + mode !=THERMAL_DEVICE_DISABLED )return -EINVAL ; -if (enable != priv->mode) { - priv->mode = enable; +if (mode != thermal->mode) { result =int3400_thermal_run_osc (priv->adev->handle, - priv->current_uuid_index, - enable); + priv->current_uuid_index, + mode ==THERMAL_DEVICE_ENABLED ); }return result; }static struct thermal_zone_device_ops int3400_thermal_ops = { .get_temp = int3400_thermal_get_temp, - .get_mode = int3400_thermal_get_mode, .set_mode = int3400_thermal_set_mode, };drivers/thermal/intel/intel_quark_dts_thermal.c +6
-16@@ -103,7 +103,6 @@ struct soc_sensor_entry {bool locked;u32 store_ptps;u32 store_dts_enable; -enum thermal_device_mode mode;struct thermal_zone_device *tzone; };@@ -128,7 +127,7 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)return ret;if (out &QRK_DTS_ENABLE_BIT ) { - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }@@ -139,9 +138,9 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)if (ret)return ret; - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ; }else { - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ;pr_info ("DTS is locked. Cannot enable DTS\n" ); ret = -EPERM ; }@@ -161,7 +160,7 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)return ret;if (!(out &QRK_DTS_ENABLE_BIT )) { - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ;return 0 ; }@@ -173,9 +172,9 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)if (ret)return ret; - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ; }else { - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ;pr_info ("DTS is locked. Cannot disable DTS\n" ); ret = -EPERM ; }@@ -309,14 +308,6 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,return 0 ; } -static int sys_get_mode (struct thermal_zone_device *tzd, -enum thermal_device_mode *mode) -{ -struct soc_sensor_entry *aux_entry = tzd->devdata; - *mode = aux_entry->mode; -return 0 ; -} -static int sys_set_mode (struct thermal_zone_device *tzd,enum thermal_device_mode mode) {@@ -338,7 +329,6 @@ static struct thermal_zone_device_ops tzone_ops = { .get_trip_type = sys_get_trip_type, .set_trip_temp = sys_set_trip_temp, .get_crit_temp = sys_get_crit_temp, - .get_mode = sys_get_mode, .set_mode = sys_set_mode, };drivers/thermal/of-thermal.c +8
-22@@ -51,7 +51,6 @@ struct __thermal_bind_params {/** * struct __thermal_zone - internal representation of a thermal zone -* @mode: current thermal zone device mode (enabled/disabled) * @passive_delay: polling interval while passive cooling is activated * @polling_delay: zone polling interval * @slope: slope of the temperature adjustment curve @@ -65,7 +64,6 @@ struct __thermal_bind_params {*/ struct __thermal_zone { -enum thermal_device_mode mode;int passive_delay;int polling_delay;int slope;@@ -269,23 +267,11 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,return 0 ; } -static int of_thermal_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -struct __thermal_zone *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 *data = tz->devdata; -mutex_lock (&tz->lock); -if (mode ==THERMAL_DEVICE_ENABLED ) { tz->polling_delay = data->polling_delay; tz->passive_delay = data->passive_delay;@@ -294,11 +280,6 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz, tz->passive_delay =0 ; } -mutex_unlock (&tz->lock); - - data->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }@@ -393,7 +374,6 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz, }static struct thermal_zone_device_ops of_thermal_ops = { - .get_mode = of_thermal_get_mode, .set_mode = of_thermal_set_mode, .get_trip_type = of_thermal_get_trip_type,@@ -553,8 +533,14 @@ thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data,if (id == sensor_id) { tzd =thermal_zone_of_add_sensor (child, sensor_np, data, ops); -if (!IS_ERR (tzd)) +if (!IS_ERR (tzd)) { +mutex_lock (&tzd->lock); tzd->ops->set_mode (tzd,THERMAL_DEVICE_ENABLED ); + tzd->mode =THERMAL_DEVICE_ENABLED ; +mutex_unlock (&tzd->lock); +thermal_zone_device_update (tzd, +THERMAL_EVENT_UNSPECIFIED ); + }of_node_put (child); goto exit;@@ -979,7 +965,6 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) finish:of_node_put (child); - tz->mode =THERMAL_DEVICE_DISABLED ;return tz;@@ -1120,6 +1105,7 @@ int __init of_parse_thermal_zones(void)/* these two are left for temperature drivers to use */ tzp->slope = tz->slope; tzp->offset = tz->offset; + tzp->initial_mode =THERMAL_DEVICE_DISABLED ; zone = thermal_zone_device_register(child->name, tz->ntrips, mask, tz,drivers/thermal/thermal_core.c +41
-3@@ -463,6 +463,43 @@ static void thermal_zone_device_reset(struct thermal_zone_device *tz)thermal_zone_device_init (tz); } +enum thermal_device_mode +thermal_zone_device_get_mode (struct thermal_zone_device *tz) +{ +enum thermal_device_mode mode; + +mutex_lock (&tz->lock); + + mode = tz->mode; + +mutex_unlock (&tz->lock); + +return mode; +} + +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) +{ +int ret =0 ; + +if (mode !=THERMAL_DEVICE_DISABLED && + mode !=THERMAL_DEVICE_ENABLED ) +return -EINVAL ; + +mutex_lock (&tz->lock); + +if (tz->ops->set_mode) + ret = tz->ops->set_mode (tz, mode); + + tz->mode = mode; + +mutex_unlock (&tz->lock); + +thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); + +return ret; +} +void thermal_zone_device_update (struct thermal_zone_device *tz,enum thermal_notify_event event) {@@ -1344,6 +1381,9 @@ thermal_zone_device_register(const char *type, int trips, int mask,if (atomic_cmpxchg (&tz->need_update,1 ,0 ))thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); +if (tzp) +thermal_zone_device_set_mode (tz, tzp->initial_mode); +return tz; unregister:@@ -1473,9 +1513,7 @@ static int thermal_pm_notify(struct notifier_block *nb,case PM_POST_SUSPEND :atomic_set (&in_suspend,0 );list_for_each_entry (tz, &thermal_tz_list, node) { - tz_mode =THERMAL_DEVICE_ENABLED ; -if (tz->ops->get_mode) - tz->ops->get_mode (tz, &tz_mode); + tz_mode =thermal_zone_device_get_mode (tz);if (tz_mode ==THERMAL_DEVICE_DISABLED )continue ;drivers/thermal/thermal_core.h +16
-0@@ -141,6 +141,22 @@ thermal_cooling_device_stats_update(struct thermal_cooling_device *cdev, unsigned long new_state) {}#endif /* CONFIG_THERMAL_STATISTICS */ +enum thermal_device_mode +thermal_zone_device_get_mode (struct thermal_zone_device *tz); + +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode); + +static inline int thermal_zone_device_enable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_ENABLED ); +} + +static inline int thermal_zone_device_disable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_DISABLED ); +} +/* device tree support */ #ifdef CONFIG_THERMAL_OF int of_parse_thermal_zones (void );drivers/thermal/thermal_sysfs.c +3
-26@@ -50,14 +50,8 @@ mode_show(struct device *dev, struct device_attribute *attr, char *buf) {struct thermal_zone_device *tz =to_thermal_zone (dev);enum thermal_device_mode mode; -int result; - -if (!tz->ops->get_mode) -return -EPERM ; - result = tz->ops->get_mode (tz, &mode); -if (result) -return result; + mode =thermal_zone_device_get_mode (tz);return sprintf (buf,"%s\n" , mode ==THERMAL_DEVICE_ENABLED ?"enabled" :"disabled" );@@ -74,9 +68,9 @@ mode_store(struct device *dev, struct device_attribute *attr,return -EPERM ;if (!strncmp (buf,"enabled" ,sizeof ("enabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_ENABLED ); + result =thermal_zone_device_enable (tz);else if (!strncmp (buf,"disabled" ,sizeof ("disabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_DISABLED ); + result =thermal_zone_device_disable (tz);else result = -EINVAL ;@@ -428,30 +422,13 @@ static struct attribute_group thermal_zone_attribute_group = { .attrs = thermal_zone_dev_attrs, }; -/* We expose mode only if .get_mode is present */ static struct attribute *thermal_zone_mode_attrs[] = { &dev_attr_mode.attr,NULL , }; -static umode_t thermal_zone_mode_is_visible (struct kobject *kobj, -struct attribute *attr, -int attrno) -{ - struct device *dev = container_of(kobj, struct device, kobj); -struct thermal_zone_device *tz; - - tz = container_of(dev, struct thermal_zone_device, device); - -if (tz->ops->get_mode) -return attr->mode; - -return 0 ; -} -static struct attribute_group thermal_zone_mode_attribute_group = { .attrs = thermal_zone_mode_attrs, - .is_visible = thermal_zone_mode_is_visible, };/* We expose passive only if passive trips are present */ include/linux/thermal.h +5
-3@@ -76,8 +76,6 @@ struct thermal_zone_device_ops { struct thermal_cooling_device *);int (*get_temp) (struct thermal_zone_device *,int *);int (*set_trips) (struct thermal_zone_device *,int ,int ); -int (*get_mode) (struct thermal_zone_device *, -enum thermal_device_mode *);int (*set_mode) (struct thermal_zone_device *,enum thermal_device_mode ); int (*get_trip_type) (struct thermal_zone_device *, int,@@ -128,6 +126,7 @@ struct thermal_cooling_device {* @trip_temp_attrs: attributes for trip points for sysfs: trip temperature * @trip_type_attrs: attributes for trip points for sysfs: trip type * @trip_hyst_attrs: attributes for trip points for sysfs: trip hysteresis +* @mode: current mode of this thermal zone * @devdata: private pointer for device private data * @trips: number of trip points the thermal zone supports * @trips_disabled; bitmap for disabled trips @@ -170,6 +169,7 @@ struct thermal_zone_device {struct thermal_attr *trip_temp_attrs;struct thermal_attr *trip_type_attrs;struct thermal_attr *trip_hyst_attrs; +enum thermal_device_mode mode;void *devdata;int trips;unsigned long trips_disabled;/* bitmap for disabled trips */ @@ -264,6 +264,9 @@ struct thermal_zone_params {int num_tbps;/* Number of tbp entries */ struct thermal_bind_params *tbp; +/* Initial mode of this thermal zone device */ +enum thermal_device_mode initial_mode; +/* * Sustainable power (heat) that this thermal zone can dissipate in * mW -- 2.17.1
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [RFC v3 1/2] thermal: core: Let thermal zone device's mode be stored in its struct
In reply to Andrzej PietrasiewiczHi Andrzej,
Quoted 14 lines · Andrzej Pietrasiewicz
Thermal zone devices' mode is stored in individual drivers. This patch changes it so that mode is stored in struct
thermal_zone_deviceinstead.As a result all driver-specific variables storing the mode are not needed and are removed. Consequently, the
get_mode()implementations have nothing to operate on and need to be removed, too.Some thermal framework specific functions are introduced:
thermal_zone_device_get_mode()thermal_zone_device_set_mode()thermal_zone_device_enable()thermal_zone_device_disable()
Quoted 8 lines
thermal_zone_device_get_mode()and its "set" counterpart take tzd's lock and the "set" calls driver'sset_mode()if provided, so the latter must not take this lock again. At the end of the "set"thermal_zone_device_update()is called so drivers don't need to repeat this invocation in their specificset_mode()implementations.The scope of the above 4 functions is purposedly limited to the thermal framework and drivers are not supposed to call them. This encapsulation
This should be true only for thermal_zone_device_{get,set}_mode().
thermal_zone_device_{en,dis}able() should be available for device drivers:
* of/thermal device drivers need to enable thermal device itself (please refer to my patchset for details)
* device drivers need to call them on ->suspend and ->resume operations
Quoted 75 lines
does not fully work at the moment for some drivers, though:
-
platform/x86/acerhdf.c
-drivers/thermal/imx_thermal.c
-drivers/thermal/intel/intel_quark_dts_thermal.c
-drivers/thermal/of-thermal.cand they manipulate struct thermal_zone_device's members directly.
struct
thermal_zone_paramsgains a new member calledinitial_mode, which is used to set tzd's mode at registration time.The sysfs "mode" attribute is always exposed from now on, because all thermal zone devices now have their
get_mode()implemented at the generic level and it is always available. Exposing "mode" doesn't hurt the drivers which don't provide their ownset_mode(), because writing to "mode" will result in-EPERM, as expected.Signed-off-by Andrzej Pietrasiewicz <[email protected]>--- drivers/acpi/thermal.c | 46 +++++---------- .../ethernet/mellanox/mlxsw/core_thermal.c | 57 ++++--------------- drivers/platform/x86/acerhdf.c | 17 +----- drivers/thermal/da9062-thermal.c | 16 ++---- drivers/thermal/imx_thermal.c | 29 +++------- .../intel/int340x_thermal/int3400_thermal.c | 30 ++-------- .../thermal/intel/intel_quark_dts_thermal.c | 22 ++----- drivers/thermal/of-thermal.c | 30 +++------- drivers/thermal/thermal_core.c | 44 +++++++++++++- drivers/thermal/thermal_core.h | 16 ++++++ drivers/thermal/thermal_sysfs.c | 29 +--------- include/linux/thermal.h | 7 ++- 12 files changed, 125 insertions(+), 218 deletions(-)drivers/acpi/thermal.c +1
-16@@ -172,7 +172,6 @@ struct acpi_thermal {struct acpi_thermal_trips trips;struct acpi_handle_list devices;struct thermal_zone_device *thermal_zone; -int tz_enabled;int kelvin_offset;/* in millidegrees */ struct work_struct thermal_check_work; };@@ -500,7 +499,7 @@ static void acpi_thermal_check(void *data) {struct acpi_thermal *tz = data; -if (!tz->tz_enabled) +if (tz->thermal_zone->mode !=THERMAL_DEVICE_ENABLED )return ; thermal_zone_device_update(tz->thermal_zone,@@ -526,46 +525,29 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)return 0 ; } -static int thermal_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -struct acpi_thermal *tz = thermal->devdata; - -if (!tz) -return -EINVAL ; - - *mode = tz->tz_enabled ?THERMAL_DEVICE_ENABLED : -THERMAL_DEVICE_DISABLED ; - -return 0 ; -} -static int thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode)
drivers/acpi/thermal.c static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp) · line 538
Quoted 10 lines
drivers/acpi/thermal.c +3
-1{struct acpi_thermal *tz = thermal->devdata; -int enable;if (!tz)return -EINVAL ; +if (mode !=THERMAL_DEVICE_DISABLED && + mode !=THERMAL_DEVICE_ENABLED ) +return -EINVAL ;
These checks should be removed as they are already done in the caller of ->set_mode method (thermal_zone_device_set_mode()).
Quoted 517 lines
drivers/acpi/thermal.c +10
-15+/* * enable/disable thermal management from ACPI thermal driver */ -if (mode ==THERMAL_DEVICE_ENABLED ) - enable =1 ; -else if (mode ==THERMAL_DEVICE_DISABLED ) { - enable =0 ; +if (mode ==THERMAL_DEVICE_DISABLED )pr_warn ("thermal zone will be disabled\n" ); - }else -return -EINVAL ; -if (enable != tz->tz_enabled) { - tz->tz_enabled = enable; +if (mode != thermal->mode) {ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"%s kernel ACPI thermal control\n" , - tz->tz_enabled ?"Enable" :"Disable" )); -acpi_thermal_check (tz); + mode ==THERMAL_DEVICE_ENABLED ? +"Enable" :"Disable" )); }return 0 ; }@@ -856,7 +838,6 @@ static struct thermal_zone_device_ops acpi_thermal_zone_ops = { .bind = acpi_thermal_bind_cooling_device, .unbind = acpi_thermal_unbind_cooling_device, .get_temp = thermal_get_temp, - .get_mode = thermal_get_mode, .set_mode = thermal_set_mode, .get_trip_type = thermal_get_trip_type, .get_trip_temp = thermal_get_trip_temp,@@ -870,6 +851,9 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)int trips =0 ;int result;acpi_status status; +struct thermal_zone_params prms = { + .initial_mode =THERMAL_DEVICE_ENABLED , + };int i;if (tz->trips.critical.flags.valid)@@ -887,13 +871,13 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)if (tz->trips.passive.flags.valid) tz->thermal_zone =thermal_zone_device_register ("acpitz" , trips,0 , tz, - &acpi_thermal_zone_ops,NULL , + &acpi_thermal_zone_ops, &prms, tz->trips.passive.tsp*100 , tz->polling_frequency*100 );else tz->thermal_zone =thermal_zone_device_register ("acpitz" , trips,0 , tz, - &acpi_thermal_zone_ops,NULL , + &acpi_thermal_zone_ops, &prms,0 , tz->polling_frequency*100 );if (IS_ERR (tz->thermal_zone))return -ENODEV ;@@ -913,8 +897,6 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)if (ACPI_FAILURE (status))return -ENODEV ; - tz->tz_enabled =1 ; -dev_info (&tz->device->dev,"registered as thermal_zone%d\n" , tz->thermal_zone->id);return 0 ;drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +12
-45@@ -98,7 +98,6 @@ struct mlxsw_thermal_module {struct mlxsw_thermal *parent;struct thermal_zone_device *tzdev;struct mlxsw_thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS ]; -enum thermal_device_mode mode;int module;/* Module or gearbox number */ };@@ -110,7 +109,6 @@ struct mlxsw_thermal {struct thermal_cooling_device *cdevs[MLXSW_MFCR_PWMS_MAX ];u8 cooling_levels[MLXSW_THERMAL_MAX_STATE +1 ];struct mlxsw_thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS ]; -enum thermal_device_mode mode;struct mlxsw_thermal_module *tz_module_arr;u8 tz_module_num;struct mlxsw_thermal_module *tz_gearbox_arr;@@ -277,33 +275,16 @@ static int mlxsw_thermal_unbind(struct thermal_zone_device *tzdev,return 0 ; } -static int mlxsw_thermal_get_mode (struct thermal_zone_device *tzdev, -enum thermal_device_mode *mode) -{ -struct mlxsw_thermal *thermal = tzdev->devdata; - - *mode = thermal->mode; - -return 0 ; -} -static int mlxsw_thermal_set_mode (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {struct mlxsw_thermal *thermal = tzdev->devdata; -mutex_lock (&tzdev->lock); -if (mode ==THERMAL_DEVICE_ENABLED ) tzdev->polling_delay = thermal->polling_delay;else tzdev->polling_delay =0 ; -mutex_unlock (&tzdev->lock); - - thermal->mode = mode; -thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }@@ -407,7 +388,6 @@ static int mlxsw_thermal_trend_get(struct thermal_zone_device *tzdev,static struct thermal_zone_device_ops mlxsw_thermal_ops = { .bind = mlxsw_thermal_bind, .unbind = mlxsw_thermal_unbind, - .get_mode = mlxsw_thermal_get_mode, .set_mode = mlxsw_thermal_set_mode, .get_temp = mlxsw_thermal_get_temp, .get_trip_type = mlxsw_thermal_get_trip_type,@@ -466,34 +446,17 @@ static int mlxsw_thermal_module_unbind(struct thermal_zone_device *tzdev,return err; } -static int mlxsw_thermal_module_mode_get (struct thermal_zone_device *tzdev, -enum thermal_device_mode *mode) -{ -struct mlxsw_thermal_module *tz = tzdev->devdata; - - *mode = tz->mode; - -return 0 ; -} -static int mlxsw_thermal_module_mode_set (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {struct mlxsw_thermal_module *tz = tzdev->devdata;struct mlxsw_thermal *thermal = tz->parent; -mutex_lock (&tzdev->lock); -if (mode ==THERMAL_DEVICE_ENABLED ) tzdev->polling_delay = thermal->polling_delay;else tzdev->polling_delay =0 ; -mutex_unlock (&tzdev->lock); - - tz->mode = mode; -thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }@@ -596,7 +559,6 @@ mlxsw_thermal_module_trip_hyst_set(struct thermal_zone_device *tzdev, int trip,static struct thermal_zone_device_ops mlxsw_thermal_module_ops = { .bind = mlxsw_thermal_module_bind, .unbind = mlxsw_thermal_module_unbind, - .get_mode = mlxsw_thermal_module_mode_get, .set_mode = mlxsw_thermal_module_mode_set, .get_temp = mlxsw_thermal_module_temp_get, .get_trip_type = mlxsw_thermal_module_trip_type_get,@@ -635,7 +597,6 @@ static int mlxsw_thermal_gearbox_temp_get(struct thermal_zone_device *tzdev,static struct thermal_zone_device_ops mlxsw_thermal_gearbox_ops = { .bind = mlxsw_thermal_module_bind, .unbind = mlxsw_thermal_module_unbind, - .get_mode = mlxsw_thermal_module_mode_get, .set_mode = mlxsw_thermal_module_mode_set, .get_temp = mlxsw_thermal_gearbox_temp_get, .get_trip_type = mlxsw_thermal_module_trip_type_get,@@ -749,6 +710,9 @@ static const struct thermal_cooling_device_ops mlxsw_cooling_ops = {static int mlxsw_thermal_module_tz_init (struct mlxsw_thermal_module *module_tz) { +struct thermal_zone_params tzp = { + .initial_mode =THERMAL_DEVICE_ENABLED , + };char tz_name[MLXSW_THERMAL_ZONE_MAX_NAME ];int err;@@ -759,13 +723,12 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz)MLXSW_THERMAL_TRIP_MASK , module_tz, &mlxsw_thermal_module_ops, - NULL, 0, 0); + &tzp, 0, 0);if (IS_ERR (module_tz->tzdev)) { err =PTR_ERR (module_tz->tzdev);return err; } - module_tz->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }@@ -868,6 +831,9 @@ mlxsw_thermal_modules_fini(struct mlxsw_thermal *thermal)static int mlxsw_thermal_gearbox_tz_init (struct mlxsw_thermal_module *gearbox_tz) { +struct thermal_zone_params tzp = { + .initial_mode =THERMAL_DEVICE_ENABLED , + };char tz_name[MLXSW_THERMAL_ZONE_MAX_NAME ]; snprintf(tz_name, sizeof(tz_name), "mlxsw-gearbox%d",@@ -877,11 +843,10 @@ mlxsw_thermal_gearbox_tz_init(struct mlxsw_thermal_module *gearbox_tz)MLXSW_THERMAL_TRIP_MASK , gearbox_tz, &mlxsw_thermal_gearbox_ops, - NULL, 0, 0); + &tzp, 0, 0);if (IS_ERR (gearbox_tz->tzdev))return PTR_ERR (gearbox_tz->tzdev); - gearbox_tz->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }@@ -960,6 +925,9 @@ int mlxsw_thermal_init(struct mlxsw_core *core,const struct mlxsw_bus_info *bus_info, struct mlxsw_thermal **p_thermal) { + struct thermal_zone_params tzp = { + .initial_mode =THERMAL_DEVICE_ENABLED , + };char mfcr_pl[MLXSW_REG_MFCR_LEN ] = {0 };enum mlxsw_reg_mfcr_pwm_frequency freq;struct device *dev = bus_info->dev;@@ -1034,7 +1002,7 @@ int mlxsw_thermal_init(struct mlxsw_core *core,MLXSW_THERMAL_TRIP_MASK , thermal, &mlxsw_thermal_ops, -NULL ,0 , + &tzp,0 , thermal->polling_delay);if (IS_ERR (thermal->tzdev)) { err =PTR_ERR (thermal->tzdev);@@ -1050,7 +1018,6 @@ int mlxsw_thermal_init(struct mlxsw_core *core,if (err) goto err_unreg_modules_tzdev; - thermal->mode =THERMAL_DEVICE_ENABLED ; *p_thermal = thermal;return 0 ;drivers/platform/x86/acerhdf.c +3
-14@@ -406,22 +406,9 @@ static inline void acerhdf_enable_kernelmode(void) kernelmode =1 ; thz_dev->polling_delay = interval*1000 ; -thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );pr_notice ("kernel mode fan control ON\n" ); } -static int acerhdf_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -if (verbose) -pr_notice ("kernel mode fan control %d\n" , kernelmode); - - *mode = (kernelmode) ?THERMAL_DEVICE_ENABLED - :THERMAL_DEVICE_DISABLED ; - -return 0 ; -} -/* * set operation mode; * enabled: the thermal layer of the kernel takes care about @@ -488,7 +475,6 @@ static struct thermal_zone_device_ops acerhdf_dev_ops = { .bind = acerhdf_bind, .unbind = acerhdf_unbind, .get_temp = acerhdf_get_ec_temp, - .get_mode = acerhdf_get_mode, .set_mode = acerhdf_set_mode, .get_trip_type = acerhdf_get_trip_type, .get_trip_hyst = acerhdf_get_trip_hyst,@@ -554,6 +540,7 @@ static int acerhdf_set_cur_state(struct thermal_cooling_device *cdev, err_out:acerhdf_revert_to_bios_mode (); + thz_dev->mode =THERMAL_DEVICE_DISABLED ;return -EINVAL ; }@@ -739,6 +726,8 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (cl_dev))return -EINVAL ; + acerhdf_zone_params.initial_mode = + kernelmode ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ; thz_dev = thermal_zone_device_register("acerhdf", 2, 0, NULL, &acerhdf_dev_ops, &acerhdf_zone_params, 0,drivers/thermal/da9062-thermal.c +4
-12@@ -49,7 +49,6 @@ struct da9062_thermal {struct da9062 *hw;struct delayed_work work;struct thermal_zone_device *zone; -enum thermal_device_mode mode;struct mutex lock;/* protection for da9062_thermal temperature */ int temperature;int irq;@@ -121,14 +120,6 @@ static irqreturn_t da9062_thermal_irq_handler(int irq, void *data)return IRQ_HANDLED ; } -static int da9062_thermal_get_mode (struct thermal_zone_device *z, -enum thermal_device_mode *mode) -{ -struct da9062_thermal *thermal = z->devdata; - *mode = thermal->mode; -return 0 ; -} -static int da9062_thermal_get_trip_type (struct thermal_zone_device *z,int trip,enum thermal_trip_type *type)@@ -181,7 +172,6 @@ static int da9062_thermal_get_temp(struct thermal_zone_device *z,static struct thermal_zone_device_ops da9062_thermal_ops = { .get_temp = da9062_thermal_get_temp, - .get_mode = da9062_thermal_get_mode, .get_trip_type = da9062_thermal_get_trip_type, .get_trip_temp = da9062_thermal_get_trip_temp, };@@ -199,6 +189,9 @@ MODULE_DEVICE_TABLE(of, da9062_compatible_reg_id_table);static int da9062_thermal_probe (struct platform_device *pdev) { +struct thermal_zone_params tzp = { + .initial_mode =THERMAL_DEVICE_ENABLED , + };struct da9062 *chip =dev_get_drvdata (pdev->dev.parent);struct da9062_thermal *thermal;unsigned int pp_tmp =DA9062_DEFAULT_POLLING_MS_PERIOD ;@@ -233,7 +226,6 @@ static int da9062_thermal_probe(struct platform_device *pdev) thermal->config = match->data; thermal->hw = chip; - thermal->mode =THERMAL_DEVICE_ENABLED ; thermal->dev = &pdev->dev;INIT_DELAYED_WORK (&thermal->work, da9062_thermal_poll_on);@@ -241,7 +233,7 @@ static int da9062_thermal_probe(struct platform_device *pdev) thermal->zone =thermal_zone_device_register (thermal->config->name,1 ,0 , thermal, - &da9062_thermal_ops,NULL , pp_tmp, + &da9062_thermal_ops, &tzp, pp_tmp,0 );if (IS_ERR (thermal->zone)) {dev_err (&pdev->dev,"Cannot register thermal zone device\n" );drivers/thermal/imx_thermal.c +8
-21@@ -197,7 +197,6 @@ struct imx_thermal_data {struct cpufreq_policy *policy;struct thermal_zone_device *tz;struct thermal_cooling_device *cdev; -enum thermal_device_mode mode;struct regmap *tempmon;u32 c1, c2;/* See formula in imx_init_calib() */ int temp_passive;@@ -256,7 +255,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)bool wait;u32 val; -if (data->mode ==THERMAL_DEVICE_ENABLED ) { +if (tz->mode ==THERMAL_DEVICE_ENABLED ) {/* Check if a measurement is currently in progress */ regmap_read (map, soc_data->temp_data, &val); wait = !(val & soc_data->temp_valid_mask);@@ -283,7 +282,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)regmap_read (map, soc_data->temp_data, &val); -if (data->mode !=THERMAL_DEVICE_ENABLED ) { +if (tz->mode !=THERMAL_DEVICE_ENABLED ) {regmap_write (map, soc_data->sensor_ctrl +REG_CLR , soc_data->measure_temp_mask); regmap_write(map, soc_data->sensor_ctrl + REG_SET,@@ -331,16 +330,6 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)return 0 ; } -static int imx_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -struct imx_thermal_data *data = tz->devdata; - - *mode = data->mode; - -return 0 ; -} -static int imx_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {@@ -376,9 +365,6 @@ static int imx_set_mode(struct thermal_zone_device *tz, } } - data->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }@@ -467,7 +453,6 @@ static struct thermal_zone_device_ops imx_tz_ops = { .bind = imx_bind, .unbind = imx_unbind, .get_temp = imx_get_temp, - .get_mode = imx_get_mode, .set_mode = imx_set_mode, .get_trip_type = imx_get_trip_type, .get_trip_temp = imx_get_trip_temp,@@ -691,6 +676,9 @@ static inline void imx_thermal_unregister_legacy_cooling(struct imx_thermal_datastatic int imx_thermal_probe (struct platform_device *pdev) { +struct thermal_zone_params tzp = { + .initial_mode =THERMAL_DEVICE_ENABLED , + };struct imx_thermal_data *data;struct regmap *map;int measure_freq;@@ -799,7 +787,7 @@ static int imx_thermal_probe(struct platform_device *pdev) data->tz =thermal_zone_device_register ("imx_thermal_zone" ,IMX_TRIP_NUM ,BIT (IMX_TRIP_PASSIVE ), data, - &imx_tz_ops,NULL , + &imx_tz_ops, &tzp,IMX_PASSIVE_DELAY ,IMX_POLLING_DELAY );if (IS_ERR (data->tz)) {@@ -831,7 +819,6 @@ static int imx_thermal_probe(struct platform_device *pdev) data->socdata->measure_temp_mask); data->irq_enabled = true; - data->mode =THERMAL_DEVICE_ENABLED ; ret = devm_request_threaded_irq(&pdev->dev, data->irq, imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,@@ -885,7 +872,7 @@ static int __maybe_unused imx_thermal_suspend(struct device *dev) data->socdata->measure_temp_mask);regmap_write (map, data->socdata->sensor_ctrl +REG_SET , data->socdata->power_down_mask); - data->mode =THERMAL_DEVICE_DISABLED ; + data->tz->mode =THERMAL_DEVICE_DISABLED ;clk_disable_unprepare (data->thermal_clk);return 0 ;@@ -905,7 +892,7 @@ static int __maybe_unused imx_thermal_resume(struct device *dev) data->socdata->power_down_mask);regmap_write (map, data->socdata->sensor_ctrl +REG_SET , data->socdata->measure_temp_mask); - data->mode =THERMAL_DEVICE_ENABLED ; + data->tz->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }drivers/thermal/intel/int340x_thermal/int3400_thermal.c +0
-15@@ -44,7 +44,6 @@ static char *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = {struct int3400_thermal_priv {struct acpi_device *adev;struct thermal_zone_device *thermal; -int mode;int art_count;struct art *arts;int trt_count;@@ -230,48 +229,29 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal,return 0 ; } -static int int3400_thermal_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -struct int3400_thermal_priv *priv = thermal->devdata; - -if (!priv) -return -EINVAL ; - - *mode = priv->mode; - -return 0 ; -} -static int int3400_thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {struct int3400_thermal_priv *priv = thermal->devdata; -bool enable;int result =0 ;if (!priv)
drivers/thermal/intel/int340x_thermal/int3400_thermal.c static int int3400_thermal_get_temp(struct thermal_zone_device *thermal, · line 243
Quoted 10 lines
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +2
-5return -EINVAL ; -if (mode ==THERMAL_DEVICE_ENABLED ) - enable = true; -else if (mode ==THERMAL_DEVICE_DISABLED ) - enable = false; -else +if (mode !=THERMAL_DEVICE_ENABLED && + mode !=THERMAL_DEVICE_DISABLED )return -EINVAL ;
These checks should be removed as they are already done in the caller of ->set_mode method (thermal_zone_device_set_mode()).
Quoted 162 lines
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +3
-5-if (enable != priv->mode) { - priv->mode = enable; +if (mode != thermal->mode) { result =int3400_thermal_run_osc (priv->adev->handle, - priv->current_uuid_index, - enable); + priv->current_uuid_index, + mode ==THERMAL_DEVICE_ENABLED ); }return result; }static struct thermal_zone_device_ops int3400_thermal_ops = { .get_temp = int3400_thermal_get_temp, - .get_mode = int3400_thermal_get_mode, .set_mode = int3400_thermal_set_mode, };drivers/thermal/intel/intel_quark_dts_thermal.c +6
-16@@ -103,7 +103,6 @@ struct soc_sensor_entry {bool locked;u32 store_ptps;u32 store_dts_enable; -enum thermal_device_mode mode;struct thermal_zone_device *tzone; };@@ -128,7 +127,7 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)return ret;if (out &QRK_DTS_ENABLE_BIT ) { - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }@@ -139,9 +138,9 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)if (ret)return ret; - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ; }else { - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ;pr_info ("DTS is locked. Cannot enable DTS\n" ); ret = -EPERM ; }@@ -161,7 +160,7 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)return ret;if (!(out &QRK_DTS_ENABLE_BIT )) { - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ;return 0 ; }@@ -173,9 +172,9 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)if (ret)return ret; - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ; }else { - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ;pr_info ("DTS is locked. Cannot disable DTS\n" ); ret = -EPERM ; }@@ -309,14 +308,6 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,return 0 ; } -static int sys_get_mode (struct thermal_zone_device *tzd, -enum thermal_device_mode *mode) -{ -struct soc_sensor_entry *aux_entry = tzd->devdata; - *mode = aux_entry->mode; -return 0 ; -} -static int sys_set_mode (struct thermal_zone_device *tzd,enum thermal_device_mode mode) {@@ -338,7 +329,6 @@ static struct thermal_zone_device_ops tzone_ops = { .get_trip_type = sys_get_trip_type, .set_trip_temp = sys_set_trip_temp, .get_crit_temp = sys_get_crit_temp, - .get_mode = sys_get_mode, .set_mode = sys_set_mode, };drivers/thermal/of-thermal.c +0
-20@@ -51,7 +51,6 @@ struct __thermal_bind_params {/** * struct __thermal_zone - internal representation of a thermal zone -* @mode: current thermal zone device mode (enabled/disabled) * @passive_delay: polling interval while passive cooling is activated * @polling_delay: zone polling interval * @slope: slope of the temperature adjustment curve @@ -65,7 +64,6 @@ struct __thermal_bind_params {*/ struct __thermal_zone { -enum thermal_device_mode mode;int passive_delay;int polling_delay;int slope;@@ -269,23 +267,11 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,return 0 ; } -static int of_thermal_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -struct __thermal_zone *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 *data = tz->devdata; -mutex_lock (&tz->lock); -if (mode ==THERMAL_DEVICE_ENABLED ) { tz->polling_delay = data->polling_delay; tz->passive_delay = data->passive_delay;@@ -294,11 +280,6 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz, tz->passive_delay =0 ; } -mutex_unlock (&tz->lock); - - data->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }@@ -393,7 +374,6 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz, }static struct thermal_zone_device_ops of_thermal_ops = { - .get_mode = of_thermal_get_mode, .set_mode = of_thermal_set_mode, .get_trip_type = of_thermal_get_trip_type,@@ -553,8 +533,14 @@ thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data,if (id == sensor_id) { tzd = thermal_zone_of_add_sensor(child, sensor_np,
drivers/thermal/of-thermal.c thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data, · line 543
Quoted 10 lines
drivers/thermal/of-thermal.c +7
-1data, ops); -if (!IS_ERR (tzd)) +if (!IS_ERR (tzd)) { +mutex_lock (&tzd->lock); tzd->ops->set_mode (tzd,THERMAL_DEVICE_ENABLED ); + tzd->mode =THERMAL_DEVICE_ENABLED ; +mutex_unlock (&tzd->lock); +thermal_zone_device_update (tzd, +THERMAL_EVENT_UNSPECIFIED ); + }
This should use thermal_zone_device_enable() instead of open-coding it:
if (!IS_ERR(tzd)) thermal_zone_device_enable(tzd);
Also because of of_thermal_set_mode() modifications following of/thermal device drivers (which use ->set_mode directly):
drivers/thermal/hisi_thermal.c: tzd->ops->set_mode(tzd,drivers/thermal/rockchip_thermal.c: tzd->ops->set_mode(tzd,drivers/thermal/sprd_thermal.c: tzd->ops->set_mode(tzd,
need to be converted to use thermal_zone_device_{en,dis}able() instead.
Quoted 38 lines
drivers/thermal/of-thermal.c +1
-1of_node_put (child); goto exit;@@ -979,7 +965,6 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) finish:of_node_put (child); - tz->mode =THERMAL_DEVICE_DISABLED ;return tz;@@ -1120,6 +1105,7 @@ int __init of_parse_thermal_zones(void)/* these two are left for temperature drivers to use */ tzp->slope = tz->slope; tzp->offset = tz->offset; + tzp->initial_mode =THERMAL_DEVICE_DISABLED ; zone = thermal_zone_device_register(child->name, tz->ntrips, mask, tz,drivers/thermal/thermal_core.c +12
-0@@ -463,6 +463,43 @@ static void thermal_zone_device_reset(struct thermal_zone_device *tz)thermal_zone_device_init (tz); } +enum thermal_device_mode +thermal_zone_device_get_mode (struct thermal_zone_device *tz) +{ +enum thermal_device_mode mode; + +mutex_lock (&tz->lock); + + mode = tz->mode; + +mutex_unlock (&tz->lock); + +return mode;
drivers/thermal/thermal_core.c static void thermal_zone_device_reset(struct thermal_zone_device *tz) · line 487
Quoted 10 lines
drivers/thermal/thermal_core.c +10
-0+} + +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) +{ +int ret =0 ; + +if (mode !=THERMAL_DEVICE_DISABLED && + mode !=THERMAL_DEVICE_ENABLED ) +return -EINVAL ;
No need for these checks as enum thermal_device_mode has only two possible values (we don't do "defensive coding" in the kernel).
drivers/thermal/thermal_core.c static void thermal_zone_device_reset(struct thermal_zone_device *tz) · line 501
Quoted 13 lines
drivers/thermal/thermal_core.c +13
-0+mutex_lock (&tz->lock); + +if (tz->ops->set_mode) + ret = tz->ops->set_mode (tz, mode); + + tz->mode = mode; + +mutex_unlock (&tz->lock); + +thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); + +return ret; +}
Please add:
EXPORT_SYMBOL_GPL(thermal_zone_device_set_mode);
here so device drivers can use thermal_zone_device_{en,dis}able().
drivers/thermal/thermal_core.c thermal_zone_device_register(const char *type, int trips, int mask, · line 1385
Quoted 9 lines
drivers/thermal/thermal_core.c +2
-0void thermal_zone_device_update (struct thermal_zone_device *tz,enum thermal_notify_event event) {@@ -1344,6 +1381,9 @@ thermal_zone_device_register(const char *type, int trips, int mask,if (atomic_cmpxchg (&tz->need_update,1 ,0 ))thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); +if (tzp) +thermal_zone_device_set_mode (tz, tzp->initial_mode);
Please note that currently some device drivers don't access ->mode at all so their default ->mode value is THERMAL_DEVICE_DISABLED but in reality they are enabled (IOW after changes in this patch they should default to THERMAL_DEVICE_ENABLED to reflect real device state in "mode" sysfs attribue and not break after applying patch #2).
Therefore we should always call thermal_zone_device_set_mode() and use the default value of THERMAL_DEVICE_ENABLED if tzp is NULL:
mode = tzp ? tzp->initial_mode : THERMAL_DEVICE_ENABLED; thermal_zone_device_set_mode(tz, mode);
This would also simplify the patch further:
* setting tz->need_update and calling thermal_zone_device_update() directly can be removed from thermal_zone_device_register()
* tzp-s with only .initial_mode = THERMAL_DEVICE_ENABLED set can be removed from:
drivers/thermal/acpi.c drivers/net/ethernet/mellanox/mlxsw/core_thermal.c drivers/thermal/da9062-thermal.c drivers/thermal/imx_thermal.c
The rest of the patch looks fine, thank you for working on this!
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Quoted 145 lines
drivers/thermal/thermal_core.c +2
-3+return tz; unregister:@@ -1473,9 +1513,7 @@ static int thermal_pm_notify(struct notifier_block *nb,case PM_POST_SUSPEND :atomic_set (&in_suspend,0 );list_for_each_entry (tz, &thermal_tz_list, node) { - tz_mode =THERMAL_DEVICE_ENABLED ; -if (tz->ops->get_mode) - tz->ops->get_mode (tz, &tz_mode); + tz_mode =thermal_zone_device_get_mode (tz);if (tz_mode ==THERMAL_DEVICE_DISABLED )continue ;drivers/thermal/thermal_core.h +16
-0@@ -141,6 +141,22 @@ thermal_cooling_device_stats_update(struct thermal_cooling_device *cdev, unsigned long new_state) {}#endif /* CONFIG_THERMAL_STATISTICS */ +enum thermal_device_mode +thermal_zone_device_get_mode (struct thermal_zone_device *tz); + +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode); + +static inline int thermal_zone_device_enable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_ENABLED ); +} + +static inline int thermal_zone_device_disable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_DISABLED ); +} +/* device tree support */ #ifdef CONFIG_THERMAL_OF int of_parse_thermal_zones (void );drivers/thermal/thermal_sysfs.c +3
-26@@ -50,14 +50,8 @@ mode_show(struct device *dev, struct device_attribute *attr, char *buf) {struct thermal_zone_device *tz =to_thermal_zone (dev);enum thermal_device_mode mode; -int result; - -if (!tz->ops->get_mode) -return -EPERM ; - result = tz->ops->get_mode (tz, &mode); -if (result) -return result; + mode =thermal_zone_device_get_mode (tz);return sprintf (buf,"%s\n" , mode ==THERMAL_DEVICE_ENABLED ?"enabled" :"disabled" );@@ -74,9 +68,9 @@ mode_store(struct device *dev, struct device_attribute *attr,return -EPERM ;if (!strncmp (buf,"enabled" ,sizeof ("enabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_ENABLED ); + result =thermal_zone_device_enable (tz);else if (!strncmp (buf,"disabled" ,sizeof ("disabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_DISABLED ); + result =thermal_zone_device_disable (tz);else result = -EINVAL ;@@ -428,30 +422,13 @@ static struct attribute_group thermal_zone_attribute_group = { .attrs = thermal_zone_dev_attrs, }; -/* We expose mode only if .get_mode is present */ static struct attribute *thermal_zone_mode_attrs[] = { &dev_attr_mode.attr,NULL , }; -static umode_t thermal_zone_mode_is_visible (struct kobject *kobj, -struct attribute *attr, -int attrno) -{ - struct device *dev = container_of(kobj, struct device, kobj); -struct thermal_zone_device *tz; - - tz = container_of(dev, struct thermal_zone_device, device); - -if (tz->ops->get_mode) -return attr->mode; - -return 0 ; -} -static struct attribute_group thermal_zone_mode_attribute_group = { .attrs = thermal_zone_mode_attrs, - .is_visible = thermal_zone_mode_is_visible, };/* We expose passive only if passive trips are present */ include/linux/thermal.h +5
-2@@ -76,8 +76,6 @@ struct thermal_zone_device_ops { struct thermal_cooling_device *);int (*get_temp) (struct thermal_zone_device *,int *);int (*set_trips) (struct thermal_zone_device *,int ,int ); -int (*get_mode) (struct thermal_zone_device *, -enum thermal_device_mode *);int (*set_mode) (struct thermal_zone_device *,enum thermal_device_mode ); int (*get_trip_type) (struct thermal_zone_device *, int,@@ -128,6 +126,7 @@ struct thermal_cooling_device {* @trip_temp_attrs: attributes for trip points for sysfs: trip temperature * @trip_type_attrs: attributes for trip points for sysfs: trip type * @trip_hyst_attrs: attributes for trip points for sysfs: trip hysteresis +* @mode: current mode of this thermal zone * @devdata: private pointer for device private data * @trips: number of trip points the thermal zone supports * @trips_disabled; bitmap for disabled trips @@ -170,6 +169,7 @@ struct thermal_zone_device {struct thermal_attr *trip_temp_attrs;struct thermal_attr *trip_type_attrs;struct thermal_attr *trip_hyst_attrs; +enum thermal_device_mode mode;void *devdata;int trips;unsigned long trips_disabled;/* bitmap for disabled trips */ @@ -264,6 +264,9 @@ struct thermal_zone_params {int num_tbps;/* Number of tbp entries */ struct thermal_bind_params *tbp; +/* Initial mode of this thermal zone device */ +enum thermal_device_mode initial_mode; +/* * Sustainable power (heat) that this thermal zone can dissipate in * mW
Re: [RFC v3 1/2] thermal: core: Let thermal zone device's mode be stored in its struct
Quoted 945 lines · Bartlomiej Zolnierkiewicz
Hi Andrzej,
Quoted 14 lines · Andrzej Pietrasiewicz
Thermal zone devices' mode is stored in individual drivers. This patch changes it so that mode is stored in struct
thermal_zone_deviceinstead.As a result all driver-specific variables storing the mode are not needed and are removed. Consequently, the
get_mode()implementations have nothing to operate on and need to be removed, too.Some thermal framework specific functions are introduced:
thermal_zone_device_get_mode()thermal_zone_device_set_mode()thermal_zone_device_enable()thermal_zone_device_disable()Quoted 8 lines
thermal_zone_device_get_mode()and its "set" counterpart take tzd's lock and the "set" calls driver'sset_mode()if provided, so the latter must not take this lock again. At the end of the "set"thermal_zone_device_update()is called so drivers don't need to repeat this invocation in their specificset_mode()implementations.The scope of the above 4 functions is purposedly limited to the thermal framework and drivers are not supposed to call them. This encapsulation
This should be true only for thermal_zone_device_{get,set}_mode().
thermal_zone_device_{en,dis}able() should be available for device drivers:
* of/thermal device drivers need to enable thermal device itself (please refer to my patchset for details)
* device drivers need to call them on ->suspend and ->resume operations
Quoted 75 lines
does not fully work at the moment for some drivers, though:
-
platform/x86/acerhdf.c
-drivers/thermal/imx_thermal.c
-drivers/thermal/intel/intel_quark_dts_thermal.c
-drivers/thermal/of-thermal.cand they manipulate struct thermal_zone_device's members directly.
struct
thermal_zone_paramsgains a new member calledinitial_mode, which is used to set tzd's mode at registration time.The sysfs "mode" attribute is always exposed from now on, because all thermal zone devices now have their
get_mode()implemented at the generic level and it is always available. Exposing "mode" doesn't hurt the drivers which don't provide their ownset_mode(), because writing to "mode" will result in-EPERM, as expected.Signed-off-by Andrzej Pietrasiewicz <[email protected]>--- drivers/acpi/thermal.c | 46 +++++---------- .../ethernet/mellanox/mlxsw/core_thermal.c | 57 ++++--------------- drivers/platform/x86/acerhdf.c | 17 +----- drivers/thermal/da9062-thermal.c | 16 ++---- drivers/thermal/imx_thermal.c | 29 +++------- .../intel/int340x_thermal/int3400_thermal.c | 30 ++-------- .../thermal/intel/intel_quark_dts_thermal.c | 22 ++----- drivers/thermal/of-thermal.c | 30 +++------- drivers/thermal/thermal_core.c | 44 +++++++++++++- drivers/thermal/thermal_core.h | 16 ++++++ drivers/thermal/thermal_sysfs.c | 29 +--------- include/linux/thermal.h | 7 ++- 12 files changed, 125 insertions(+), 218 deletions(-)drivers/acpi/thermal.c +1
-16@@ -172,7 +172,6 @@ struct acpi_thermal {struct acpi_thermal_trips trips;struct acpi_handle_list devices;struct thermal_zone_device *thermal_zone; -int tz_enabled;int kelvin_offset;/* in millidegrees */ struct work_struct thermal_check_work; };@@ -500,7 +499,7 @@ static void acpi_thermal_check(void *data) {struct acpi_thermal *tz = data; -if (!tz->tz_enabled) +if (tz->thermal_zone->mode !=THERMAL_DEVICE_ENABLED )return ; thermal_zone_device_update(tz->thermal_zone,@@ -526,46 +525,29 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)return 0 ; } -static int thermal_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -struct acpi_thermal *tz = thermal->devdata; - -if (!tz) -return -EINVAL ; - - *mode = tz->tz_enabled ?THERMAL_DEVICE_ENABLED : -THERMAL_DEVICE_DISABLED ; - -return 0 ; -} -static int thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode)drivers/acpi/thermal.c static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp) · line 538
Quoted 10 lines
drivers/acpi/thermal.c +3
-1{struct acpi_thermal *tz = thermal->devdata; -int enable;if (!tz)return -EINVAL ; +if (mode !=THERMAL_DEVICE_DISABLED && + mode !=THERMAL_DEVICE_ENABLED ) +return -EINVAL ;These checks should be removed as they are already done in the caller of ->set_mode method (
thermal_zone_device_set_mode()).Quoted 517 lines
drivers/acpi/thermal.c +10
-15+/* * enable/disable thermal management from ACPI thermal driver */ -if (mode ==THERMAL_DEVICE_ENABLED ) - enable =1 ; -else if (mode ==THERMAL_DEVICE_DISABLED ) { - enable =0 ; +if (mode ==THERMAL_DEVICE_DISABLED )pr_warn ("thermal zone will be disabled\n" ); - }else -return -EINVAL ; -if (enable != tz->tz_enabled) { - tz->tz_enabled = enable; +if (mode != thermal->mode) {ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"%s kernel ACPI thermal control\n" , - tz->tz_enabled ?"Enable" :"Disable" )); -acpi_thermal_check (tz); + mode ==THERMAL_DEVICE_ENABLED ? +"Enable" :"Disable" )); }return 0 ; }@@ -856,7 +838,6 @@ static struct thermal_zone_device_ops acpi_thermal_zone_ops = { .bind = acpi_thermal_bind_cooling_device, .unbind = acpi_thermal_unbind_cooling_device, .get_temp = thermal_get_temp, - .get_mode = thermal_get_mode, .set_mode = thermal_set_mode, .get_trip_type = thermal_get_trip_type, .get_trip_temp = thermal_get_trip_temp,@@ -870,6 +851,9 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)int trips =0 ;int result;acpi_status status; +struct thermal_zone_params prms = { + .initial_mode =THERMAL_DEVICE_ENABLED , + };int i;if (tz->trips.critical.flags.valid)@@ -887,13 +871,13 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)if (tz->trips.passive.flags.valid) tz->thermal_zone =thermal_zone_device_register ("acpitz" , trips,0 , tz, - &acpi_thermal_zone_ops,NULL , + &acpi_thermal_zone_ops, &prms, tz->trips.passive.tsp*100 , tz->polling_frequency*100 );else tz->thermal_zone =thermal_zone_device_register ("acpitz" , trips,0 , tz, - &acpi_thermal_zone_ops,NULL , + &acpi_thermal_zone_ops, &prms,0 , tz->polling_frequency*100 );if (IS_ERR (tz->thermal_zone))return -ENODEV ;@@ -913,8 +897,6 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)if (ACPI_FAILURE (status))return -ENODEV ; - tz->tz_enabled =1 ; -dev_info (&tz->device->dev,"registered as thermal_zone%d\n" , tz->thermal_zone->id);return 0 ;drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +12
-45@@ -98,7 +98,6 @@ struct mlxsw_thermal_module {struct mlxsw_thermal *parent;struct thermal_zone_device *tzdev;struct mlxsw_thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS ]; -enum thermal_device_mode mode;int module;/* Module or gearbox number */ };@@ -110,7 +109,6 @@ struct mlxsw_thermal {struct thermal_cooling_device *cdevs[MLXSW_MFCR_PWMS_MAX ];u8 cooling_levels[MLXSW_THERMAL_MAX_STATE +1 ];struct mlxsw_thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS ]; -enum thermal_device_mode mode;struct mlxsw_thermal_module *tz_module_arr;u8 tz_module_num;struct mlxsw_thermal_module *tz_gearbox_arr;@@ -277,33 +275,16 @@ static int mlxsw_thermal_unbind(struct thermal_zone_device *tzdev,return 0 ; } -static int mlxsw_thermal_get_mode (struct thermal_zone_device *tzdev, -enum thermal_device_mode *mode) -{ -struct mlxsw_thermal *thermal = tzdev->devdata; - - *mode = thermal->mode; - -return 0 ; -} -static int mlxsw_thermal_set_mode (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {struct mlxsw_thermal *thermal = tzdev->devdata; -mutex_lock (&tzdev->lock); -if (mode ==THERMAL_DEVICE_ENABLED ) tzdev->polling_delay = thermal->polling_delay;else tzdev->polling_delay =0 ; -mutex_unlock (&tzdev->lock); - - thermal->mode = mode; -thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }@@ -407,7 +388,6 @@ static int mlxsw_thermal_trend_get(struct thermal_zone_device *tzdev,static struct thermal_zone_device_ops mlxsw_thermal_ops = { .bind = mlxsw_thermal_bind, .unbind = mlxsw_thermal_unbind, - .get_mode = mlxsw_thermal_get_mode, .set_mode = mlxsw_thermal_set_mode, .get_temp = mlxsw_thermal_get_temp, .get_trip_type = mlxsw_thermal_get_trip_type,@@ -466,34 +446,17 @@ static int mlxsw_thermal_module_unbind(struct thermal_zone_device *tzdev,return err; } -static int mlxsw_thermal_module_mode_get (struct thermal_zone_device *tzdev, -enum thermal_device_mode *mode) -{ -struct mlxsw_thermal_module *tz = tzdev->devdata; - - *mode = tz->mode; - -return 0 ; -} -static int mlxsw_thermal_module_mode_set (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {struct mlxsw_thermal_module *tz = tzdev->devdata;struct mlxsw_thermal *thermal = tz->parent; -mutex_lock (&tzdev->lock); -if (mode ==THERMAL_DEVICE_ENABLED ) tzdev->polling_delay = thermal->polling_delay;else tzdev->polling_delay =0 ; -mutex_unlock (&tzdev->lock); - - tz->mode = mode; -thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }@@ -596,7 +559,6 @@ mlxsw_thermal_module_trip_hyst_set(struct thermal_zone_device *tzdev, int trip,static struct thermal_zone_device_ops mlxsw_thermal_module_ops = { .bind = mlxsw_thermal_module_bind, .unbind = mlxsw_thermal_module_unbind, - .get_mode = mlxsw_thermal_module_mode_get, .set_mode = mlxsw_thermal_module_mode_set, .get_temp = mlxsw_thermal_module_temp_get, .get_trip_type = mlxsw_thermal_module_trip_type_get,@@ -635,7 +597,6 @@ static int mlxsw_thermal_gearbox_temp_get(struct thermal_zone_device *tzdev,static struct thermal_zone_device_ops mlxsw_thermal_gearbox_ops = { .bind = mlxsw_thermal_module_bind, .unbind = mlxsw_thermal_module_unbind, - .get_mode = mlxsw_thermal_module_mode_get, .set_mode = mlxsw_thermal_module_mode_set, .get_temp = mlxsw_thermal_gearbox_temp_get, .get_trip_type = mlxsw_thermal_module_trip_type_get,@@ -749,6 +710,9 @@ static const struct thermal_cooling_device_ops mlxsw_cooling_ops = {static int mlxsw_thermal_module_tz_init (struct mlxsw_thermal_module *module_tz) { +struct thermal_zone_params tzp = { + .initial_mode =THERMAL_DEVICE_ENABLED , + };char tz_name[MLXSW_THERMAL_ZONE_MAX_NAME ];int err;@@ -759,13 +723,12 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz)MLXSW_THERMAL_TRIP_MASK , module_tz, &mlxsw_thermal_module_ops, - NULL, 0, 0); + &tzp, 0, 0);if (IS_ERR (module_tz->tzdev)) { err =PTR_ERR (module_tz->tzdev);return err; } - module_tz->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }@@ -868,6 +831,9 @@ mlxsw_thermal_modules_fini(struct mlxsw_thermal *thermal)static int mlxsw_thermal_gearbox_tz_init (struct mlxsw_thermal_module *gearbox_tz) { +struct thermal_zone_params tzp = { + .initial_mode =THERMAL_DEVICE_ENABLED , + };char tz_name[MLXSW_THERMAL_ZONE_MAX_NAME ]; snprintf(tz_name, sizeof(tz_name), "mlxsw-gearbox%d",@@ -877,11 +843,10 @@ mlxsw_thermal_gearbox_tz_init(struct mlxsw_thermal_module *gearbox_tz)MLXSW_THERMAL_TRIP_MASK , gearbox_tz, &mlxsw_thermal_gearbox_ops, - NULL, 0, 0); + &tzp, 0, 0);if (IS_ERR (gearbox_tz->tzdev))return PTR_ERR (gearbox_tz->tzdev); - gearbox_tz->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }@@ -960,6 +925,9 @@ int mlxsw_thermal_init(struct mlxsw_core *core,const struct mlxsw_bus_info *bus_info, struct mlxsw_thermal **p_thermal) { + struct thermal_zone_params tzp = { + .initial_mode =THERMAL_DEVICE_ENABLED , + };char mfcr_pl[MLXSW_REG_MFCR_LEN ] = {0 };enum mlxsw_reg_mfcr_pwm_frequency freq;struct device *dev = bus_info->dev;@@ -1034,7 +1002,7 @@ int mlxsw_thermal_init(struct mlxsw_core *core,MLXSW_THERMAL_TRIP_MASK , thermal, &mlxsw_thermal_ops, -NULL ,0 , + &tzp,0 , thermal->polling_delay);if (IS_ERR (thermal->tzdev)) { err =PTR_ERR (thermal->tzdev);@@ -1050,7 +1018,6 @@ int mlxsw_thermal_init(struct mlxsw_core *core,if (err) goto err_unreg_modules_tzdev; - thermal->mode =THERMAL_DEVICE_ENABLED ; *p_thermal = thermal;return 0 ;drivers/platform/x86/acerhdf.c +3
-14@@ -406,22 +406,9 @@ static inline void acerhdf_enable_kernelmode(void) kernelmode =1 ; thz_dev->polling_delay = interval*1000 ; -thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );pr_notice ("kernel mode fan control ON\n" ); } -static int acerhdf_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -if (verbose) -pr_notice ("kernel mode fan control %d\n" , kernelmode); - - *mode = (kernelmode) ?THERMAL_DEVICE_ENABLED - :THERMAL_DEVICE_DISABLED ; - -return 0 ; -} -/* * set operation mode; * enabled: the thermal layer of the kernel takes care about @@ -488,7 +475,6 @@ static struct thermal_zone_device_ops acerhdf_dev_ops = { .bind = acerhdf_bind, .unbind = acerhdf_unbind, .get_temp = acerhdf_get_ec_temp, - .get_mode = acerhdf_get_mode, .set_mode = acerhdf_set_mode, .get_trip_type = acerhdf_get_trip_type, .get_trip_hyst = acerhdf_get_trip_hyst,@@ -554,6 +540,7 @@ static int acerhdf_set_cur_state(struct thermal_cooling_device *cdev, err_out:acerhdf_revert_to_bios_mode (); + thz_dev->mode =THERMAL_DEVICE_DISABLED ;return -EINVAL ; }@@ -739,6 +726,8 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (cl_dev))return -EINVAL ; + acerhdf_zone_params.initial_mode = + kernelmode ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ; thz_dev = thermal_zone_device_register("acerhdf", 2, 0, NULL, &acerhdf_dev_ops, &acerhdf_zone_params, 0,drivers/thermal/da9062-thermal.c +4
-12@@ -49,7 +49,6 @@ struct da9062_thermal {struct da9062 *hw;struct delayed_work work;struct thermal_zone_device *zone; -enum thermal_device_mode mode;struct mutex lock;/* protection for da9062_thermal temperature */ int temperature;int irq;@@ -121,14 +120,6 @@ static irqreturn_t da9062_thermal_irq_handler(int irq, void *data)return IRQ_HANDLED ; } -static int da9062_thermal_get_mode (struct thermal_zone_device *z, -enum thermal_device_mode *mode) -{ -struct da9062_thermal *thermal = z->devdata; - *mode = thermal->mode; -return 0 ; -} -static int da9062_thermal_get_trip_type (struct thermal_zone_device *z,int trip,enum thermal_trip_type *type)@@ -181,7 +172,6 @@ static int da9062_thermal_get_temp(struct thermal_zone_device *z,static struct thermal_zone_device_ops da9062_thermal_ops = { .get_temp = da9062_thermal_get_temp, - .get_mode = da9062_thermal_get_mode, .get_trip_type = da9062_thermal_get_trip_type, .get_trip_temp = da9062_thermal_get_trip_temp, };@@ -199,6 +189,9 @@ MODULE_DEVICE_TABLE(of, da9062_compatible_reg_id_table);static int da9062_thermal_probe (struct platform_device *pdev) { +struct thermal_zone_params tzp = { + .initial_mode =THERMAL_DEVICE_ENABLED , + };struct da9062 *chip =dev_get_drvdata (pdev->dev.parent);struct da9062_thermal *thermal;unsigned int pp_tmp =DA9062_DEFAULT_POLLING_MS_PERIOD ;@@ -233,7 +226,6 @@ static int da9062_thermal_probe(struct platform_device *pdev) thermal->config = match->data; thermal->hw = chip; - thermal->mode =THERMAL_DEVICE_ENABLED ; thermal->dev = &pdev->dev;INIT_DELAYED_WORK (&thermal->work, da9062_thermal_poll_on);@@ -241,7 +233,7 @@ static int da9062_thermal_probe(struct platform_device *pdev) thermal->zone =thermal_zone_device_register (thermal->config->name,1 ,0 , thermal, - &da9062_thermal_ops,NULL , pp_tmp, + &da9062_thermal_ops, &tzp, pp_tmp,0 );if (IS_ERR (thermal->zone)) {dev_err (&pdev->dev,"Cannot register thermal zone device\n" );drivers/thermal/imx_thermal.c +8
-21@@ -197,7 +197,6 @@ struct imx_thermal_data {struct cpufreq_policy *policy;struct thermal_zone_device *tz;struct thermal_cooling_device *cdev; -enum thermal_device_mode mode;struct regmap *tempmon;u32 c1, c2;/* See formula in imx_init_calib() */ int temp_passive;@@ -256,7 +255,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)bool wait;u32 val; -if (data->mode ==THERMAL_DEVICE_ENABLED ) { +if (tz->mode ==THERMAL_DEVICE_ENABLED ) {/* Check if a measurement is currently in progress */ regmap_read (map, soc_data->temp_data, &val); wait = !(val & soc_data->temp_valid_mask);@@ -283,7 +282,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)regmap_read (map, soc_data->temp_data, &val); -if (data->mode !=THERMAL_DEVICE_ENABLED ) { +if (tz->mode !=THERMAL_DEVICE_ENABLED ) {regmap_write (map, soc_data->sensor_ctrl +REG_CLR , soc_data->measure_temp_mask); regmap_write(map, soc_data->sensor_ctrl + REG_SET,@@ -331,16 +330,6 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)return 0 ; } -static int imx_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -struct imx_thermal_data *data = tz->devdata; - - *mode = data->mode; - -return 0 ; -} -static int imx_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {@@ -376,9 +365,6 @@ static int imx_set_mode(struct thermal_zone_device *tz, } } - data->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }@@ -467,7 +453,6 @@ static struct thermal_zone_device_ops imx_tz_ops = { .bind = imx_bind, .unbind = imx_unbind, .get_temp = imx_get_temp, - .get_mode = imx_get_mode, .set_mode = imx_set_mode, .get_trip_type = imx_get_trip_type, .get_trip_temp = imx_get_trip_temp,@@ -691,6 +676,9 @@ static inline void imx_thermal_unregister_legacy_cooling(struct imx_thermal_datastatic int imx_thermal_probe (struct platform_device *pdev) { +struct thermal_zone_params tzp = { + .initial_mode =THERMAL_DEVICE_ENABLED , + };struct imx_thermal_data *data;struct regmap *map;int measure_freq;@@ -799,7 +787,7 @@ static int imx_thermal_probe(struct platform_device *pdev) data->tz =thermal_zone_device_register ("imx_thermal_zone" ,IMX_TRIP_NUM ,BIT (IMX_TRIP_PASSIVE ), data, - &imx_tz_ops,NULL , + &imx_tz_ops, &tzp,IMX_PASSIVE_DELAY ,IMX_POLLING_DELAY );if (IS_ERR (data->tz)) {@@ -831,7 +819,6 @@ static int imx_thermal_probe(struct platform_device *pdev) data->socdata->measure_temp_mask); data->irq_enabled = true; - data->mode =THERMAL_DEVICE_ENABLED ; ret = devm_request_threaded_irq(&pdev->dev, data->irq, imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,@@ -885,7 +872,7 @@ static int __maybe_unused imx_thermal_suspend(struct device *dev) data->socdata->measure_temp_mask);regmap_write (map, data->socdata->sensor_ctrl +REG_SET , data->socdata->power_down_mask); - data->mode =THERMAL_DEVICE_DISABLED ; + data->tz->mode =THERMAL_DEVICE_DISABLED ;clk_disable_unprepare (data->thermal_clk);return 0 ;@@ -905,7 +892,7 @@ static int __maybe_unused imx_thermal_resume(struct device *dev) data->socdata->power_down_mask);regmap_write (map, data->socdata->sensor_ctrl +REG_SET , data->socdata->measure_temp_mask); - data->mode =THERMAL_DEVICE_ENABLED ; + data->tz->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }drivers/thermal/intel/int340x_thermal/int3400_thermal.c +0
-15@@ -44,7 +44,6 @@ static char *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = {struct int3400_thermal_priv {struct acpi_device *adev;struct thermal_zone_device *thermal; -int mode;int art_count;struct art *arts;int trt_count;@@ -230,48 +229,29 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal,return 0 ; } -static int int3400_thermal_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -struct int3400_thermal_priv *priv = thermal->devdata; - -if (!priv) -return -EINVAL ; - - *mode = priv->mode; - -return 0 ; -} -static int int3400_thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {struct int3400_thermal_priv *priv = thermal->devdata; -bool enable;int result =0 ;if (!priv)drivers/thermal/intel/int340x_thermal/int3400_thermal.c static int int3400_thermal_get_temp(struct thermal_zone_device *thermal, · line 243
Quoted 10 lines
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +2
-5return -EINVAL ; -if (mode ==THERMAL_DEVICE_ENABLED ) - enable = true; -else if (mode ==THERMAL_DEVICE_DISABLED ) - enable = false; -else +if (mode !=THERMAL_DEVICE_ENABLED && + mode !=THERMAL_DEVICE_DISABLED )return -EINVAL ;These checks should be removed as they are already done in the caller of ->set_mode method (
thermal_zone_device_set_mode()).Quoted 162 lines
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +3
-5-if (enable != priv->mode) { - priv->mode = enable; +if (mode != thermal->mode) { result =int3400_thermal_run_osc (priv->adev->handle, - priv->current_uuid_index, - enable); + priv->current_uuid_index, + mode ==THERMAL_DEVICE_ENABLED ); }return result; }static struct thermal_zone_device_ops int3400_thermal_ops = { .get_temp = int3400_thermal_get_temp, - .get_mode = int3400_thermal_get_mode, .set_mode = int3400_thermal_set_mode, };drivers/thermal/intel/intel_quark_dts_thermal.c +6
-16@@ -103,7 +103,6 @@ struct soc_sensor_entry {bool locked;u32 store_ptps;u32 store_dts_enable; -enum thermal_device_mode mode;struct thermal_zone_device *tzone; };@@ -128,7 +127,7 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)return ret;if (out &QRK_DTS_ENABLE_BIT ) { - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }@@ -139,9 +138,9 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)if (ret)return ret; - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ; }else { - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ;pr_info ("DTS is locked. Cannot enable DTS\n" ); ret = -EPERM ; }@@ -161,7 +160,7 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)return ret;if (!(out &QRK_DTS_ENABLE_BIT )) { - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ;return 0 ; }@@ -173,9 +172,9 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)if (ret)return ret; - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ; }else { - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ;pr_info ("DTS is locked. Cannot disable DTS\n" ); ret = -EPERM ; }@@ -309,14 +308,6 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,return 0 ; } -static int sys_get_mode (struct thermal_zone_device *tzd, -enum thermal_device_mode *mode) -{ -struct soc_sensor_entry *aux_entry = tzd->devdata; - *mode = aux_entry->mode; -return 0 ; -} -static int sys_set_mode (struct thermal_zone_device *tzd,enum thermal_device_mode mode) {@@ -338,7 +329,6 @@ static struct thermal_zone_device_ops tzone_ops = { .get_trip_type = sys_get_trip_type, .set_trip_temp = sys_set_trip_temp, .get_crit_temp = sys_get_crit_temp, - .get_mode = sys_get_mode, .set_mode = sys_set_mode, };drivers/thermal/of-thermal.c +0
-20@@ -51,7 +51,6 @@ struct __thermal_bind_params {/** * struct __thermal_zone - internal representation of a thermal zone -* @mode: current thermal zone device mode (enabled/disabled) * @passive_delay: polling interval while passive cooling is activated * @polling_delay: zone polling interval * @slope: slope of the temperature adjustment curve @@ -65,7 +64,6 @@ struct __thermal_bind_params {*/ struct __thermal_zone { -enum thermal_device_mode mode;int passive_delay;int polling_delay;int slope;@@ -269,23 +267,11 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,return 0 ; } -static int of_thermal_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -struct __thermal_zone *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 *data = tz->devdata; -mutex_lock (&tz->lock); -if (mode ==THERMAL_DEVICE_ENABLED ) { tz->polling_delay = data->polling_delay; tz->passive_delay = data->passive_delay;@@ -294,11 +280,6 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz, tz->passive_delay =0 ; } -mutex_unlock (&tz->lock); - - data->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }@@ -393,7 +374,6 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz, }static struct thermal_zone_device_ops of_thermal_ops = { - .get_mode = of_thermal_get_mode, .set_mode = of_thermal_set_mode, .get_trip_type = of_thermal_get_trip_type,@@ -553,8 +533,14 @@ thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data,if (id == sensor_id) { tzd = thermal_zone_of_add_sensor(child, sensor_np,drivers/thermal/of-thermal.c thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data, · line 543
Quoted 10 lines
drivers/thermal/of-thermal.c +7
-1data, ops); -if (!IS_ERR (tzd)) +if (!IS_ERR (tzd)) { +mutex_lock (&tzd->lock); tzd->ops->set_mode (tzd,THERMAL_DEVICE_ENABLED ); + tzd->mode =THERMAL_DEVICE_ENABLED ; +mutex_unlock (&tzd->lock); +thermal_zone_device_update (tzd, +THERMAL_EVENT_UNSPECIFIED ); + }This should use
thermal_zone_device_enable()instead of open-coding it:if (!IS_ERR(tzd)) thermal_zone_device_enable(tzd);Also because of
of_thermal_set_mode()modifications following of/thermal device drivers (which use ->set_mode directly):
drivers/thermal/hisi_thermal.c: tzd->ops->set_mode(tzd,drivers/thermal/rockchip_thermal.c: tzd->ops->set_mode(tzd,drivers/thermal/sprd_thermal.c: tzd->ops->set_mode(tzd,need to be converted to use thermal_zone_device_{en,dis}able() instead.
Quoted 38 lines
drivers/thermal/of-thermal.c +1
-1of_node_put (child); goto exit;@@ -979,7 +965,6 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) finish:of_node_put (child); - tz->mode =THERMAL_DEVICE_DISABLED ;return tz;@@ -1120,6 +1105,7 @@ int __init of_parse_thermal_zones(void)/* these two are left for temperature drivers to use */ tzp->slope = tz->slope; tzp->offset = tz->offset; + tzp->initial_mode =THERMAL_DEVICE_DISABLED ; zone = thermal_zone_device_register(child->name, tz->ntrips, mask, tz,drivers/thermal/thermal_core.c +12
-0@@ -463,6 +463,43 @@ static void thermal_zone_device_reset(struct thermal_zone_device *tz)thermal_zone_device_init (tz); } +enum thermal_device_mode +thermal_zone_device_get_mode (struct thermal_zone_device *tz) +{ +enum thermal_device_mode mode; + +mutex_lock (&tz->lock); + + mode = tz->mode; + +mutex_unlock (&tz->lock); + +return mode;drivers/thermal/thermal_core.c static void thermal_zone_device_reset(struct thermal_zone_device *tz) · line 487
Quoted 10 lines
drivers/thermal/thermal_core.c +10
-0+} + +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) +{ +int ret =0 ; + +if (mode !=THERMAL_DEVICE_DISABLED && + mode !=THERMAL_DEVICE_ENABLED ) +return -EINVAL ;No need for these checks as enum
thermal_device_modehas only two possible values (we don't do "defensive coding" in the kernel).drivers/thermal/thermal_core.c static void thermal_zone_device_reset(struct thermal_zone_device *tz) · line 501
Quoted 13 lines
drivers/thermal/thermal_core.c +13
-0+mutex_lock (&tz->lock); + +if (tz->ops->set_mode) + ret = tz->ops->set_mode (tz, mode); + + tz->mode = mode; + +mutex_unlock (&tz->lock); + +thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); + +return ret; +}Please add:
EXPORT_SYMBOL_GPL(thermal_zone_device_set_mode);here so device drivers can use thermal_zone_device_{en,dis}able().
drivers/thermal/thermal_core.c thermal_zone_device_register(const char *type, int trips, int mask, · line 1385
Quoted 9 lines
drivers/thermal/thermal_core.c +2
-0void thermal_zone_device_update (struct thermal_zone_device *tz,enum thermal_notify_event event) {@@ -1344,6 +1381,9 @@ thermal_zone_device_register(const char *type, int trips, int mask,if (atomic_cmpxchg (&tz->need_update,1 ,0 ))thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); +if (tzp) +thermal_zone_device_set_mode (tz, tzp->initial_mode);Please note that currently some device drivers don't access ->mode at all so their default ->mode value is
THERMAL_DEVICE_DISABLEDbut in reality they are enabled (IOW after changes in this patch they should default toTHERMAL_DEVICE_ENABLEDto reflect real device state in "mode" sysfs attribue and not break after applying patch #2).Therefore we should always call
thermal_zone_device_set_mode()and use the default value ofTHERMAL_DEVICE_ENABLEDif tzp is NULL:mode = tzp ? tzp->initial_mode : THERMAL_DEVICE_ENABLED; thermal_zone_device_set_mode(tz, mode);This would also simplify the patch further:
* setting
tz->need_updateand callingthermal_zone_device_update()directly can be removed fromthermal_zone_device_register()* tzp-s with only .initial_mode =
THERMAL_DEVICE_ENABLEDset can be removed from:
Quoted 6 lines
drivers/thermal/acpi.cdrivers/net/ethernet/mellanox/mlxsw/core_thermal.cdrivers/thermal/da9062-thermal.cdrivers/thermal/imx_thermal.cThe rest of the patch looks fine, thank you for working on this!
Oops, one more thing, I've audited all existing users of thermal_zone_device_register() with non-NULL tzp argument:
* following drivers should be updated to set .initial_mode to THERMAL_DEVICE_ENABLED in their tzp instance (no ->set_mode method and ->mode not set currently during initialization):
drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c drivers/thermal/intel/x86_pkg_temp_thermal.c
* following driver may be updated to explicitly set .initial_mode to THERMAL_DEVICE_DISABLED in its tzp instance (has ->set_mode method but ->mode not set currently during initialization):
drivers/thermal/intel/int340x_thermal/int3400_thermal.c
(THERMAL_DEVICE_DISABLED == 0 is the default currently but
lets document the behavior and prepare driver for potentially changing the default into more sane THERMAL_DEVICE_ENABLED in the future)
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Quoted 151 lines
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung ElectronicsQuoted 145 lines
drivers/thermal/thermal_core.c +2
-3+return tz; unregister:@@ -1473,9 +1513,7 @@ static int thermal_pm_notify(struct notifier_block *nb,case PM_POST_SUSPEND :atomic_set (&in_suspend,0 );list_for_each_entry (tz, &thermal_tz_list, node) { - tz_mode =THERMAL_DEVICE_ENABLED ; -if (tz->ops->get_mode) - tz->ops->get_mode (tz, &tz_mode); + tz_mode =thermal_zone_device_get_mode (tz);if (tz_mode ==THERMAL_DEVICE_DISABLED )continue ;drivers/thermal/thermal_core.h +16
-0@@ -141,6 +141,22 @@ thermal_cooling_device_stats_update(struct thermal_cooling_device *cdev, unsigned long new_state) {}#endif /* CONFIG_THERMAL_STATISTICS */ +enum thermal_device_mode +thermal_zone_device_get_mode (struct thermal_zone_device *tz); + +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode); + +static inline int thermal_zone_device_enable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_ENABLED ); +} + +static inline int thermal_zone_device_disable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_DISABLED ); +} +/* device tree support */ #ifdef CONFIG_THERMAL_OF int of_parse_thermal_zones (void );drivers/thermal/thermal_sysfs.c +3
-26@@ -50,14 +50,8 @@ mode_show(struct device *dev, struct device_attribute *attr, char *buf) {struct thermal_zone_device *tz =to_thermal_zone (dev);enum thermal_device_mode mode; -int result; - -if (!tz->ops->get_mode) -return -EPERM ; - result = tz->ops->get_mode (tz, &mode); -if (result) -return result; + mode =thermal_zone_device_get_mode (tz);return sprintf (buf,"%s\n" , mode ==THERMAL_DEVICE_ENABLED ?"enabled" :"disabled" );@@ -74,9 +68,9 @@ mode_store(struct device *dev, struct device_attribute *attr,return -EPERM ;if (!strncmp (buf,"enabled" ,sizeof ("enabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_ENABLED ); + result =thermal_zone_device_enable (tz);else if (!strncmp (buf,"disabled" ,sizeof ("disabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_DISABLED ); + result =thermal_zone_device_disable (tz);else result = -EINVAL ;@@ -428,30 +422,13 @@ static struct attribute_group thermal_zone_attribute_group = { .attrs = thermal_zone_dev_attrs, }; -/* We expose mode only if .get_mode is present */ static struct attribute *thermal_zone_mode_attrs[] = { &dev_attr_mode.attr,NULL , }; -static umode_t thermal_zone_mode_is_visible (struct kobject *kobj, -struct attribute *attr, -int attrno) -{ - struct device *dev = container_of(kobj, struct device, kobj); -struct thermal_zone_device *tz; - - tz = container_of(dev, struct thermal_zone_device, device); - -if (tz->ops->get_mode) -return attr->mode; - -return 0 ; -} -static struct attribute_group thermal_zone_mode_attribute_group = { .attrs = thermal_zone_mode_attrs, - .is_visible = thermal_zone_mode_is_visible, };/* We expose passive only if passive trips are present */ include/linux/thermal.h +5
-2@@ -76,8 +76,6 @@ struct thermal_zone_device_ops { struct thermal_cooling_device *);int (*get_temp) (struct thermal_zone_device *,int *);int (*set_trips) (struct thermal_zone_device *,int ,int ); -int (*get_mode) (struct thermal_zone_device *, -enum thermal_device_mode *);int (*set_mode) (struct thermal_zone_device *,enum thermal_device_mode ); int (*get_trip_type) (struct thermal_zone_device *, int,@@ -128,6 +126,7 @@ struct thermal_cooling_device {* @trip_temp_attrs: attributes for trip points for sysfs: trip temperature * @trip_type_attrs: attributes for trip points for sysfs: trip type * @trip_hyst_attrs: attributes for trip points for sysfs: trip hysteresis +* @mode: current mode of this thermal zone * @devdata: private pointer for device private data * @trips: number of trip points the thermal zone supports * @trips_disabled; bitmap for disabled trips @@ -170,6 +169,7 @@ struct thermal_zone_device {struct thermal_attr *trip_temp_attrs;struct thermal_attr *trip_type_attrs;struct thermal_attr *trip_hyst_attrs; +enum thermal_device_mode mode;void *devdata;int trips;unsigned long trips_disabled;/* bitmap for disabled trips */ @@ -264,6 +264,9 @@ struct thermal_zone_params {int num_tbps;/* Number of tbp entries */ struct thermal_bind_params *tbp; +/* Initial mode of this thermal zone device */ +enum thermal_device_mode initial_mode; +/* * Sustainable power (heat) that this thermal zone can dissipate in * mW
cover Stop monitoring disabled devices
After 3 revisions of an RFC I'm sending this as a PATCH series.
The first patch makes all the drivers store their mode in struct thermal_zone_device. Such a move has consequences: driver-specific variables for storing mode are not necessary. Consequently get_mode() methods become obsolete. Then sysfs "mode" attribute stops depending on get_mode() being provided, because it is always provided from now on.
The first patch also introduces the initial mode to be optionally passed to thermal_zone_device_register().
Given all the groundwork done in patch 1/2 patch 2/2 becomes very simple.
Compared to RFC v3 this series addresses comments from Bartlomiej, thank you Bartlomiej for your review!
RFCv3..this PATCH:
- export thermal_zone_device_{enable|disable}() for drivers
- don't check provided enum values in acpi's thermal_zet_mode() and in int3400_thermal_set_mode()
- use thermal_zone_device_enable() in of_thermal instead of open coding it
- use thermal_zone_device_{enable|disable}() in hisi_thermal, rockchip_thermal and sprd_thermal
- assume THERMAL_DEVICE_ENABLED is thermal_zone_params not provided at tzd's register time
- eliminated tzp-s which contain only .initial_mode = THERMAL_DEVICE_ENABLED,
- don't set tz->need_update and don't call thermal_zone_device_update() at the end of thermal_zone_device_register()
- used .initial_mode in int340x_thermal_zone, x86_pkg_temp_thermal and int3400_thermal
Andrzej Pietrasiewicz (2):
thermal: core: Let thermal zone device's mode be stored in its struct
thermal: core: Stop polling DISABLED thermal devices
drivers/acpi/thermal.c | 35 ++-------- .../ethernet/mellanox/mlxsw/core_thermal.c | 42 ------------ drivers/platform/x86/acerhdf.c | 17 +---- drivers/thermal/da9062-thermal.c | 11 ---- drivers/thermal/hisi_thermal.c | 6 +- drivers/thermal/imx_thermal.c | 24 ++----- .../intel/int340x_thermal/int3400_thermal.c | 31 ++------- .../int340x_thermal/int340x_thermal_zone.c | 1 + .../thermal/intel/intel_quark_dts_thermal.c | 22 ++----- drivers/thermal/intel/x86_pkg_temp_thermal.c | 1 + drivers/thermal/of-thermal.c | 24 +------ drivers/thermal/rockchip_thermal.c | 6 +- drivers/thermal/sprd_thermal.c | 6 +- drivers/thermal/thermal_core.c | 65 ++++++++++++++++--- drivers/thermal/thermal_core.h | 3 + drivers/thermal/thermal_sysfs.c | 29 +-------- include/linux/thermal.h | 22 ++++++- 17 files changed, 121 insertions(+), 224 deletions(-)
base-commit: 79799562bf087b30d9dd0fddf5bed2d3b038be08
Signature · 1 line
2.17.1
PATCH v3 1/2 thermal: core: Let thermal zone device's mode be stored in its struct
Thermal zone devices' mode is stored in individual drivers. This patch changes it so that mode is stored in struct thermal_zone_device instead.
As a result all driver-specific variables storing the mode are not needed and are removed. Consequently, the get_mode() implementations have nothing to operate on and need to be removed, too.
Some thermal framework functions are introduced:
thermal_zone_device_get_mode()thermal_zone_device_set_mode()thermal_zone_device_enable()thermal_zone_device_disable()
thermal_zone_device_get_mode() and its "set" counterpart take tzd's lock and the "set" calls driver's set_mode() if provided, so the latter must not take this lock again. At the end of the "set" thermal_zone_device_update() is called so drivers don't need to repeat this invocation in their specific set_mode() implementations.
struct thermal_zone_params gains a new member called initial_mode, which is used to set tzd's mode at registration time and if tzp is not provided to thermal_zone_device_register() then it is assumed that the initial mode is THERMAL_DEVICE_ENABLED.
The sysfs "mode" attribute is always exposed from now on, because all thermal zone devices now have their get_mode() implemented at the generic level and it is always available. Exposing "mode" doesn't hurt the drivers which don't provide their own set_mode(), because writing to "mode" will result in -EPERM, as expected.
--- drivers/acpi/thermal.c | 35 ++----------- .../ethernet/mellanox/mlxsw/core_thermal.c | 42 ---------------- drivers/platform/x86/acerhdf.c | 17 ++----- drivers/thermal/da9062-thermal.c | 11 ----- drivers/thermal/hisi_thermal.c | 6 ++- drivers/thermal/imx_thermal.c | 24 ++------- .../intel/int340x_thermal/int3400_thermal.c | 31 ++---------- .../int340x_thermal/int340x_thermal_zone.c | 1 + .../thermal/intel/intel_quark_dts_thermal.c | 22 +++------ drivers/thermal/intel/x86_pkg_temp_thermal.c | 1 + drivers/thermal/of-thermal.c | 24 +-------- drivers/thermal/rockchip_thermal.c | 6 ++- drivers/thermal/sprd_thermal.c | 6 ++- drivers/thermal/thermal_core.c | 49 ++++++++++++++++--- drivers/thermal/thermal_core.h | 3 ++ drivers/thermal/thermal_sysfs.c | 29 ++--------- include/linux/thermal.h | 22 ++++++++- 17 files changed, 107 insertions(+), 222 deletions(-)
drivers/acpi/thermal.c +5 -30
@@ -172,7 +172,6 @@ struct acpi_thermal {struct acpi_thermal_trips trips;struct acpi_handle_list devices;struct thermal_zone_device *thermal_zone; -int tz_enabled;int kelvin_offset;/* in millidegrees */ struct work_struct thermal_check_work; };
@@ -500,7 +499,7 @@ static void acpi_thermal_check(void *data) {struct acpi_thermal *tz = data; -if (!tz->tz_enabled) +if (tz->thermal_zone->mode !=THERMAL_DEVICE_ENABLED )return ; thermal_zone_device_update(tz->thermal_zone,
@@ -526,25 +525,10 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)return 0 ; } -static int thermal_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -struct acpi_thermal *tz = thermal->devdata; - -if (!tz) -return -EINVAL ; - - *mode = tz->tz_enabled ?THERMAL_DEVICE_ENABLED : -THERMAL_DEVICE_DISABLED ; - -return 0 ; -} -static int thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {struct acpi_thermal *tz = thermal->devdata; -int enable;if (!tz)return -EINVAL ;
@@ -552,20 +536,14 @@ static int thermal_set_mode(struct thermal_zone_device *thermal,/* * enable/disable thermal management from ACPI thermal driver */ -if (mode ==THERMAL_DEVICE_ENABLED ) - enable =1 ; -else if (mode ==THERMAL_DEVICE_DISABLED ) { - enable =0 ; +if (mode ==THERMAL_DEVICE_DISABLED )pr_warn ("thermal zone will be disabled\n" ); - }else -return -EINVAL ; -if (enable != tz->tz_enabled) { - tz->tz_enabled = enable; +if (mode != thermal->mode) {ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"%s kernel ACPI thermal control\n" , - tz->tz_enabled ?"Enable" :"Disable" )); -acpi_thermal_check (tz); + mode ==THERMAL_DEVICE_ENABLED ? +"Enable" :"Disable" )); }return 0 ; }
@@ -856,7 +834,6 @@ static struct thermal_zone_device_ops acpi_thermal_zone_ops = { .bind = acpi_thermal_bind_cooling_device, .unbind = acpi_thermal_unbind_cooling_device, .get_temp = thermal_get_temp, - .get_mode = thermal_get_mode, .set_mode = thermal_set_mode, .get_trip_type = thermal_get_trip_type, .get_trip_temp = thermal_get_trip_temp,
@@ -913,8 +890,6 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)if (ACPI_FAILURE (status))return -ENODEV ; - tz->tz_enabled =1 ; -dev_info (&tz->device->dev,"registered as thermal_zone%d\n" , tz->thermal_zone->id);return 0 ;
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +0 -42
123 lines not on this page · raw message
drivers/platform/x86/acerhdf.c +3 -14
@@ -406,22 +406,9 @@ static inline void acerhdf_enable_kernelmode(void) kernelmode =1 ; thz_dev->polling_delay = interval*1000 ; -thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );pr_notice ("kernel mode fan control ON\n" ); } -static int acerhdf_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -if (verbose) -pr_notice ("kernel mode fan control %d\n" , kernelmode); - - *mode = (kernelmode) ?THERMAL_DEVICE_ENABLED - :THERMAL_DEVICE_DISABLED ; - -return 0 ; -} -/* * set operation mode; * enabled: the thermal layer of the kernel takes care about
@@ -488,7 +475,6 @@ static struct thermal_zone_device_ops acerhdf_dev_ops = { .bind = acerhdf_bind, .unbind = acerhdf_unbind, .get_temp = acerhdf_get_ec_temp, - .get_mode = acerhdf_get_mode, .set_mode = acerhdf_set_mode, .get_trip_type = acerhdf_get_trip_type, .get_trip_hyst = acerhdf_get_trip_hyst,
@@ -554,6 +540,7 @@ static int acerhdf_set_cur_state(struct thermal_cooling_device *cdev, err_out:acerhdf_revert_to_bios_mode (); + thz_dev->mode =THERMAL_DEVICE_DISABLED ;return -EINVAL ; }
@@ -739,6 +726,8 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (cl_dev))return -EINVAL ; + acerhdf_zone_params.initial_mode = + kernelmode ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ; thz_dev = thermal_zone_device_register("acerhdf", 2, 0, NULL, &acerhdf_dev_ops, &acerhdf_zone_params, 0,
drivers/thermal/da9062-thermal.c +0 -11
@@ -49,7 +49,6 @@ struct da9062_thermal {struct da9062 *hw;struct delayed_work work;struct thermal_zone_device *zone; -enum thermal_device_mode mode;struct mutex lock;/* protection for da9062_thermal temperature */ int temperature;int irq;
@@ -121,14 +120,6 @@ static irqreturn_t da9062_thermal_irq_handler(int irq, void *data)return IRQ_HANDLED ; } -static int da9062_thermal_get_mode (struct thermal_zone_device *z, -enum thermal_device_mode *mode) -{ -struct da9062_thermal *thermal = z->devdata; - *mode = thermal->mode; -return 0 ; -} -static int da9062_thermal_get_trip_type (struct thermal_zone_device *z,int trip,enum thermal_trip_type *type)
@@ -181,7 +172,6 @@ static int da9062_thermal_get_temp(struct thermal_zone_device *z,static struct thermal_zone_device_ops da9062_thermal_ops = { .get_temp = da9062_thermal_get_temp, - .get_mode = da9062_thermal_get_mode, .get_trip_type = da9062_thermal_get_trip_type, .get_trip_temp = da9062_thermal_get_trip_temp, };
@@ -233,7 +223,6 @@ static int da9062_thermal_probe(struct platform_device *pdev) thermal->config = match->data; thermal->hw = chip; - thermal->mode =THERMAL_DEVICE_ENABLED ; thermal->dev = &pdev->dev;INIT_DELAYED_WORK (&thermal->work, da9062_thermal_poll_on);
drivers/thermal/hisi_thermal.c +4 -2
@@ -549,8 +549,10 @@ static void hisi_thermal_toggle_sensor(struct hisi_thermal_sensor *sensor, {struct thermal_zone_device *tzd = sensor->tzd; - tzd->ops->set_mode (tzd, - on ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ); +if (on) +thermal_zone_device_enable (tzd); +else +thermal_zone_device_disable (tzd); }static int hisi_thermal_probe (struct platform_device *pdev)
drivers/thermal/imx_thermal.c +4 -20
@@ -197,7 +197,6 @@ struct imx_thermal_data {struct cpufreq_policy *policy;struct thermal_zone_device *tz;struct thermal_cooling_device *cdev; -enum thermal_device_mode mode;struct regmap *tempmon;u32 c1, c2;/* See formula in imx_init_calib() */ int temp_passive;
@@ -256,7 +255,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)bool wait;u32 val; -if (data->mode ==THERMAL_DEVICE_ENABLED ) { +if (tz->mode ==THERMAL_DEVICE_ENABLED ) {/* Check if a measurement is currently in progress */ regmap_read (map, soc_data->temp_data, &val); wait = !(val & soc_data->temp_valid_mask);
@@ -283,7 +282,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)regmap_read (map, soc_data->temp_data, &val); -if (data->mode !=THERMAL_DEVICE_ENABLED ) { +if (tz->mode !=THERMAL_DEVICE_ENABLED ) {regmap_write (map, soc_data->sensor_ctrl +REG_CLR , soc_data->measure_temp_mask); regmap_write(map, soc_data->sensor_ctrl + REG_SET,
@@ -331,16 +330,6 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)return 0 ; } -static int imx_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -struct imx_thermal_data *data = tz->devdata; - - *mode = data->mode; - -return 0 ; -} -static int imx_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {
@@ -376,9 +365,6 @@ static int imx_set_mode(struct thermal_zone_device *tz, } } - data->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }
@@ -467,7 +453,6 @@ static struct thermal_zone_device_ops imx_tz_ops = { .bind = imx_bind, .unbind = imx_unbind, .get_temp = imx_get_temp, - .get_mode = imx_get_mode, .set_mode = imx_set_mode, .get_trip_type = imx_get_trip_type, .get_trip_temp = imx_get_trip_temp,
@@ -831,7 +816,6 @@ static int imx_thermal_probe(struct platform_device *pdev) data->socdata->measure_temp_mask); data->irq_enabled = true; - data->mode =THERMAL_DEVICE_ENABLED ; ret = devm_request_threaded_irq(&pdev->dev, data->irq, imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,
@@ -885,7 +869,7 @@ static int __maybe_unused imx_thermal_suspend(struct device *dev) data->socdata->measure_temp_mask);regmap_write (map, data->socdata->sensor_ctrl +REG_SET , data->socdata->power_down_mask); - data->mode =THERMAL_DEVICE_DISABLED ; +thermal_zone_device_disable (data->tz);clk_disable_unprepare (data->thermal_clk);return 0 ;
@@ -905,7 +889,7 @@ static int __maybe_unused imx_thermal_resume(struct device *dev) data->socdata->power_down_mask);regmap_write (map, data->socdata->sensor_ctrl +REG_SET , data->socdata->measure_temp_mask); - data->mode =THERMAL_DEVICE_ENABLED ; +thermal_zone_device_enable (data->tz);return 0 ; }
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +4 -27
@@ -44,7 +44,6 @@ static char *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = {struct int3400_thermal_priv {struct acpi_device *adev;struct thermal_zone_device *thermal; -int mode;int art_count;struct art *arts;int trt_count;
@@ -230,54 +229,32 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal,return 0 ; } -static int int3400_thermal_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -struct int3400_thermal_priv *priv = thermal->devdata; - -if (!priv) -return -EINVAL ; - - *mode = priv->mode; - -return 0 ; -} -static int int3400_thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {struct int3400_thermal_priv *priv = thermal->devdata; -bool enable;int result =0 ;if (!priv)return -EINVAL ; -if (mode ==THERMAL_DEVICE_ENABLED ) - enable = true; -else if (mode ==THERMAL_DEVICE_DISABLED ) - enable = false; -else -return -EINVAL ; - -if (enable != priv->mode) { - priv->mode = enable; +if (mode != thermal->mode) { result =int3400_thermal_run_osc (priv->adev->handle, - priv->current_uuid_index, - enable); + priv->current_uuid_index, + mode ==THERMAL_DEVICE_ENABLED ); }return result; }static struct thermal_zone_device_ops int3400_thermal_ops = { .get_temp = int3400_thermal_get_temp, - .get_mode = int3400_thermal_get_mode, .set_mode = int3400_thermal_set_mode, };static struct thermal_zone_params int3400_thermal_params = { .governor_name ="user_space" , .no_hwmon = true, + .initial_mode =THERMAL_ZONE_DISABLED , };static int int3400_thermal_probe (struct platform_device *pdev)
drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +1 -0
@@ -208,6 +208,7 @@ EXPORT_SYMBOL_GPL(int340x_thermal_read_trips);static struct thermal_zone_params int340x_thermal_params = { .governor_name ="user_space" , .no_hwmon = true, + .initial_mode =THERMAL_DEVICE_ENABLED , }; struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev,
drivers/thermal/intel/intel_quark_dts_thermal.c +6 -16
@@ -103,7 +103,6 @@ struct soc_sensor_entry {bool locked;u32 store_ptps;u32 store_dts_enable; -enum thermal_device_mode mode;struct thermal_zone_device *tzone; };
@@ -128,7 +127,7 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)return ret;if (out &QRK_DTS_ENABLE_BIT ) { - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }
@@ -139,9 +138,9 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)if (ret)return ret; - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ; }else { - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ;pr_info ("DTS is locked. Cannot enable DTS\n" ); ret = -EPERM ; }
@@ -161,7 +160,7 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)return ret;if (!(out &QRK_DTS_ENABLE_BIT )) { - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ;return 0 ; }
@@ -173,9 +172,9 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)if (ret)return ret; - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ; }else { - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ;pr_info ("DTS is locked. Cannot disable DTS\n" ); ret = -EPERM ; }
@@ -309,14 +308,6 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,return 0 ; } -static int sys_get_mode (struct thermal_zone_device *tzd, -enum thermal_device_mode *mode) -{ -struct soc_sensor_entry *aux_entry = tzd->devdata; - *mode = aux_entry->mode; -return 0 ; -} -static int sys_set_mode (struct thermal_zone_device *tzd,enum thermal_device_mode mode) {
@@ -338,7 +329,6 @@ static struct thermal_zone_device_ops tzone_ops = { .get_trip_type = sys_get_trip_type, .set_trip_temp = sys_set_trip_temp, .get_crit_temp = sys_get_crit_temp, - .get_mode = sys_get_mode, .set_mode = sys_set_mode, };
drivers/thermal/intel/x86_pkg_temp_thermal.c +1 -0
@@ -56,6 +56,7 @@ struct zone_device {static struct thermal_zone_params pkg_temp_tz_params = { .no_hwmon = true, + .initial_mode =THERMAL_DEVICE_ENABLED , };/* Keep track of how many zone pointers we allocated in init() */
drivers/thermal/of-thermal.c +2 -22
@@ -51,7 +51,6 @@ struct __thermal_bind_params {/** * struct __thermal_zone - internal representation of a thermal zone -* @mode: current thermal zone device mode (enabled/disabled) * @passive_delay: polling interval while passive cooling is activated * @polling_delay: zone polling interval * @slope: slope of the temperature adjustment curve
@@ -65,7 +64,6 @@ struct __thermal_bind_params {*/ struct __thermal_zone { -enum thermal_device_mode mode;int passive_delay;int polling_delay;int slope;
@@ -269,23 +267,11 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,return 0 ; } -static int of_thermal_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -struct __thermal_zone *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 *data = tz->devdata; -mutex_lock (&tz->lock); -if (mode ==THERMAL_DEVICE_ENABLED ) { tz->polling_delay = data->polling_delay; tz->passive_delay = data->passive_delay;
@@ -294,11 +280,6 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz, tz->passive_delay =0 ; } -mutex_unlock (&tz->lock); - - data->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }
@@ -393,7 +374,6 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz, }static struct thermal_zone_device_ops of_thermal_ops = { - .get_mode = of_thermal_get_mode, .set_mode = of_thermal_set_mode, .get_trip_type = of_thermal_get_trip_type,
@@ -554,7 +534,7 @@ thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data, tzd =thermal_zone_of_add_sensor (child, sensor_np, data, ops);if (!IS_ERR (tzd)) - tzd->ops->set_mode (tzd,THERMAL_DEVICE_ENABLED ); +thermal_zone_device_enable (tzd);of_node_put (child); goto exit;
@@ -979,7 +959,6 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) finish:of_node_put (child); - tz->mode =THERMAL_DEVICE_DISABLED ;return tz;
@@ -1120,6 +1099,7 @@ int __init of_parse_thermal_zones(void)/* these two are left for temperature drivers to use */ tzp->slope = tz->slope; tzp->offset = tz->offset; + tzp->initial_mode =THERMAL_DEVICE_DISABLED ; zone = thermal_zone_device_register(child->name, tz->ntrips, mask, tz,
drivers/thermal/rockchip_thermal.c +4 -2
@@ -1068,8 +1068,10 @@ rockchip_thermal_toggle_sensor(struct rockchip_thermal_sensor *sensor, bool on) {struct thermal_zone_device *tzd = sensor->tzd; - tzd->ops->set_mode (tzd, - on ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ); +if (on) +thermal_zone_device_enable (tzd); +else +thermal_zone_device_disable (tzd); }static irqreturn_t rockchip_thermal_alarm_irq_thread (int irq,void *dev)
drivers/thermal/sprd_thermal.c +4 -2
@@ -322,8 +322,10 @@ static void sprd_thm_toggle_sensor(struct sprd_thermal_sensor *sen, bool on) {struct thermal_zone_device *tzd = sen->tzd; - tzd->ops->set_mode (tzd, - on ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ); +if (on) +thermal_zone_device_enable (tzd); +else +thermal_zone_device_disable (tzd); }static int sprd_thm_probe (struct platform_device *pdev)
drivers/thermal/thermal_core.c +43 -6
73 lines not on this page · raw message
drivers/thermal/thermal_core.h +3 -0
@@ -141,6 +141,9 @@ thermal_cooling_device_stats_update(struct thermal_cooling_device *cdev, unsigned long new_state) {}#endif /* CONFIG_THERMAL_STATISTICS */ +enum thermal_device_mode +thermal_zone_device_get_mode (struct thermal_zone_device *tz); +/* device tree support */ #ifdef CONFIG_THERMAL_OF int of_parse_thermal_zones (void );
drivers/thermal/thermal_sysfs.c +3 -26
@@ -50,14 +50,8 @@ mode_show(struct device *dev, struct device_attribute *attr, char *buf) {struct thermal_zone_device *tz =to_thermal_zone (dev);enum thermal_device_mode mode; -int result; - -if (!tz->ops->get_mode) -return -EPERM ; - result = tz->ops->get_mode (tz, &mode); -if (result) -return result; + mode =thermal_zone_device_get_mode (tz);return sprintf (buf,"%s\n" , mode ==THERMAL_DEVICE_ENABLED ?"enabled" :"disabled" );
@@ -74,9 +68,9 @@ mode_store(struct device *dev, struct device_attribute *attr,return -EPERM ;if (!strncmp (buf,"enabled" ,sizeof ("enabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_ENABLED ); + result =thermal_zone_device_enable (tz);else if (!strncmp (buf,"disabled" ,sizeof ("disabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_DISABLED ); + result =thermal_zone_device_disable (tz);else result = -EINVAL ;
@@ -428,30 +422,13 @@ static struct attribute_group thermal_zone_attribute_group = { .attrs = thermal_zone_dev_attrs, }; -/* We expose mode only if .get_mode is present */ static struct attribute *thermal_zone_mode_attrs[] = { &dev_attr_mode.attr,NULL , }; -static umode_t thermal_zone_mode_is_visible (struct kobject *kobj, -struct attribute *attr, -int attrno) -{ - struct device *dev = container_of(kobj, struct device, kobj); -struct thermal_zone_device *tz; - - tz = container_of(dev, struct thermal_zone_device, device); - -if (tz->ops->get_mode) -return attr->mode; - -return 0 ; -} -static struct attribute_group thermal_zone_mode_attribute_group = { .attrs = thermal_zone_mode_attrs, - .is_visible = thermal_zone_mode_is_visible, };/* We expose passive only if passive trips are present */
include/linux/thermal.h +20 -2
@@ -76,8 +76,6 @@ struct thermal_zone_device_ops { struct thermal_cooling_device *);int (*get_temp) (struct thermal_zone_device *,int *);int (*set_trips) (struct thermal_zone_device *,int ,int ); -int (*get_mode) (struct thermal_zone_device *, -enum thermal_device_mode *);int (*set_mode) (struct thermal_zone_device *,enum thermal_device_mode ); int (*get_trip_type) (struct thermal_zone_device *, int,
@@ -128,6 +126,7 @@ struct thermal_cooling_device {* @trip_temp_attrs: attributes for trip points for sysfs: trip temperature * @trip_type_attrs: attributes for trip points for sysfs: trip type * @trip_hyst_attrs: attributes for trip points for sysfs: trip hysteresis +* @mode: current mode of this thermal zone * @devdata: private pointer for device private data * @trips: number of trip points the thermal zone supports * @trips_disabled; bitmap for disabled trips
@@ -170,6 +169,7 @@ struct thermal_zone_device {struct thermal_attr *trip_temp_attrs;struct thermal_attr *trip_type_attrs;struct thermal_attr *trip_hyst_attrs; +enum thermal_device_mode mode;void *devdata;int trips;unsigned long trips_disabled;/* bitmap for disabled trips */
@@ -264,6 +264,9 @@ struct thermal_zone_params {int num_tbps;/* Number of tbp entries */ struct thermal_bind_params *tbp; +/* Initial mode of this thermal zone device */ +enum thermal_device_mode initial_mode; +/* * Sustainable power (heat) that this thermal zone can dissipate in * mW
@@ -395,6 +398,8 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int, unsigned int);int thermal_zone_unbind_cooling_device (struct thermal_zone_device *,int ,struct thermal_cooling_device *); +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode);void thermal_zone_device_update (struct thermal_zone_device *,enum thermal_notify_event );
@@ -426,6 +431,9 @@ static inline struct thermal_zone_device *thermal_zone_device_register(static inline void thermal_zone_device_unregister (struct thermal_zone_device *tz) { } +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) +{ return -EINVAL }static inline struct thermal_cooling_device *thermal_cooling_device_register (char *type,void *devdata,const struct thermal_cooling_device_ops *ops)
@@ -465,4 +473,14 @@ static inline void thermal_notify_framework(struct thermal_zone_device *tz, { }#endif /* CONFIG_THERMAL */ +static inline int thermal_zone_device_enable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_ENABLED ); +} + +static inline int thermal_zone_device_disable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_DISABLED ); +} +#endif /* __THERMAL_H__ */
Signature · 1 line
2.17.1
kbuild test robot
build botRe: [PATCH 1/2] thermal: core: Let thermal zone device's mode be stored in its struct
I love your patch! Yet something to improve:
Hi Andrzej,
I love your patch! Yet something to improve:
[auto build test ERROR on 79799562bf087b30d9dd0fddf5bed2d3b038be08]
url: https://github.com/0day-ci/linux/commits/Andrzej-Pietrasiewicz/Stop-monitoring-disabled-devices/20200422-133553 base: 79799562bf087b30d9dd0fddf5bed2d3b038be08 config: arm-iop32x_defconfig (attached as .config) compiler: arm-linux-gnueabi-gcc (GCC) 9.3.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day GCC_VERSION=9.3.0 make.cross ARCH=arm
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
In file included from drivers/hwmon/hwmon.c:22:
include/linux/thermal.h: In function 'thermal_zone_device_set_mode':
>> include/linux/thermal.h:436:18: error: expected ';' before '}' token
436 | { return -EINVAL }
| ^vim +436 include/linux/thermal.h
421
422 void thermal_cdev_update(struct thermal_cooling_device *);
423 void thermal_notify_framework(struct thermal_zone_device *, int);
424 #else
425 static inline struct thermal_zone_device *thermal_zone_device_register(
426 const char *type, int trips, int mask, void *devdata,
427 struct thermal_zone_device_ops *ops,
428 struct thermal_zone_params *tzp,
429 int passive_delay, int polling_delay)
430 { return ERR_PTR(-ENODEV); }
431 static inline void thermal_zone_device_unregister(
432 struct thermal_zone_device *tz)
433 { }
434 int thermal_zone_device_set_mode(struct thermal_zone_device *tz,
435 enum thermal_device_mode mode)
> 436 { return -EINVAL } 437 static inline struct thermal_cooling_device *
438 thermal_cooling_device_register(char *type, void *devdata,
439 const struct thermal_cooling_device_ops *ops)
440 { return ERR_PTR(-ENODEV); }
441 static inline struct thermal_cooling_device *
442 thermal_of_cooling_device_register(struct device_node *np,
443 char *type, void *devdata, const struct thermal_cooling_device_ops *ops)
444 { return ERR_PTR(-ENODEV); }
445 static inline struct thermal_cooling_device *
446 devm_thermal_of_cooling_device_register(struct device *dev,
447 struct device_node *np,
448 char *type, void *devdata,
449 const struct thermal_cooling_device_ops *ops)
450 {
451 return ERR_PTR(-ENODEV);
452 }
453 static inline void thermal_cooling_device_unregister(
454 struct thermal_cooling_device *cdev)
455 { }
456 static inline struct thermal_zone_device *thermal_zone_get_zone_by_name(
457 const char *name)
458 { return ERR_PTR(-ENODEV); }
459 static inline int thermal_zone_get_temp(
460 struct thermal_zone_device *tz, int *temp)
461 { return -ENODEV; }
462 static inline int thermal_zone_get_slope(
463 struct thermal_zone_device *tz)
464 { return -ENODEV; }
465 static inline int thermal_zone_get_offset(
466 struct thermal_zone_device *tz)
467 { return -ENODEV; }
468
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Re: [PATCH 1/2] thermal: core: Let thermal zone device's mode be stored in its struct
W dniu 22.04.2020 o 09:49, kbuild test robot pisze:
Quoted 19 lines
Hi Andrzej,
I love your patch! Yet something to improve:
[auto build test ERROR on
79799562bf087b30d9dd0fddf5bed2d3b038be08]url: https://github.com/0day-ci/linux/commits/Andrzej-Pietrasiewicz/Stop-monitoring-disabled-devices/20200422-133553 base: 79799562bf087b30d9dd0fddf5bed2d3b038be08 config: arm-iop32x_defconfig (attached as .config) compiler: arm-linux-gnueabi-gcc (GCC) 9.3.0reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day GCC_VERSION=9.3.0 make.cross ARCH=armIf you fix the issue, kindly add following tag as appropriate
Reported-by kbuild test robot <[email protected]>
Quoted 8 lines
All errors (new ones prefixed by >>):
In file included from
drivers/hwmon/hwmon.c:22:
include/linux/thermal.h: In function 'thermal_zone_device_set_mode':Quoted 1 line
Quoted 1 line
include/linux/thermal.h:436:18: error: expected ';' before '}' token436 | { return -EINVAL } | ^
Addressed in PATCH RESEND 1/2, in reply to PATCH 1/2.
Andrzej
kbuild test robot
build botRe: [PATCH 1/2] thermal: core: Let thermal zone device's mode be stored in its struct
In reply to Andrzej PietrasiewiczI love your patch! Yet something to improve:
Hi Andrzej,
I love your patch! Yet something to improve:
[auto build test ERROR on 79799562bf087b30d9dd0fddf5bed2d3b038be08]
url: https://github.com/0day-ci/linux/commits/Andrzej-Pietrasiewicz/Stop-monitoring-disabled-devices/20200422-133553 base: 79799562bf087b30d9dd0fddf5bed2d3b038be08 config: i386-allyesconfig (attached as .config) compiler: gcc-7 (Ubuntu 7.5.0-6ubuntu2) 7.5.0 reproduce: # save the attached .config to linux build tree make ARCH=i386
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> drivers/thermal/intel/int340x_thermal/int3400_thermal.c:257:18: error: 'THERMAL_ZONE_DISABLED' undeclared here (not in a function); did you mean 'THERMAL_DEVICE_DISABLED'?
.initial_mode = THERMAL_ZONE_DISABLED,
^~~~~~~~~~~~~~~~~~~~~
THERMAL_DEVICE_DISABLED
vim +257 drivers/thermal/intel/int340x_thermal/int3400_thermal.c
253
254 static struct thermal_zone_params int3400_thermal_params = {
255 .governor_name = "user_space",
256 .no_hwmon = true,
> 257 .initial_mode = THERMAL_ZONE_DISABLED,
258 };
259
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Re: [PATCH 1/2] thermal: core: Let thermal zone device's mode be stored in its struct
W dniu 22.04.2020 o 19:03, kbuild test robot pisze:
Quoted 15 lines
Hi Andrzej,
I love your patch! Yet something to improve:
[auto build test ERROR on
79799562bf087b30d9dd0fddf5bed2d3b038be08]url: https://github.com/0day-ci/linux/commits/Andrzej-Pietrasiewicz/Stop-monitoring-disabled-devices/20200422-133553 base: 79799562bf087b30d9dd0fddf5bed2d3b038be08 config: i386-allyesconfig (attached as .config) compiler: gcc-7 (Ubuntu 7.5.0-6ubuntu2) 7.5.0 reproduce: # save the attached .config to linux build tree make ARCH=i386If you fix the issue, kindly add following tag as appropriate
Quoted 8 lines
Reported-by kbuild test robot <[email protected]>All errors (new ones prefixed by >>):
Quoted 1 line
Quoted 1 line
drivers/thermal/intel/int340x_thermal/int3400_thermal.c:257:18: error: 'THERMAL_ZONE_DISABLED' undeclared here (not in a function); did you mean 'THERMAL_DEVICE_DISABLED'?.initial_mode =
THERMAL_ZONE_DISABLED,
^~~~~~~~~~~~~~~~~~~~~
THERMAL_DEVICE_DISABLED
Addressed in PATCH RESEND 1/2, in reply to PATCH 1/2.
Andrzej
PATCH RESEND v3 1/2 thermal: core: Let thermal zone device's mode be stored in its struct
In reply to Andrzej PietrasiewiczThermal zone devices' mode is stored in individual drivers. This patch changes it so that mode is stored in struct thermal_zone_device instead.
As a result all driver-specific variables storing the mode are not needed and are removed. Consequently, the get_mode() implementations have nothing to operate on and need to be removed, too.
Some thermal framework functions are introduced:
thermal_zone_device_get_mode()thermal_zone_device_set_mode()thermal_zone_device_enable()thermal_zone_device_disable()
thermal_zone_device_get_mode() and its "set" counterpart take tzd's lock and the "set" calls driver's set_mode() if provided, so the latter must not take this lock again. At the end of the "set" thermal_zone_device_update() is called so drivers don't need to repeat this invocation in their specific set_mode() implementations.
struct thermal_zone_params gains a new member called initial_mode, which is used to set tzd's mode at registration time and if tzp is not provided to thermal_zone_device_register() then it is assumed that the initial mode is THERMAL_DEVICE_ENABLED.
The sysfs "mode" attribute is always exposed from now on, because all thermal zone devices now have their get_mode() implemented at the generic level and it is always available. Exposing "mode" doesn't hurt the drivers which don't provide their own set_mode(), because writing to "mode" will result in -EPERM, as expected.
---
Fixed two typos:
- one found by kbuild test robot <[email protected]> (missing semicolon in dummy implementation of thermal_zone_device_set_mode()
- one found by myself (.initial_mode in int3400_thermal_params set to a nonexistent THERMAL_ZONE_DISABLED - should be THERMAL_DEVICE_DISABLED)
drivers/acpi/thermal.c | 35 ++----------- .../ethernet/mellanox/mlxsw/core_thermal.c | 42 ---------------- drivers/platform/x86/acerhdf.c | 17 ++----- drivers/thermal/da9062-thermal.c | 11 ----- drivers/thermal/hisi_thermal.c | 6 ++- drivers/thermal/imx_thermal.c | 24 ++------- .../intel/int340x_thermal/int3400_thermal.c | 31 ++---------- .../int340x_thermal/int340x_thermal_zone.c | 1 + .../thermal/intel/intel_quark_dts_thermal.c | 22 +++------ drivers/thermal/intel/x86_pkg_temp_thermal.c | 1 + drivers/thermal/of-thermal.c | 24 +-------- drivers/thermal/rockchip_thermal.c | 6 ++- drivers/thermal/sprd_thermal.c | 6 ++- drivers/thermal/thermal_core.c | 49 ++++++++++++++++--- drivers/thermal/thermal_core.h | 3 ++ drivers/thermal/thermal_sysfs.c | 29 ++--------- include/linux/thermal.h | 22 ++++++++- 17 files changed, 107 insertions(+), 222 deletions(-)
drivers/acpi/thermal.c +5 -30
@@ -172,7 +172,6 @@ struct acpi_thermal {struct acpi_thermal_trips trips;struct acpi_handle_list devices;struct thermal_zone_device *thermal_zone; -int tz_enabled;int kelvin_offset;/* in millidegrees */ struct work_struct thermal_check_work; };
@@ -500,7 +499,7 @@ static void acpi_thermal_check(void *data) {struct acpi_thermal *tz = data; -if (!tz->tz_enabled) +if (tz->thermal_zone->mode !=THERMAL_DEVICE_ENABLED )return ; thermal_zone_device_update(tz->thermal_zone,
@@ -526,25 +525,10 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)return 0 ; } -static int thermal_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -struct acpi_thermal *tz = thermal->devdata; - -if (!tz) -return -EINVAL ; - - *mode = tz->tz_enabled ?THERMAL_DEVICE_ENABLED : -THERMAL_DEVICE_DISABLED ; - -return 0 ; -} -static int thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {struct acpi_thermal *tz = thermal->devdata; -int enable;if (!tz)return -EINVAL ;
@@ -552,20 +536,14 @@ static int thermal_set_mode(struct thermal_zone_device *thermal,/* * enable/disable thermal management from ACPI thermal driver */ -if (mode ==THERMAL_DEVICE_ENABLED ) - enable =1 ; -else if (mode ==THERMAL_DEVICE_DISABLED ) { - enable =0 ; +if (mode ==THERMAL_DEVICE_DISABLED )pr_warn ("thermal zone will be disabled\n" ); - }else -return -EINVAL ; -if (enable != tz->tz_enabled) { - tz->tz_enabled = enable; +if (mode != thermal->mode) {ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"%s kernel ACPI thermal control\n" , - tz->tz_enabled ?"Enable" :"Disable" )); -acpi_thermal_check (tz); + mode ==THERMAL_DEVICE_ENABLED ? +"Enable" :"Disable" )); }return 0 ; }
@@ -856,7 +834,6 @@ static struct thermal_zone_device_ops acpi_thermal_zone_ops = { .bind = acpi_thermal_bind_cooling_device, .unbind = acpi_thermal_unbind_cooling_device, .get_temp = thermal_get_temp, - .get_mode = thermal_get_mode, .set_mode = thermal_set_mode, .get_trip_type = thermal_get_trip_type, .get_trip_temp = thermal_get_trip_temp,
@@ -913,8 +890,6 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)if (ACPI_FAILURE (status))return -ENODEV ; - tz->tz_enabled =1 ; -dev_info (&tz->device->dev,"registered as thermal_zone%d\n" , tz->thermal_zone->id);return 0 ;
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +0 -42
123 lines not on this page · raw message
drivers/platform/x86/acerhdf.c +3 -14
@@ -406,22 +406,9 @@ static inline void acerhdf_enable_kernelmode(void) kernelmode =1 ; thz_dev->polling_delay = interval*1000 ; -thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );pr_notice ("kernel mode fan control ON\n" ); } -static int acerhdf_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -if (verbose) -pr_notice ("kernel mode fan control %d\n" , kernelmode); - - *mode = (kernelmode) ?THERMAL_DEVICE_ENABLED - :THERMAL_DEVICE_DISABLED ; - -return 0 ; -} -/* * set operation mode; * enabled: the thermal layer of the kernel takes care about
@@ -488,7 +475,6 @@ static struct thermal_zone_device_ops acerhdf_dev_ops = { .bind = acerhdf_bind, .unbind = acerhdf_unbind, .get_temp = acerhdf_get_ec_temp, - .get_mode = acerhdf_get_mode, .set_mode = acerhdf_set_mode, .get_trip_type = acerhdf_get_trip_type, .get_trip_hyst = acerhdf_get_trip_hyst,
@@ -554,6 +540,7 @@ static int acerhdf_set_cur_state(struct thermal_cooling_device *cdev, err_out:acerhdf_revert_to_bios_mode (); + thz_dev->mode =THERMAL_DEVICE_DISABLED ;return -EINVAL ; }
@@ -739,6 +726,8 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (cl_dev))return -EINVAL ; + acerhdf_zone_params.initial_mode = + kernelmode ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ; thz_dev = thermal_zone_device_register("acerhdf", 2, 0, NULL, &acerhdf_dev_ops, &acerhdf_zone_params, 0,
drivers/thermal/da9062-thermal.c +0 -11
@@ -49,7 +49,6 @@ struct da9062_thermal {struct da9062 *hw;struct delayed_work work;struct thermal_zone_device *zone; -enum thermal_device_mode mode;struct mutex lock;/* protection for da9062_thermal temperature */ int temperature;int irq;
@@ -121,14 +120,6 @@ static irqreturn_t da9062_thermal_irq_handler(int irq, void *data)return IRQ_HANDLED ; } -static int da9062_thermal_get_mode (struct thermal_zone_device *z, -enum thermal_device_mode *mode) -{ -struct da9062_thermal *thermal = z->devdata; - *mode = thermal->mode; -return 0 ; -} -static int da9062_thermal_get_trip_type (struct thermal_zone_device *z,int trip,enum thermal_trip_type *type)
@@ -181,7 +172,6 @@ static int da9062_thermal_get_temp(struct thermal_zone_device *z,static struct thermal_zone_device_ops da9062_thermal_ops = { .get_temp = da9062_thermal_get_temp, - .get_mode = da9062_thermal_get_mode, .get_trip_type = da9062_thermal_get_trip_type, .get_trip_temp = da9062_thermal_get_trip_temp, };
@@ -233,7 +223,6 @@ static int da9062_thermal_probe(struct platform_device *pdev) thermal->config = match->data; thermal->hw = chip; - thermal->mode =THERMAL_DEVICE_ENABLED ; thermal->dev = &pdev->dev;INIT_DELAYED_WORK (&thermal->work, da9062_thermal_poll_on);
drivers/thermal/hisi_thermal.c +4 -2
@@ -549,8 +549,10 @@ static void hisi_thermal_toggle_sensor(struct hisi_thermal_sensor *sensor, {struct thermal_zone_device *tzd = sensor->tzd; - tzd->ops->set_mode (tzd, - on ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ); +if (on) +thermal_zone_device_enable (tzd); +else +thermal_zone_device_disable (tzd); }static int hisi_thermal_probe (struct platform_device *pdev)
drivers/thermal/imx_thermal.c +4 -20
@@ -197,7 +197,6 @@ struct imx_thermal_data {struct cpufreq_policy *policy;struct thermal_zone_device *tz;struct thermal_cooling_device *cdev; -enum thermal_device_mode mode;struct regmap *tempmon;u32 c1, c2;/* See formula in imx_init_calib() */ int temp_passive;
@@ -256,7 +255,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)bool wait;u32 val; -if (data->mode ==THERMAL_DEVICE_ENABLED ) { +if (tz->mode ==THERMAL_DEVICE_ENABLED ) {/* Check if a measurement is currently in progress */ regmap_read (map, soc_data->temp_data, &val); wait = !(val & soc_data->temp_valid_mask);
@@ -283,7 +282,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)regmap_read (map, soc_data->temp_data, &val); -if (data->mode !=THERMAL_DEVICE_ENABLED ) { +if (tz->mode !=THERMAL_DEVICE_ENABLED ) {regmap_write (map, soc_data->sensor_ctrl +REG_CLR , soc_data->measure_temp_mask); regmap_write(map, soc_data->sensor_ctrl + REG_SET,
@@ -331,16 +330,6 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)return 0 ; } -static int imx_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -struct imx_thermal_data *data = tz->devdata; - - *mode = data->mode; - -return 0 ; -} -static int imx_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {
@@ -376,9 +365,6 @@ static int imx_set_mode(struct thermal_zone_device *tz, } } - data->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }
@@ -467,7 +453,6 @@ static struct thermal_zone_device_ops imx_tz_ops = { .bind = imx_bind, .unbind = imx_unbind, .get_temp = imx_get_temp, - .get_mode = imx_get_mode, .set_mode = imx_set_mode, .get_trip_type = imx_get_trip_type, .get_trip_temp = imx_get_trip_temp,
@@ -831,7 +816,6 @@ static int imx_thermal_probe(struct platform_device *pdev) data->socdata->measure_temp_mask); data->irq_enabled = true; - data->mode =THERMAL_DEVICE_ENABLED ; ret = devm_request_threaded_irq(&pdev->dev, data->irq, imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,
@@ -885,7 +869,7 @@ static int __maybe_unused imx_thermal_suspend(struct device *dev) data->socdata->measure_temp_mask);regmap_write (map, data->socdata->sensor_ctrl +REG_SET , data->socdata->power_down_mask); - data->mode =THERMAL_DEVICE_DISABLED ; +thermal_zone_device_disable (data->tz);clk_disable_unprepare (data->thermal_clk);return 0 ;
@@ -905,7 +889,7 @@ static int __maybe_unused imx_thermal_resume(struct device *dev) data->socdata->power_down_mask);regmap_write (map, data->socdata->sensor_ctrl +REG_SET , data->socdata->measure_temp_mask); - data->mode =THERMAL_DEVICE_ENABLED ; +thermal_zone_device_enable (data->tz);return 0 ; }
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +4 -27
@@ -44,7 +44,6 @@ static char *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = {struct int3400_thermal_priv {struct acpi_device *adev;struct thermal_zone_device *thermal; -int mode;int art_count;struct art *arts;int trt_count;
@@ -230,54 +229,32 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal,return 0 ; } -static int int3400_thermal_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -struct int3400_thermal_priv *priv = thermal->devdata; - -if (!priv) -return -EINVAL ; - - *mode = priv->mode; - -return 0 ; -} -static int int3400_thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {struct int3400_thermal_priv *priv = thermal->devdata; -bool enable;int result =0 ;if (!priv)return -EINVAL ; -if (mode ==THERMAL_DEVICE_ENABLED ) - enable = true; -else if (mode ==THERMAL_DEVICE_DISABLED ) - enable = false; -else -return -EINVAL ; - -if (enable != priv->mode) { - priv->mode = enable; +if (mode != thermal->mode) { result =int3400_thermal_run_osc (priv->adev->handle, - priv->current_uuid_index, - enable); + priv->current_uuid_index, + mode ==THERMAL_DEVICE_ENABLED ); }return result; }static struct thermal_zone_device_ops int3400_thermal_ops = { .get_temp = int3400_thermal_get_temp, - .get_mode = int3400_thermal_get_mode, .set_mode = int3400_thermal_set_mode, };static struct thermal_zone_params int3400_thermal_params = { .governor_name ="user_space" , .no_hwmon = true, + .initial_mode =THERMAL_DEVICE_DISABLED , };static int int3400_thermal_probe (struct platform_device *pdev)
drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +1 -0
@@ -208,6 +208,7 @@ EXPORT_SYMBOL_GPL(int340x_thermal_read_trips);static struct thermal_zone_params int340x_thermal_params = { .governor_name ="user_space" , .no_hwmon = true, + .initial_mode =THERMAL_DEVICE_ENABLED , }; struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev,
drivers/thermal/intel/intel_quark_dts_thermal.c +6 -16
@@ -103,7 +103,6 @@ struct soc_sensor_entry {bool locked;u32 store_ptps;u32 store_dts_enable; -enum thermal_device_mode mode;struct thermal_zone_device *tzone; };
@@ -128,7 +127,7 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)return ret;if (out &QRK_DTS_ENABLE_BIT ) { - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }
@@ -139,9 +138,9 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)if (ret)return ret; - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ; }else { - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ;pr_info ("DTS is locked. Cannot enable DTS\n" ); ret = -EPERM ; }
@@ -161,7 +160,7 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)return ret;if (!(out &QRK_DTS_ENABLE_BIT )) { - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ;return 0 ; }
@@ -173,9 +172,9 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)if (ret)return ret; - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ; }else { - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ;pr_info ("DTS is locked. Cannot disable DTS\n" ); ret = -EPERM ; }
@@ -309,14 +308,6 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,return 0 ; } -static int sys_get_mode (struct thermal_zone_device *tzd, -enum thermal_device_mode *mode) -{ -struct soc_sensor_entry *aux_entry = tzd->devdata; - *mode = aux_entry->mode; -return 0 ; -} -static int sys_set_mode (struct thermal_zone_device *tzd,enum thermal_device_mode mode) {
@@ -338,7 +329,6 @@ static struct thermal_zone_device_ops tzone_ops = { .get_trip_type = sys_get_trip_type, .set_trip_temp = sys_set_trip_temp, .get_crit_temp = sys_get_crit_temp, - .get_mode = sys_get_mode, .set_mode = sys_set_mode, };
drivers/thermal/intel/x86_pkg_temp_thermal.c +1 -0
@@ -56,6 +56,7 @@ struct zone_device {static struct thermal_zone_params pkg_temp_tz_params = { .no_hwmon = true, + .initial_mode =THERMAL_DEVICE_ENABLED , };/* Keep track of how many zone pointers we allocated in init() */
drivers/thermal/of-thermal.c +2 -22
@@ -51,7 +51,6 @@ struct __thermal_bind_params {/** * struct __thermal_zone - internal representation of a thermal zone -* @mode: current thermal zone device mode (enabled/disabled) * @passive_delay: polling interval while passive cooling is activated * @polling_delay: zone polling interval * @slope: slope of the temperature adjustment curve
@@ -65,7 +64,6 @@ struct __thermal_bind_params {*/ struct __thermal_zone { -enum thermal_device_mode mode;int passive_delay;int polling_delay;int slope;
@@ -269,23 +267,11 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,return 0 ; } -static int of_thermal_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -struct __thermal_zone *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 *data = tz->devdata; -mutex_lock (&tz->lock); -if (mode ==THERMAL_DEVICE_ENABLED ) { tz->polling_delay = data->polling_delay; tz->passive_delay = data->passive_delay;
@@ -294,11 +280,6 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz, tz->passive_delay =0 ; } -mutex_unlock (&tz->lock); - - data->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }
@@ -393,7 +374,6 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz, }static struct thermal_zone_device_ops of_thermal_ops = { - .get_mode = of_thermal_get_mode, .set_mode = of_thermal_set_mode, .get_trip_type = of_thermal_get_trip_type,
@@ -554,7 +534,7 @@ thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data, tzd =thermal_zone_of_add_sensor (child, sensor_np, data, ops);if (!IS_ERR (tzd)) - tzd->ops->set_mode (tzd,THERMAL_DEVICE_ENABLED ); +thermal_zone_device_enable (tzd);of_node_put (child); goto exit;
@@ -979,7 +959,6 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) finish:of_node_put (child); - tz->mode =THERMAL_DEVICE_DISABLED ;return tz;
@@ -1120,6 +1099,7 @@ int __init of_parse_thermal_zones(void)/* these two are left for temperature drivers to use */ tzp->slope = tz->slope; tzp->offset = tz->offset; + tzp->initial_mode =THERMAL_DEVICE_DISABLED ; zone = thermal_zone_device_register(child->name, tz->ntrips, mask, tz,
drivers/thermal/rockchip_thermal.c +4 -2
@@ -1068,8 +1068,10 @@ rockchip_thermal_toggle_sensor(struct rockchip_thermal_sensor *sensor, bool on) {struct thermal_zone_device *tzd = sensor->tzd; - tzd->ops->set_mode (tzd, - on ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ); +if (on) +thermal_zone_device_enable (tzd); +else +thermal_zone_device_disable (tzd); }static irqreturn_t rockchip_thermal_alarm_irq_thread (int irq,void *dev)
drivers/thermal/sprd_thermal.c +4 -2
@@ -322,8 +322,10 @@ static void sprd_thm_toggle_sensor(struct sprd_thermal_sensor *sen, bool on) {struct thermal_zone_device *tzd = sen->tzd; - tzd->ops->set_mode (tzd, - on ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ); +if (on) +thermal_zone_device_enable (tzd); +else +thermal_zone_device_disable (tzd); }static int sprd_thm_probe (struct platform_device *pdev)
drivers/thermal/thermal_core.c +43 -6
73 lines not on this page · raw message
drivers/thermal/thermal_core.h +3 -0
@@ -141,6 +141,9 @@ thermal_cooling_device_stats_update(struct thermal_cooling_device *cdev, unsigned long new_state) {}#endif /* CONFIG_THERMAL_STATISTICS */ +enum thermal_device_mode +thermal_zone_device_get_mode (struct thermal_zone_device *tz); +/* device tree support */ #ifdef CONFIG_THERMAL_OF int of_parse_thermal_zones (void );
drivers/thermal/thermal_sysfs.c +3 -26
@@ -50,14 +50,8 @@ mode_show(struct device *dev, struct device_attribute *attr, char *buf) {struct thermal_zone_device *tz =to_thermal_zone (dev);enum thermal_device_mode mode; -int result; - -if (!tz->ops->get_mode) -return -EPERM ; - result = tz->ops->get_mode (tz, &mode); -if (result) -return result; + mode =thermal_zone_device_get_mode (tz);return sprintf (buf,"%s\n" , mode ==THERMAL_DEVICE_ENABLED ?"enabled" :"disabled" );
@@ -74,9 +68,9 @@ mode_store(struct device *dev, struct device_attribute *attr,return -EPERM ;if (!strncmp (buf,"enabled" ,sizeof ("enabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_ENABLED ); + result =thermal_zone_device_enable (tz);else if (!strncmp (buf,"disabled" ,sizeof ("disabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_DISABLED ); + result =thermal_zone_device_disable (tz);else result = -EINVAL ;
@@ -428,30 +422,13 @@ static struct attribute_group thermal_zone_attribute_group = { .attrs = thermal_zone_dev_attrs, }; -/* We expose mode only if .get_mode is present */ static struct attribute *thermal_zone_mode_attrs[] = { &dev_attr_mode.attr,NULL , }; -static umode_t thermal_zone_mode_is_visible (struct kobject *kobj, -struct attribute *attr, -int attrno) -{ - struct device *dev = container_of(kobj, struct device, kobj); -struct thermal_zone_device *tz; - - tz = container_of(dev, struct thermal_zone_device, device); - -if (tz->ops->get_mode) -return attr->mode; - -return 0 ; -} -static struct attribute_group thermal_zone_mode_attribute_group = { .attrs = thermal_zone_mode_attrs, - .is_visible = thermal_zone_mode_is_visible, };/* We expose passive only if passive trips are present */
include/linux/thermal.h +20 -2
@@ -76,8 +76,6 @@ struct thermal_zone_device_ops { struct thermal_cooling_device *);int (*get_temp) (struct thermal_zone_device *,int *);int (*set_trips) (struct thermal_zone_device *,int ,int ); -int (*get_mode) (struct thermal_zone_device *, -enum thermal_device_mode *);int (*set_mode) (struct thermal_zone_device *,enum thermal_device_mode ); int (*get_trip_type) (struct thermal_zone_device *, int,
@@ -128,6 +126,7 @@ struct thermal_cooling_device {* @trip_temp_attrs: attributes for trip points for sysfs: trip temperature * @trip_type_attrs: attributes for trip points for sysfs: trip type * @trip_hyst_attrs: attributes for trip points for sysfs: trip hysteresis +* @mode: current mode of this thermal zone * @devdata: private pointer for device private data * @trips: number of trip points the thermal zone supports * @trips_disabled; bitmap for disabled trips
@@ -170,6 +169,7 @@ struct thermal_zone_device {struct thermal_attr *trip_temp_attrs;struct thermal_attr *trip_type_attrs;struct thermal_attr *trip_hyst_attrs; +enum thermal_device_mode mode;void *devdata;int trips;unsigned long trips_disabled;/* bitmap for disabled trips */
@@ -264,6 +264,9 @@ struct thermal_zone_params {int num_tbps;/* Number of tbp entries */ struct thermal_bind_params *tbp; +/* Initial mode of this thermal zone device */ +enum thermal_device_mode initial_mode; +/* * Sustainable power (heat) that this thermal zone can dissipate in * mW
@@ -395,6 +398,8 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int, unsigned int);int thermal_zone_unbind_cooling_device (struct thermal_zone_device *,int ,struct thermal_cooling_device *); +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode);void thermal_zone_device_update (struct thermal_zone_device *,enum thermal_notify_event );
@@ -426,6 +431,9 @@ static inline struct thermal_zone_device *thermal_zone_device_register(static inline void thermal_zone_device_unregister (struct thermal_zone_device *tz) { } +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) +{return -EINVAL ; }static inline struct thermal_cooling_device *thermal_cooling_device_register (char *type,void *devdata,const struct thermal_cooling_device_ops *ops)
@@ -465,4 +473,14 @@ static inline void thermal_notify_framework(struct thermal_zone_device *tz, { }#endif /* CONFIG_THERMAL */ +static inline int thermal_zone_device_enable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_ENABLED ); +} + +static inline int thermal_zone_device_disable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_DISABLED ); +} +#endif /* __THERMAL_H__ */
Signature · 1 line
2.17.1
Re: [PATCH RESEND 1/2] thermal: core: Let thermal zone device's mode be stored in its struct
Thank you for updating the patch, some more comments below.
Quoted 34 lines · Andrzej Pietrasiewicz
Thermal zone devices' mode is stored in individual drivers. This patch changes it so that mode is stored in struct
thermal_zone_deviceinstead.As a result all driver-specific variables storing the mode are not needed and are removed. Consequently, the
get_mode()implementations have nothing to operate on and need to be removed, too.Some thermal framework functions are introduced:
thermal_zone_device_get_mode()thermal_zone_device_set_mode()thermal_zone_device_enable()thermal_zone_device_disable()
thermal_zone_device_get_mode()and its "set" counterpart take tzd's lock and the "set" calls driver'sset_mode()if provided, so the latter must not take this lock again. At the end of the "set"thermal_zone_device_update()is called so drivers don't need to repeat this invocation in their specificset_mode()implementations.struct
thermal_zone_paramsgains a new member calledinitial_mode, which is used to set tzd's mode at registration time and if tzp is not provided tothermal_zone_device_register()then it is assumed that the initial mode isTHERMAL_DEVICE_ENABLED.The sysfs "mode" attribute is always exposed from now on, because all thermal zone devices now have their
get_mode()implemented at the generic level and it is always available. Exposing "mode" doesn't hurt the drivers which don't provide their ownset_mode(), because writing to "mode" will result in-EPERM, as expected.Signed-off-by Andrzej Pietrasiewicz <[email protected]>---
Quoted 7 lines
Fixed two typos:
- one found by kbuild test robot <[email protected]> (missing semicolon in dummy implementation of
thermal_zone_device_set_mode()- one found by myself (.initial_mode in
int3400_thermal_paramsset to a nonexistentTHERMAL_ZONE_DISABLED- should beTHERMAL_DEVICE_DISABLED)
BTW Due to the above fixes the patch should have been be marked as v2, not RESEND (please use RESEND only when posting again unchanged patch).
Quoted 431 lines
drivers/acpi/thermal.c | 35 ++----------- .../ethernet/mellanox/mlxsw/core_thermal.c | 42 ---------------- drivers/platform/x86/acerhdf.c | 17 ++----- drivers/thermal/da9062-thermal.c | 11 ----- drivers/thermal/hisi_thermal.c | 6 ++- drivers/thermal/imx_thermal.c | 24 ++------- .../intel/int340x_thermal/int3400_thermal.c | 31 ++---------- .../int340x_thermal/int340x_thermal_zone.c | 1 + .../thermal/intel/intel_quark_dts_thermal.c | 22 +++------ drivers/thermal/intel/x86_pkg_temp_thermal.c | 1 + drivers/thermal/of-thermal.c | 24 +-------- drivers/thermal/rockchip_thermal.c | 6 ++- drivers/thermal/sprd_thermal.c | 6 ++- drivers/thermal/thermal_core.c | 49 ++++++++++++++++--- drivers/thermal/thermal_core.h | 3 ++ drivers/thermal/thermal_sysfs.c | 29 ++--------- include/linux/thermal.h | 22 ++++++++- 17 files changed, 107 insertions(+), 222 deletions(-)drivers/acpi/thermal.c +5
-30@@ -172,7 +172,6 @@ struct acpi_thermal {struct acpi_thermal_trips trips;struct acpi_handle_list devices;struct thermal_zone_device *thermal_zone; -int tz_enabled;int kelvin_offset;/* in millidegrees */ struct work_struct thermal_check_work; };@@ -500,7 +499,7 @@ static void acpi_thermal_check(void *data) {struct acpi_thermal *tz = data; -if (!tz->tz_enabled) +if (tz->thermal_zone->mode !=THERMAL_DEVICE_ENABLED )return ; thermal_zone_device_update(tz->thermal_zone,@@ -526,25 +525,10 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)return 0 ; } -static int thermal_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -struct acpi_thermal *tz = thermal->devdata; - -if (!tz) -return -EINVAL ; - - *mode = tz->tz_enabled ?THERMAL_DEVICE_ENABLED : -THERMAL_DEVICE_DISABLED ; - -return 0 ; -} -static int thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {struct acpi_thermal *tz = thermal->devdata; -int enable;if (!tz)return -EINVAL ;@@ -552,20 +536,14 @@ static int thermal_set_mode(struct thermal_zone_device *thermal,/* * enable/disable thermal management from ACPI thermal driver */ -if (mode ==THERMAL_DEVICE_ENABLED ) - enable =1 ; -else if (mode ==THERMAL_DEVICE_DISABLED ) { - enable =0 ; +if (mode ==THERMAL_DEVICE_DISABLED )pr_warn ("thermal zone will be disabled\n" ); - }else -return -EINVAL ; -if (enable != tz->tz_enabled) { - tz->tz_enabled = enable; +if (mode != thermal->mode) {ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"%s kernel ACPI thermal control\n" , - tz->tz_enabled ?"Enable" :"Disable" )); -acpi_thermal_check (tz); + mode ==THERMAL_DEVICE_ENABLED ? +"Enable" :"Disable" )); }return 0 ; }@@ -856,7 +834,6 @@ static struct thermal_zone_device_ops acpi_thermal_zone_ops = { .bind = acpi_thermal_bind_cooling_device, .unbind = acpi_thermal_unbind_cooling_device, .get_temp = thermal_get_temp, - .get_mode = thermal_get_mode, .set_mode = thermal_set_mode, .get_trip_type = thermal_get_trip_type, .get_trip_temp = thermal_get_trip_temp,@@ -913,8 +890,6 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)if (ACPI_FAILURE (status))return -ENODEV ; - tz->tz_enabled =1 ; -dev_info (&tz->device->dev,"registered as thermal_zone%d\n" , tz->thermal_zone->id);return 0 ;drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +0
-42@@ -98,7 +98,6 @@ struct mlxsw_thermal_module {struct mlxsw_thermal *parent;struct thermal_zone_device *tzdev;struct mlxsw_thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS ]; -enum thermal_device_mode mode;int module;/* Module or gearbox number */ };@@ -110,7 +109,6 @@ struct mlxsw_thermal {struct thermal_cooling_device *cdevs[MLXSW_MFCR_PWMS_MAX ];u8 cooling_levels[MLXSW_THERMAL_MAX_STATE +1 ];struct mlxsw_thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS ]; -enum thermal_device_mode mode;struct mlxsw_thermal_module *tz_module_arr;u8 tz_module_num;struct mlxsw_thermal_module *tz_gearbox_arr;@@ -277,33 +275,16 @@ static int mlxsw_thermal_unbind(struct thermal_zone_device *tzdev,return 0 ; } -static int mlxsw_thermal_get_mode (struct thermal_zone_device *tzdev, -enum thermal_device_mode *mode) -{ -struct mlxsw_thermal *thermal = tzdev->devdata; - - *mode = thermal->mode; - -return 0 ; -} -static int mlxsw_thermal_set_mode (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {struct mlxsw_thermal *thermal = tzdev->devdata; -mutex_lock (&tzdev->lock); -if (mode ==THERMAL_DEVICE_ENABLED ) tzdev->polling_delay = thermal->polling_delay;else tzdev->polling_delay =0 ; -mutex_unlock (&tzdev->lock); - - thermal->mode = mode; -thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }@@ -407,7 +388,6 @@ static int mlxsw_thermal_trend_get(struct thermal_zone_device *tzdev,static struct thermal_zone_device_ops mlxsw_thermal_ops = { .bind = mlxsw_thermal_bind, .unbind = mlxsw_thermal_unbind, - .get_mode = mlxsw_thermal_get_mode, .set_mode = mlxsw_thermal_set_mode, .get_temp = mlxsw_thermal_get_temp, .get_trip_type = mlxsw_thermal_get_trip_type,@@ -466,34 +446,17 @@ static int mlxsw_thermal_module_unbind(struct thermal_zone_device *tzdev,return err; } -static int mlxsw_thermal_module_mode_get (struct thermal_zone_device *tzdev, -enum thermal_device_mode *mode) -{ -struct mlxsw_thermal_module *tz = tzdev->devdata; - - *mode = tz->mode; - -return 0 ; -} -static int mlxsw_thermal_module_mode_set (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {struct mlxsw_thermal_module *tz = tzdev->devdata;struct mlxsw_thermal *thermal = tz->parent; -mutex_lock (&tzdev->lock); -if (mode ==THERMAL_DEVICE_ENABLED ) tzdev->polling_delay = thermal->polling_delay;else tzdev->polling_delay =0 ; -mutex_unlock (&tzdev->lock); - - tz->mode = mode; -thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }@@ -596,7 +559,6 @@ mlxsw_thermal_module_trip_hyst_set(struct thermal_zone_device *tzdev, int trip,static struct thermal_zone_device_ops mlxsw_thermal_module_ops = { .bind = mlxsw_thermal_module_bind, .unbind = mlxsw_thermal_module_unbind, - .get_mode = mlxsw_thermal_module_mode_get, .set_mode = mlxsw_thermal_module_mode_set, .get_temp = mlxsw_thermal_module_temp_get, .get_trip_type = mlxsw_thermal_module_trip_type_get,@@ -635,7 +597,6 @@ static int mlxsw_thermal_gearbox_temp_get(struct thermal_zone_device *tzdev,static struct thermal_zone_device_ops mlxsw_thermal_gearbox_ops = { .bind = mlxsw_thermal_module_bind, .unbind = mlxsw_thermal_module_unbind, - .get_mode = mlxsw_thermal_module_mode_get, .set_mode = mlxsw_thermal_module_mode_set, .get_temp = mlxsw_thermal_gearbox_temp_get, .get_trip_type = mlxsw_thermal_module_trip_type_get,@@ -765,7 +726,6 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz)return err; } - module_tz->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }@@ -881,7 +841,6 @@ mlxsw_thermal_gearbox_tz_init(struct mlxsw_thermal_module *gearbox_tz)if (IS_ERR (gearbox_tz->tzdev))return PTR_ERR (gearbox_tz->tzdev); - gearbox_tz->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }@@ -1050,7 +1009,6 @@ int mlxsw_thermal_init(struct mlxsw_core *core,if (err) goto err_unreg_modules_tzdev; - thermal->mode =THERMAL_DEVICE_ENABLED ; *p_thermal = thermal;return 0 ;drivers/platform/x86/acerhdf.c +3
-14@@ -406,22 +406,9 @@ static inline void acerhdf_enable_kernelmode(void) kernelmode =1 ; thz_dev->polling_delay = interval*1000 ; -thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );pr_notice ("kernel mode fan control ON\n" ); } -static int acerhdf_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -if (verbose) -pr_notice ("kernel mode fan control %d\n" , kernelmode); - - *mode = (kernelmode) ?THERMAL_DEVICE_ENABLED - :THERMAL_DEVICE_DISABLED ; - -return 0 ; -} -/* * set operation mode; * enabled: the thermal layer of the kernel takes care about @@ -488,7 +475,6 @@ static struct thermal_zone_device_ops acerhdf_dev_ops = { .bind = acerhdf_bind, .unbind = acerhdf_unbind, .get_temp = acerhdf_get_ec_temp, - .get_mode = acerhdf_get_mode, .set_mode = acerhdf_set_mode, .get_trip_type = acerhdf_get_trip_type, .get_trip_hyst = acerhdf_get_trip_hyst,@@ -554,6 +540,7 @@ static int acerhdf_set_cur_state(struct thermal_cooling_device *cdev, err_out:acerhdf_revert_to_bios_mode (); + thz_dev->mode =THERMAL_DEVICE_DISABLED ;return -EINVAL ; }@@ -739,6 +726,8 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (cl_dev))return -EINVAL ; + acerhdf_zone_params.initial_mode = + kernelmode ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ; thz_dev = thermal_zone_device_register("acerhdf", 2, 0, NULL, &acerhdf_dev_ops, &acerhdf_zone_params, 0,drivers/thermal/da9062-thermal.c +0
-11@@ -49,7 +49,6 @@ struct da9062_thermal {struct da9062 *hw;struct delayed_work work;struct thermal_zone_device *zone; -enum thermal_device_mode mode;struct mutex lock;/* protection for da9062_thermal temperature */ int temperature;int irq;@@ -121,14 +120,6 @@ static irqreturn_t da9062_thermal_irq_handler(int irq, void *data)return IRQ_HANDLED ; } -static int da9062_thermal_get_mode (struct thermal_zone_device *z, -enum thermal_device_mode *mode) -{ -struct da9062_thermal *thermal = z->devdata; - *mode = thermal->mode; -return 0 ; -} -static int da9062_thermal_get_trip_type (struct thermal_zone_device *z,int trip,enum thermal_trip_type *type)@@ -181,7 +172,6 @@ static int da9062_thermal_get_temp(struct thermal_zone_device *z,static struct thermal_zone_device_ops da9062_thermal_ops = { .get_temp = da9062_thermal_get_temp, - .get_mode = da9062_thermal_get_mode, .get_trip_type = da9062_thermal_get_trip_type, .get_trip_temp = da9062_thermal_get_trip_temp, };@@ -233,7 +223,6 @@ static int da9062_thermal_probe(struct platform_device *pdev) thermal->config = match->data; thermal->hw = chip; - thermal->mode =THERMAL_DEVICE_ENABLED ; thermal->dev = &pdev->dev;INIT_DELAYED_WORK (&thermal->work, da9062_thermal_poll_on);drivers/thermal/hisi_thermal.c +4
-2@@ -549,8 +549,10 @@ static void hisi_thermal_toggle_sensor(struct hisi_thermal_sensor *sensor, {struct thermal_zone_device *tzd = sensor->tzd; - tzd->ops->set_mode (tzd, - on ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ); +if (on) +thermal_zone_device_enable (tzd); +else +thermal_zone_device_disable (tzd); }static int hisi_thermal_probe (struct platform_device *pdev)drivers/thermal/imx_thermal.c +2
-18@@ -197,7 +197,6 @@ struct imx_thermal_data {struct cpufreq_policy *policy;struct thermal_zone_device *tz;struct thermal_cooling_device *cdev; -enum thermal_device_mode mode;struct regmap *tempmon;u32 c1, c2;/* See formula in imx_init_calib() */ int temp_passive;@@ -256,7 +255,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)bool wait;u32 val; -if (data->mode ==THERMAL_DEVICE_ENABLED ) { +if (tz->mode ==THERMAL_DEVICE_ENABLED ) {/* Check if a measurement is currently in progress */ regmap_read (map, soc_data->temp_data, &val); wait = !(val & soc_data->temp_valid_mask);@@ -283,7 +282,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)regmap_read (map, soc_data->temp_data, &val); -if (data->mode !=THERMAL_DEVICE_ENABLED ) { +if (tz->mode !=THERMAL_DEVICE_ENABLED ) {regmap_write (map, soc_data->sensor_ctrl +REG_CLR , soc_data->measure_temp_mask); regmap_write(map, soc_data->sensor_ctrl + REG_SET,@@ -331,16 +330,6 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)return 0 ; } -static int imx_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -struct imx_thermal_data *data = tz->devdata; - - *mode = data->mode; - -return 0 ; -} -static int imx_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {@@ -376,9 +365,6 @@ static int imx_set_mode(struct thermal_zone_device *tz, } } - data->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }@@ -467,7 +453,6 @@ static struct thermal_zone_device_ops imx_tz_ops = { .bind = imx_bind, .unbind = imx_unbind, .get_temp = imx_get_temp, - .get_mode = imx_get_mode, .set_mode = imx_set_mode, .get_trip_type = imx_get_trip_type, .get_trip_temp = imx_get_trip_temp,@@ -831,7 +816,6 @@ static int imx_thermal_probe(struct platform_device *pdev) data->socdata->measure_temp_mask); data->irq_enabled = true; - data->mode =THERMAL_DEVICE_ENABLED ; ret = devm_request_threaded_irq(&pdev->dev, data->irq, imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,
drivers/thermal/imx_thermal.c static int __maybe_unused imx_thermal_suspend(struct device *dev) · line 872
Quoted 5 lines
drivers/thermal/imx_thermal.c +1
-1@@ -885,7 +869,7 @@ static int __maybe_unused imx_thermal_suspend(struct device *dev) data->socdata->measure_temp_mask);regmap_write (map, data->socdata->sensor_ctrl +REG_SET , data->socdata->power_down_mask); - data->mode =THERMAL_DEVICE_DISABLED ; +thermal_zone_device_disable (data->tz);
Since we now also (indirectly) call ->set_mode here the following code:
regmap_write(map, data->socdata->sensor_ctrl + REG_CLR, data->socdata->measure_temp_mask); regmap_write(map, data->socdata->sensor_ctrl + REG_SET, data->socdata->power_down_mask);
should be removed from imx_thermal_suspend().
drivers/thermal/imx_thermal.c static int __maybe_unused imx_thermal_resume(struct device *dev) · line 892
Quoted 9 lines
drivers/thermal/imx_thermal.c +1
-1clk_disable_unprepare (data->thermal_clk);return 0 ;@@ -905,7 +889,7 @@ static int __maybe_unused imx_thermal_resume(struct device *dev) data->socdata->power_down_mask);regmap_write (map, data->socdata->sensor_ctrl +REG_SET , data->socdata->measure_temp_mask); - data->mode =THERMAL_DEVICE_ENABLED ; +thermal_zone_device_enable (data->tz);
Since we now also (indirectly) call ->set_mode here the following code:
regmap_write(map, data->socdata->sensor_ctrl + REG_CLR, data->socdata->power_down_mask); regmap_write(map, data->socdata->sensor_ctrl + REG_SET, data->socdata->measure_temp_mask);
should be removed from imx_thermal_resume().
Quoted 156 lines
drivers/thermal/imx_thermal.c +0
-0return 0 ; }drivers/thermal/intel/int340x_thermal/int3400_thermal.c +4
-27@@ -44,7 +44,6 @@ static char *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = {struct int3400_thermal_priv {struct acpi_device *adev;struct thermal_zone_device *thermal; -int mode;int art_count;struct art *arts;int trt_count;@@ -230,54 +229,32 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal,return 0 ; } -static int int3400_thermal_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -struct int3400_thermal_priv *priv = thermal->devdata; - -if (!priv) -return -EINVAL ; - - *mode = priv->mode; - -return 0 ; -} -static int int3400_thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {struct int3400_thermal_priv *priv = thermal->devdata; -bool enable;int result =0 ;if (!priv)return -EINVAL ; -if (mode ==THERMAL_DEVICE_ENABLED ) - enable = true; -else if (mode ==THERMAL_DEVICE_DISABLED ) - enable = false; -else -return -EINVAL ; - -if (enable != priv->mode) { - priv->mode = enable; +if (mode != thermal->mode) { result =int3400_thermal_run_osc (priv->adev->handle, - priv->current_uuid_index, - enable); + priv->current_uuid_index, + mode ==THERMAL_DEVICE_ENABLED ); }return result; }static struct thermal_zone_device_ops int3400_thermal_ops = { .get_temp = int3400_thermal_get_temp, - .get_mode = int3400_thermal_get_mode, .set_mode = int3400_thermal_set_mode, };static struct thermal_zone_params int3400_thermal_params = { .governor_name ="user_space" , .no_hwmon = true, + .initial_mode =THERMAL_DEVICE_DISABLED , };static int int3400_thermal_probe (struct platform_device *pdev)drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +1
-0@@ -208,6 +208,7 @@ EXPORT_SYMBOL_GPL(int340x_thermal_read_trips);static struct thermal_zone_params int340x_thermal_params = { .governor_name ="user_space" , .no_hwmon = true, + .initial_mode =THERMAL_DEVICE_ENABLED , }; struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev,drivers/thermal/intel/intel_quark_dts_thermal.c +6
-15@@ -103,7 +103,6 @@ struct soc_sensor_entry {bool locked;u32 store_ptps;u32 store_dts_enable; -enum thermal_device_mode mode;struct thermal_zone_device *tzone; };@@ -128,7 +127,7 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)return ret;if (out &QRK_DTS_ENABLE_BIT ) { - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }@@ -139,9 +138,9 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)if (ret)return ret; - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ; }else { - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ;pr_info ("DTS is locked. Cannot enable DTS\n" ); ret = -EPERM ; }@@ -161,7 +160,7 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)return ret;if (!(out &QRK_DTS_ENABLE_BIT )) { - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ;return 0 ; }@@ -173,9 +172,9 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)if (ret)return ret; - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ; }else { - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ;pr_info ("DTS is locked. Cannot disable DTS\n" ); ret = -EPERM ; }@@ -309,14 +308,6 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,return 0 ; } -static int sys_get_mode (struct thermal_zone_device *tzd, -enum thermal_device_mode *mode) -{ -struct soc_sensor_entry *aux_entry = tzd->devdata; - *mode = aux_entry->mode; -return 0 ; -} -static int sys_set_mode (struct thermal_zone_device *tzd,enum thermal_device_mode mode) {
drivers/thermal/intel/intel_quark_dts_thermal.c static struct thermal_zone_device_ops tzone_ops = { · line 333
Quoted 6 lines
drivers/thermal/intel/intel_quark_dts_thermal.c +0
-1@@ -338,7 +329,6 @@ static struct thermal_zone_device_ops tzone_ops = { .get_trip_type = sys_get_trip_type, .set_trip_temp = sys_set_trip_temp, .get_crit_temp = sys_get_crit_temp, - .get_mode = sys_get_mode, .set_mode = sys_set_mode, };
Please take a look at sys_set_mode():
static int sys_set_mode(struct thermal_zone_device *tzd,
enum thermal_device_mode mode)
{
int ret;
mutex_lock(&dts_update_mutex);
if (mode == THERMAL_DEVICE_ENABLED)
ret = soc_dts_enable(tzd);
else
ret = soc_dts_disable(tzd);
mutex_unlock(&dts_update_mutex);
return ret;
}and alloc_soc_dts():
static struct soc_sensor_entry *alloc_soc_dts(void) {
...
aux_entry->tzone = thermal_zone_device_register("quark_dts",
QRK_MAX_DTS_TRIPS,
wr_mask,
aux_entry, &tzone_ops, NULL, 0, polling_delay);
if (IS_ERR(aux_entry->tzone)) {
err = PTR_ERR(aux_entry->tzone);
goto err_ret;
}
mutex_lock(&dts_update_mutex);
err = soc_dts_enable(aux_entry->tzone);
mutex_unlock(&dts_update_mutex);
if (err)
goto err_aux_status;...
}
Since ->set_mode is now called through thermal_zone_device_register() the following code should be removed:
mutex_lock(&dts_update_mutex); err = soc_dts_enable(aux_entry->tzone); mutex_unlock(&dts_update_mutex); if (err) goto err_aux_status;
Quoted 155 lines
drivers/thermal/intel/x86_pkg_temp_thermal.c +1
-0@@ -56,6 +56,7 @@ struct zone_device {static struct thermal_zone_params pkg_temp_tz_params = { .no_hwmon = true, + .initial_mode =THERMAL_DEVICE_ENABLED , };/* Keep track of how many zone pointers we allocated in init() */ drivers/thermal/of-thermal.c +2
-22@@ -51,7 +51,6 @@ struct __thermal_bind_params {/** * struct __thermal_zone - internal representation of a thermal zone -* @mode: current thermal zone device mode (enabled/disabled) * @passive_delay: polling interval while passive cooling is activated * @polling_delay: zone polling interval * @slope: slope of the temperature adjustment curve @@ -65,7 +64,6 @@ struct __thermal_bind_params {*/ struct __thermal_zone { -enum thermal_device_mode mode;int passive_delay;int polling_delay;int slope;@@ -269,23 +267,11 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,return 0 ; } -static int of_thermal_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -struct __thermal_zone *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 *data = tz->devdata; -mutex_lock (&tz->lock); -if (mode ==THERMAL_DEVICE_ENABLED ) { tz->polling_delay = data->polling_delay; tz->passive_delay = data->passive_delay;@@ -294,11 +280,6 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz, tz->passive_delay =0 ; } -mutex_unlock (&tz->lock); - - data->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }@@ -393,7 +374,6 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz, }static struct thermal_zone_device_ops of_thermal_ops = { - .get_mode = of_thermal_get_mode, .set_mode = of_thermal_set_mode, .get_trip_type = of_thermal_get_trip_type,@@ -554,7 +534,7 @@ thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data, tzd =thermal_zone_of_add_sensor (child, sensor_np, data, ops);if (!IS_ERR (tzd)) - tzd->ops->set_mode (tzd,THERMAL_DEVICE_ENABLED ); +thermal_zone_device_enable (tzd);of_node_put (child); goto exit;@@ -979,7 +959,6 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) finish:of_node_put (child); - tz->mode =THERMAL_DEVICE_DISABLED ;return tz;@@ -1120,6 +1099,7 @@ int __init of_parse_thermal_zones(void)/* these two are left for temperature drivers to use */ tzp->slope = tz->slope; tzp->offset = tz->offset; + tzp->initial_mode =THERMAL_DEVICE_DISABLED ; zone = thermal_zone_device_register(child->name, tz->ntrips, mask, tz,drivers/thermal/rockchip_thermal.c +4
-2@@ -1068,8 +1068,10 @@ rockchip_thermal_toggle_sensor(struct rockchip_thermal_sensor *sensor, bool on) {struct thermal_zone_device *tzd = sensor->tzd; - tzd->ops->set_mode (tzd, - on ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ); +if (on) +thermal_zone_device_enable (tzd); +else +thermal_zone_device_disable (tzd); }static irqreturn_t rockchip_thermal_alarm_irq_thread (int irq,void *dev)drivers/thermal/sprd_thermal.c +4
-2@@ -322,8 +322,10 @@ static void sprd_thm_toggle_sensor(struct sprd_thermal_sensor *sen, bool on) {struct thermal_zone_device *tzd = sen->tzd; - tzd->ops->set_mode (tzd, - on ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ); +if (on) +thermal_zone_device_enable (tzd); +else +thermal_zone_device_disable (tzd); }static int sprd_thm_probe (struct platform_device *pdev)drivers/thermal/thermal_core.c +12
-0@@ -463,6 +463,44 @@ static void thermal_zone_device_reset(struct thermal_zone_device *tz)thermal_zone_device_init (tz); } +enum thermal_device_mode +thermal_zone_device_get_mode (struct thermal_zone_device *tz) +{ +enum thermal_device_mode mode; + +mutex_lock (&tz->lock); + + mode = tz->mode; + +mutex_unlock (&tz->lock); + +return mode;
drivers/thermal/thermal_core.c static void thermal_zone_device_reset(struct thermal_zone_device *tz) · line 487
Quoted 10 lines
drivers/thermal/thermal_core.c +10
-0+} + +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) +{ +int ret =0 ; + +if (mode !=THERMAL_DEVICE_DISABLED && + mode !=THERMAL_DEVICE_ENABLED ) +return -EINVAL ;
Please remove above checks, they really are redundant.
drivers/thermal/thermal_core.c static void thermal_zone_device_reset(struct thermal_zone_device *tz) · line 494
Quoted 6 lines
drivers/thermal/thermal_core.c +6
-0+mutex_lock (&tz->lock); + +if (tz->ops->set_mode) + ret = tz->ops->set_mode (tz, mode); + + tz->mode = mode;
This should be:
if (!ret) tz->mode = mode;
as we shouldn't change the mode information if ->set_mode has failed.
Quoted 21 lines
drivers/thermal/thermal_core.c +10
-0+ +mutex_unlock (&tz->lock); + +thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); + +return ret; +} +EXPORT_SYMBOL_GPL (thermal_zone_device_set_mode); +void thermal_zone_device_update (struct thermal_zone_device *tz,enum thermal_notify_event event) {@@ -1236,6 +1274,7 @@ thermal_zone_device_register(const char *type, int trips, int mask,int result;int count;struct thermal_governor *governor; +enum thermal_device_mode mode;if (!type ||strlen (type) ==0 ) {pr_err ("Error: No thermal zone type defined\n" );
drivers/thermal/thermal_core.c thermal_zone_device_register(const char *type, int trips, int mask, · line 1384
Quoted 9 lines
drivers/thermal/thermal_core.c +3
-3@@ -1340,9 +1379,9 @@ thermal_zone_device_register(const char *type, int trips, int mask,INIT_DELAYED_WORK (&tz->poll_queue, thermal_zone_device_check);thermal_zone_device_reset (tz); -/* Update the new thermal zone and mark it as already updated. */ -if (atomic_cmpxchg (&tz->need_update,1 ,0 )) -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); + + mode = tzp ? tzp->initial_mode :THERMAL_DEVICE_ENABLED ; +thermal_zone_device_set_mode (tz, mode);
The setting of tz->need_update earlier in thermal_zone_device_register():
/* A new thermal zone needs to be updated anyway. */ atomic_set(&tz->need_update, 1);
should also be removed now.
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Quoted 165 lines
drivers/thermal/thermal_core.c +1
-3return tz;@@ -1473,9 +1512,7 @@ static int thermal_pm_notify(struct notifier_block *nb,case PM_POST_SUSPEND :atomic_set (&in_suspend,0 );list_for_each_entry (tz, &thermal_tz_list, node) { - tz_mode =THERMAL_DEVICE_ENABLED ; -if (tz->ops->get_mode) - tz->ops->get_mode (tz, &tz_mode); + tz_mode =thermal_zone_device_get_mode (tz);if (tz_mode ==THERMAL_DEVICE_DISABLED )continue ;drivers/thermal/thermal_core.h +3
-0@@ -141,6 +141,9 @@ thermal_cooling_device_stats_update(struct thermal_cooling_device *cdev, unsigned long new_state) {}#endif /* CONFIG_THERMAL_STATISTICS */ +enum thermal_device_mode +thermal_zone_device_get_mode (struct thermal_zone_device *tz); +/* device tree support */ #ifdef CONFIG_THERMAL_OF int of_parse_thermal_zones (void );drivers/thermal/thermal_sysfs.c +3
-26@@ -50,14 +50,8 @@ mode_show(struct device *dev, struct device_attribute *attr, char *buf) {struct thermal_zone_device *tz =to_thermal_zone (dev);enum thermal_device_mode mode; -int result; - -if (!tz->ops->get_mode) -return -EPERM ; - result = tz->ops->get_mode (tz, &mode); -if (result) -return result; + mode =thermal_zone_device_get_mode (tz);return sprintf (buf,"%s\n" , mode ==THERMAL_DEVICE_ENABLED ?"enabled" :"disabled" );@@ -74,9 +68,9 @@ mode_store(struct device *dev, struct device_attribute *attr,return -EPERM ;if (!strncmp (buf,"enabled" ,sizeof ("enabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_ENABLED ); + result =thermal_zone_device_enable (tz);else if (!strncmp (buf,"disabled" ,sizeof ("disabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_DISABLED ); + result =thermal_zone_device_disable (tz);else result = -EINVAL ;@@ -428,30 +422,13 @@ static struct attribute_group thermal_zone_attribute_group = { .attrs = thermal_zone_dev_attrs, }; -/* We expose mode only if .get_mode is present */ static struct attribute *thermal_zone_mode_attrs[] = { &dev_attr_mode.attr,NULL , }; -static umode_t thermal_zone_mode_is_visible (struct kobject *kobj, -struct attribute *attr, -int attrno) -{ - struct device *dev = container_of(kobj, struct device, kobj); -struct thermal_zone_device *tz; - - tz = container_of(dev, struct thermal_zone_device, device); - -if (tz->ops->get_mode) -return attr->mode; - -return 0 ; -} -static struct attribute_group thermal_zone_mode_attribute_group = { .attrs = thermal_zone_mode_attrs, - .is_visible = thermal_zone_mode_is_visible, };/* We expose passive only if passive trips are present */ include/linux/thermal.h +20
-2@@ -76,8 +76,6 @@ struct thermal_zone_device_ops { struct thermal_cooling_device *);int (*get_temp) (struct thermal_zone_device *,int *);int (*set_trips) (struct thermal_zone_device *,int ,int ); -int (*get_mode) (struct thermal_zone_device *, -enum thermal_device_mode *);int (*set_mode) (struct thermal_zone_device *,enum thermal_device_mode ); int (*get_trip_type) (struct thermal_zone_device *, int,@@ -128,6 +126,7 @@ struct thermal_cooling_device {* @trip_temp_attrs: attributes for trip points for sysfs: trip temperature * @trip_type_attrs: attributes for trip points for sysfs: trip type * @trip_hyst_attrs: attributes for trip points for sysfs: trip hysteresis +* @mode: current mode of this thermal zone * @devdata: private pointer for device private data * @trips: number of trip points the thermal zone supports * @trips_disabled; bitmap for disabled trips @@ -170,6 +169,7 @@ struct thermal_zone_device {struct thermal_attr *trip_temp_attrs;struct thermal_attr *trip_type_attrs;struct thermal_attr *trip_hyst_attrs; +enum thermal_device_mode mode;void *devdata;int trips;unsigned long trips_disabled;/* bitmap for disabled trips */ @@ -264,6 +264,9 @@ struct thermal_zone_params {int num_tbps;/* Number of tbp entries */ struct thermal_bind_params *tbp; +/* Initial mode of this thermal zone device */ +enum thermal_device_mode initial_mode; +/* * Sustainable power (heat) that this thermal zone can dissipate in * mW @@ -395,6 +398,8 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int, unsigned int);int thermal_zone_unbind_cooling_device (struct thermal_zone_device *,int ,struct thermal_cooling_device *); +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode);void thermal_zone_device_update (struct thermal_zone_device *,enum thermal_notify_event );@@ -426,6 +431,9 @@ static inline struct thermal_zone_device *thermal_zone_device_register(static inline void thermal_zone_device_unregister (struct thermal_zone_device *tz) { } +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) +{return -EINVAL ; }static inline struct thermal_cooling_device *thermal_cooling_device_register (char *type,void *devdata,const struct thermal_cooling_device_ops *ops)@@ -465,4 +473,14 @@ static inline void thermal_notify_framework(struct thermal_zone_device *tz, { }#endif /* CONFIG_THERMAL */ +static inline int thermal_zone_device_enable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_ENABLED ); +} + +static inline int thermal_zone_device_disable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_DISABLED ); +} +#endif /* __THERMAL_H__ */
v3 cover Stop monitoring disabled devices
This is the third iteration of this PATCH series (not counting RFCs). It addresses comments from Bartlomiej - thanks, Bartlomiej!
The first patch makes all the drivers store their mode in struct thermal_zone_device. Such a move has consequences: driver-specific variables for storing mode are not necessary. Consequently get_mode() methods become obsolete. Then sysfs "mode" attribute stops depending on get_mode() being provided, because it is always provided from now on.
The first patch also introduces the initial mode to be optionally passed to thermal_zone_device_register().
Given all the groundwork done in patch 1/2 patch 2/2 becomes very simple.
I incorrectly named PATCH v2 a PATCH RESEND 1/2, so now I'm counting that as PATCH v2, hence this series is PATCH v3.
PATCH v2..PATCH v3:
- removed redundant regmap_write() in imx_thermal_suspend() and imx_thermal_resume() (Bartlomiej)
- removed unnecessary call to soc_dts_enable() (now called indirectly from thermal_zone_device_register()->set_mode()) (Bartlomiej)
- removed defensive-style checks for non-existent enum values in thermal_zone_device_set_mode() (Bartlomiej)
- change mode only if driver's set_mode() succeeded in thermal_zone_device_set_mode() (Bartlomiej)
- don't set tz->need_update in thermal_zone_device_register() - this was supposed to be part of PATCH v1, but was omitted (Bartlomiej)
PATCH..PATCH v2:
- fixed typo (missing semicolon in dummy thermal_zone_device_set_mode() implementation) (kbuild test robot)
- fixed misspelled enum value in int3400_thermal_params.initial_mode
RFCv3..this PATCH:
- export thermal_zone_device_{enable|disable}() for drivers (Bartlomiej)
- don't check provided enum values in acpi's thermal_zet_mode() and in int3400_thermal_set_mode() (Bartlomiej)
- use thermal_zone_device_enable() in of_thermal instead of open coding it (Bartlomiej)
- use thermal_zone_device_{enable|disable}() in hisi_thermal, rockchip_thermal and sprd_thermal (Bartlomiej)
- assume THERMAL_DEVICE_ENABLED is thermal_zone_params not provided at tzd's register time (Bartlomiej)
- eliminated tzp-s which contain only .initial_mode = THERMAL_DEVICE_ENABLED, (Bartlomiej)
- don't set tz->need_update and don't call thermal_zone_device_update() at the end of thermal_zone_device_register() (Bartlomiej)
- used .initial_mode in int340x_thermal_zone, x86_pkg_temp_thermal and int3400_thermal (Bartlomiej)
Andrzej Pietrasiewicz (2):
thermal: core: Let thermal zone device's mode be stored in its struct
thermal: core: Stop polling DISABLED thermal devices
drivers/acpi/thermal.c | 35 ++-------- .../ethernet/mellanox/mlxsw/core_thermal.c | 42 ------------ drivers/platform/x86/acerhdf.c | 17 +---- drivers/thermal/da9062-thermal.c | 11 ---- drivers/thermal/hisi_thermal.c | 6 +- drivers/thermal/imx_thermal.c | 36 ++-------- .../intel/int340x_thermal/int3400_thermal.c | 31 ++------- .../int340x_thermal/int340x_thermal_zone.c | 1 + .../thermal/intel/intel_quark_dts_thermal.c | 30 ++------- drivers/thermal/intel/x86_pkg_temp_thermal.c | 1 + drivers/thermal/of-thermal.c | 24 +------ drivers/thermal/rockchip_thermal.c | 6 +- drivers/thermal/sprd_thermal.c | 6 +- drivers/thermal/thermal_core.c | 65 +++++++++++++++---- drivers/thermal/thermal_core.h | 3 + drivers/thermal/thermal_sysfs.c | 29 +-------- include/linux/thermal.h | 22 ++++++- 17 files changed, 119 insertions(+), 246 deletions(-)
base-commit: 79799562bf087b30d9dd0fddf5bed2d3b038be08
Signature · 1 line
2.17.1
PATCH v3 1/2 thermal: core: Let thermal zone device's mode be stored in its struct
Thermal zone devices' mode is stored in individual drivers. This patch changes it so that mode is stored in struct thermal_zone_device instead.
As a result all driver-specific variables storing the mode are not needed and are removed. Consequently, the get_mode() implementations have nothing to operate on and need to be removed, too.
Some thermal framework functions are introduced:
thermal_zone_device_get_mode()thermal_zone_device_set_mode()thermal_zone_device_enable()thermal_zone_device_disable()
thermal_zone_device_get_mode() and its "set" counterpart take tzd's lock and the "set" calls driver's set_mode() if provided, so the latter must not take this lock again. At the end of the "set" thermal_zone_device_update() is called so drivers don't need to repeat this invocation in their specific set_mode() implementations.
struct thermal_zone_params gains a new member called initial_mode, which is used to set tzd's mode at registration time and if tzp is not provided to thermal_zone_device_register() then it is assumed that the initial mode is THERMAL_DEVICE_ENABLED.
The sysfs "mode" attribute is always exposed from now on, because all thermal zone devices now have their get_mode() implemented at the generic level and it is always available. Exposing "mode" doesn't hurt the drivers which don't provide their own set_mode(), because writing to "mode" will result in -EPERM, as expected.
--- drivers/acpi/thermal.c | 35 ++----------- .../ethernet/mellanox/mlxsw/core_thermal.c | 42 ---------------- drivers/platform/x86/acerhdf.c | 17 ++----- drivers/thermal/da9062-thermal.c | 11 ----- drivers/thermal/hisi_thermal.c | 6 ++- drivers/thermal/imx_thermal.c | 36 ++------------ .../intel/int340x_thermal/int3400_thermal.c | 31 ++---------- .../int340x_thermal/int340x_thermal_zone.c | 1 + .../thermal/intel/intel_quark_dts_thermal.c | 30 +++--------- drivers/thermal/intel/x86_pkg_temp_thermal.c | 1 + drivers/thermal/of-thermal.c | 24 +-------- drivers/thermal/rockchip_thermal.c | 6 ++- drivers/thermal/sprd_thermal.c | 6 ++- drivers/thermal/thermal_core.c | 49 +++++++++++++++---- drivers/thermal/thermal_core.h | 3 ++ drivers/thermal/thermal_sysfs.c | 29 ++--------- include/linux/thermal.h | 22 ++++++++- 17 files changed, 105 insertions(+), 244 deletions(-)
drivers/acpi/thermal.c +5 -30
@@ -172,7 +172,6 @@ struct acpi_thermal {struct acpi_thermal_trips trips;struct acpi_handle_list devices;struct thermal_zone_device *thermal_zone; -int tz_enabled;int kelvin_offset;/* in millidegrees */ struct work_struct thermal_check_work; };
@@ -500,7 +499,7 @@ static void acpi_thermal_check(void *data) {struct acpi_thermal *tz = data; -if (!tz->tz_enabled) +if (tz->thermal_zone->mode !=THERMAL_DEVICE_ENABLED )return ; thermal_zone_device_update(tz->thermal_zone,
@@ -526,25 +525,10 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)return 0 ; } -static int thermal_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -struct acpi_thermal *tz = thermal->devdata; - -if (!tz) -return -EINVAL ; - - *mode = tz->tz_enabled ?THERMAL_DEVICE_ENABLED : -THERMAL_DEVICE_DISABLED ; - -return 0 ; -} -static int thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {struct acpi_thermal *tz = thermal->devdata; -int enable;if (!tz)return -EINVAL ;
@@ -552,20 +536,14 @@ static int thermal_set_mode(struct thermal_zone_device *thermal,/* * enable/disable thermal management from ACPI thermal driver */ -if (mode ==THERMAL_DEVICE_ENABLED ) - enable =1 ; -else if (mode ==THERMAL_DEVICE_DISABLED ) { - enable =0 ; +if (mode ==THERMAL_DEVICE_DISABLED )pr_warn ("thermal zone will be disabled\n" ); - }else -return -EINVAL ; -if (enable != tz->tz_enabled) { - tz->tz_enabled = enable; +if (mode != thermal->mode) {ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"%s kernel ACPI thermal control\n" , - tz->tz_enabled ?"Enable" :"Disable" )); -acpi_thermal_check (tz); + mode ==THERMAL_DEVICE_ENABLED ? +"Enable" :"Disable" )); }return 0 ; }
@@ -856,7 +834,6 @@ static struct thermal_zone_device_ops acpi_thermal_zone_ops = { .bind = acpi_thermal_bind_cooling_device, .unbind = acpi_thermal_unbind_cooling_device, .get_temp = thermal_get_temp, - .get_mode = thermal_get_mode, .set_mode = thermal_set_mode, .get_trip_type = thermal_get_trip_type, .get_trip_temp = thermal_get_trip_temp,
@@ -913,8 +890,6 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)if (ACPI_FAILURE (status))return -ENODEV ; - tz->tz_enabled =1 ; -dev_info (&tz->device->dev,"registered as thermal_zone%d\n" , tz->thermal_zone->id);return 0 ;
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +0 -42
123 lines not on this page · raw message
drivers/platform/x86/acerhdf.c +3 -14
@@ -406,22 +406,9 @@ static inline void acerhdf_enable_kernelmode(void) kernelmode =1 ; thz_dev->polling_delay = interval*1000 ; -thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );pr_notice ("kernel mode fan control ON\n" ); } -static int acerhdf_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -if (verbose) -pr_notice ("kernel mode fan control %d\n" , kernelmode); - - *mode = (kernelmode) ?THERMAL_DEVICE_ENABLED - :THERMAL_DEVICE_DISABLED ; - -return 0 ; -} -/* * set operation mode; * enabled: the thermal layer of the kernel takes care about
@@ -488,7 +475,6 @@ static struct thermal_zone_device_ops acerhdf_dev_ops = { .bind = acerhdf_bind, .unbind = acerhdf_unbind, .get_temp = acerhdf_get_ec_temp, - .get_mode = acerhdf_get_mode, .set_mode = acerhdf_set_mode, .get_trip_type = acerhdf_get_trip_type, .get_trip_hyst = acerhdf_get_trip_hyst,
@@ -554,6 +540,7 @@ static int acerhdf_set_cur_state(struct thermal_cooling_device *cdev, err_out:acerhdf_revert_to_bios_mode (); + thz_dev->mode =THERMAL_DEVICE_DISABLED ;return -EINVAL ; }
@@ -739,6 +726,8 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (cl_dev))return -EINVAL ; + acerhdf_zone_params.initial_mode = + kernelmode ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ; thz_dev = thermal_zone_device_register("acerhdf", 2, 0, NULL, &acerhdf_dev_ops, &acerhdf_zone_params, 0,
drivers/thermal/da9062-thermal.c +0 -11
@@ -49,7 +49,6 @@ struct da9062_thermal {struct da9062 *hw;struct delayed_work work;struct thermal_zone_device *zone; -enum thermal_device_mode mode;struct mutex lock;/* protection for da9062_thermal temperature */ int temperature;int irq;
@@ -121,14 +120,6 @@ static irqreturn_t da9062_thermal_irq_handler(int irq, void *data)return IRQ_HANDLED ; } -static int da9062_thermal_get_mode (struct thermal_zone_device *z, -enum thermal_device_mode *mode) -{ -struct da9062_thermal *thermal = z->devdata; - *mode = thermal->mode; -return 0 ; -} -static int da9062_thermal_get_trip_type (struct thermal_zone_device *z,int trip,enum thermal_trip_type *type)
@@ -181,7 +172,6 @@ static int da9062_thermal_get_temp(struct thermal_zone_device *z,static struct thermal_zone_device_ops da9062_thermal_ops = { .get_temp = da9062_thermal_get_temp, - .get_mode = da9062_thermal_get_mode, .get_trip_type = da9062_thermal_get_trip_type, .get_trip_temp = da9062_thermal_get_trip_temp, };
@@ -233,7 +223,6 @@ static int da9062_thermal_probe(struct platform_device *pdev) thermal->config = match->data; thermal->hw = chip; - thermal->mode =THERMAL_DEVICE_ENABLED ; thermal->dev = &pdev->dev;INIT_DELAYED_WORK (&thermal->work, da9062_thermal_poll_on);
drivers/thermal/hisi_thermal.c +4 -2
@@ -549,8 +549,10 @@ static void hisi_thermal_toggle_sensor(struct hisi_thermal_sensor *sensor, {struct thermal_zone_device *tzd = sensor->tzd; - tzd->ops->set_mode (tzd, - on ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ); +if (on) +thermal_zone_device_enable (tzd); +else +thermal_zone_device_disable (tzd); }static int hisi_thermal_probe (struct platform_device *pdev)
drivers/thermal/imx_thermal.c +5 -31
@@ -197,7 +197,6 @@ struct imx_thermal_data {struct cpufreq_policy *policy;struct thermal_zone_device *tz;struct thermal_cooling_device *cdev; -enum thermal_device_mode mode;struct regmap *tempmon;u32 c1, c2;/* See formula in imx_init_calib() */ int temp_passive;
@@ -256,7 +255,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)bool wait;u32 val; -if (data->mode ==THERMAL_DEVICE_ENABLED ) { +if (tz->mode ==THERMAL_DEVICE_ENABLED ) {/* Check if a measurement is currently in progress */ regmap_read (map, soc_data->temp_data, &val); wait = !(val & soc_data->temp_valid_mask);
@@ -283,7 +282,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)regmap_read (map, soc_data->temp_data, &val); -if (data->mode !=THERMAL_DEVICE_ENABLED ) { +if (tz->mode !=THERMAL_DEVICE_ENABLED ) {regmap_write (map, soc_data->sensor_ctrl +REG_CLR , soc_data->measure_temp_mask); regmap_write(map, soc_data->sensor_ctrl + REG_SET,
@@ -331,16 +330,6 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)return 0 ; } -static int imx_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -struct imx_thermal_data *data = tz->devdata; - - *mode = data->mode; - -return 0 ; -} -static int imx_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {
@@ -376,9 +365,6 @@ static int imx_set_mode(struct thermal_zone_device *tz, } } - data->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }
@@ -467,7 +453,6 @@ static struct thermal_zone_device_ops imx_tz_ops = { .bind = imx_bind, .unbind = imx_unbind, .get_temp = imx_get_temp, - .get_mode = imx_get_mode, .set_mode = imx_set_mode, .get_trip_type = imx_get_trip_type, .get_trip_temp = imx_get_trip_temp,
@@ -831,7 +816,6 @@ static int imx_thermal_probe(struct platform_device *pdev) data->socdata->measure_temp_mask); data->irq_enabled = true; - data->mode =THERMAL_DEVICE_ENABLED ; ret = devm_request_threaded_irq(&pdev->dev, data->irq, imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,
@@ -873,19 +857,14 @@ static int imx_thermal_remove(struct platform_device *pdev)static int __maybe_unused imx_thermal_suspend (struct device *dev) {struct imx_thermal_data *data =dev_get_drvdata (dev); -struct regmap *map = data->tempmon;/* * Need to disable thermal sensor, otherwise, when thermal core * try to get temperature before thermal sensor resume, a wrong * temperature will be read as the thermal sensor is powered -* down. +* down. This is done in thermal_zone_device_disable(). */ -regmap_write (map, data->socdata->sensor_ctrl +REG_CLR , - data->socdata->measure_temp_mask); -regmap_write (map, data->socdata->sensor_ctrl +REG_SET , - data->socdata->power_down_mask); - data->mode =THERMAL_DEVICE_DISABLED ; +thermal_zone_device_disable (data->tz);clk_disable_unprepare (data->thermal_clk);return 0 ;
@@ -894,18 +873,13 @@ static int __maybe_unused imx_thermal_suspend(struct device *dev)static int __maybe_unused imx_thermal_resume (struct device *dev) {struct imx_thermal_data *data =dev_get_drvdata (dev); -struct regmap *map = data->tempmon;int ret; ret =clk_prepare_enable (data->thermal_clk);if (ret)return ret;/* Enabled thermal sensor after resume */ -regmap_write (map, data->socdata->sensor_ctrl +REG_CLR , - data->socdata->power_down_mask); -regmap_write (map, data->socdata->sensor_ctrl +REG_SET , - data->socdata->measure_temp_mask); - data->mode =THERMAL_DEVICE_ENABLED ; +thermal_zone_device_enable (data->tz);return 0 ; }
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +4 -27
@@ -44,7 +44,6 @@ static char *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = {struct int3400_thermal_priv {struct acpi_device *adev;struct thermal_zone_device *thermal; -int mode;int art_count;struct art *arts;int trt_count;
@@ -230,54 +229,32 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal,return 0 ; } -static int int3400_thermal_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -struct int3400_thermal_priv *priv = thermal->devdata; - -if (!priv) -return -EINVAL ; - - *mode = priv->mode; - -return 0 ; -} -static int int3400_thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {struct int3400_thermal_priv *priv = thermal->devdata; -bool enable;int result =0 ;if (!priv)return -EINVAL ; -if (mode ==THERMAL_DEVICE_ENABLED ) - enable = true; -else if (mode ==THERMAL_DEVICE_DISABLED ) - enable = false; -else -return -EINVAL ; - -if (enable != priv->mode) { - priv->mode = enable; +if (mode != thermal->mode) { result =int3400_thermal_run_osc (priv->adev->handle, - priv->current_uuid_index, - enable); + priv->current_uuid_index, + mode ==THERMAL_DEVICE_ENABLED ); }return result; }static struct thermal_zone_device_ops int3400_thermal_ops = { .get_temp = int3400_thermal_get_temp, - .get_mode = int3400_thermal_get_mode, .set_mode = int3400_thermal_set_mode, };static struct thermal_zone_params int3400_thermal_params = { .governor_name ="user_space" , .no_hwmon = true, + .initial_mode =THERMAL_DEVICE_DISABLED , };static int int3400_thermal_probe (struct platform_device *pdev)
drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +1 -0
@@ -208,6 +208,7 @@ EXPORT_SYMBOL_GPL(int340x_thermal_read_trips);static struct thermal_zone_params int340x_thermal_params = { .governor_name ="user_space" , .no_hwmon = true, + .initial_mode =THERMAL_DEVICE_ENABLED , }; struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev,
drivers/thermal/intel/intel_quark_dts_thermal.c +6 -24
@@ -103,7 +103,6 @@ struct soc_sensor_entry {bool locked;u32 store_ptps;u32 store_dts_enable; -enum thermal_device_mode mode;struct thermal_zone_device *tzone; };
@@ -128,7 +127,7 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)return ret;if (out &QRK_DTS_ENABLE_BIT ) { - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }
@@ -139,9 +138,9 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)if (ret)return ret; - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ; }else { - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ;pr_info ("DTS is locked. Cannot enable DTS\n" ); ret = -EPERM ; }
@@ -161,7 +160,7 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)return ret;if (!(out &QRK_DTS_ENABLE_BIT )) { - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ;return 0 ; }
@@ -173,9 +172,9 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)if (ret)return ret; - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ; }else { - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ;pr_info ("DTS is locked. Cannot disable DTS\n" ); ret = -EPERM ; }
@@ -309,14 +308,6 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,return 0 ; } -static int sys_get_mode (struct thermal_zone_device *tzd, -enum thermal_device_mode *mode) -{ -struct soc_sensor_entry *aux_entry = tzd->devdata; - *mode = aux_entry->mode; -return 0 ; -} -static int sys_set_mode (struct thermal_zone_device *tzd,enum thermal_device_mode mode) {
@@ -338,7 +329,6 @@ static struct thermal_zone_device_ops tzone_ops = { .get_trip_type = sys_get_trip_type, .set_trip_temp = sys_set_trip_temp, .get_crit_temp = sys_get_crit_temp, - .get_mode = sys_get_mode, .set_mode = sys_set_mode, };
@@ -414,16 +404,8 @@ static struct soc_sensor_entry *alloc_soc_dts(void) goto err_ret; } -mutex_lock (&dts_update_mutex); - err =soc_dts_enable (aux_entry->tzone); -mutex_unlock (&dts_update_mutex); -if (err) - goto err_aux_status; -return aux_entry; -err_aux_status: -thermal_zone_device_unregister (aux_entry->tzone); err_ret:kfree (aux_entry);return ERR_PTR (err);
drivers/thermal/intel/x86_pkg_temp_thermal.c +1 -0
@@ -56,6 +56,7 @@ struct zone_device {static struct thermal_zone_params pkg_temp_tz_params = { .no_hwmon = true, + .initial_mode =THERMAL_DEVICE_ENABLED , };/* Keep track of how many zone pointers we allocated in init() */
drivers/thermal/of-thermal.c +2 -22
@@ -51,7 +51,6 @@ struct __thermal_bind_params {/** * struct __thermal_zone - internal representation of a thermal zone -* @mode: current thermal zone device mode (enabled/disabled) * @passive_delay: polling interval while passive cooling is activated * @polling_delay: zone polling interval * @slope: slope of the temperature adjustment curve
@@ -65,7 +64,6 @@ struct __thermal_bind_params {*/ struct __thermal_zone { -enum thermal_device_mode mode;int passive_delay;int polling_delay;int slope;
@@ -269,23 +267,11 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,return 0 ; } -static int of_thermal_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -struct __thermal_zone *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 *data = tz->devdata; -mutex_lock (&tz->lock); -if (mode ==THERMAL_DEVICE_ENABLED ) { tz->polling_delay = data->polling_delay; tz->passive_delay = data->passive_delay;
@@ -294,11 +280,6 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz, tz->passive_delay =0 ; } -mutex_unlock (&tz->lock); - - data->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }
@@ -393,7 +374,6 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz, }static struct thermal_zone_device_ops of_thermal_ops = { - .get_mode = of_thermal_get_mode, .set_mode = of_thermal_set_mode, .get_trip_type = of_thermal_get_trip_type,
@@ -554,7 +534,7 @@ thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data, tzd =thermal_zone_of_add_sensor (child, sensor_np, data, ops);if (!IS_ERR (tzd)) - tzd->ops->set_mode (tzd,THERMAL_DEVICE_ENABLED ); +thermal_zone_device_enable (tzd);of_node_put (child); goto exit;
@@ -979,7 +959,6 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) finish:of_node_put (child); - tz->mode =THERMAL_DEVICE_DISABLED ;return tz;
@@ -1120,6 +1099,7 @@ int __init of_parse_thermal_zones(void)/* these two are left for temperature drivers to use */ tzp->slope = tz->slope; tzp->offset = tz->offset; + tzp->initial_mode =THERMAL_DEVICE_DISABLED ; zone = thermal_zone_device_register(child->name, tz->ntrips, mask, tz,
drivers/thermal/rockchip_thermal.c +4 -2
@@ -1068,8 +1068,10 @@ rockchip_thermal_toggle_sensor(struct rockchip_thermal_sensor *sensor, bool on) {struct thermal_zone_device *tzd = sensor->tzd; - tzd->ops->set_mode (tzd, - on ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ); +if (on) +thermal_zone_device_enable (tzd); +else +thermal_zone_device_disable (tzd); }static irqreturn_t rockchip_thermal_alarm_irq_thread (int irq,void *dev)
drivers/thermal/sprd_thermal.c +4 -2
@@ -322,8 +322,10 @@ static void sprd_thm_toggle_sensor(struct sprd_thermal_sensor *sen, bool on) {struct thermal_zone_device *tzd = sen->tzd; - tzd->ops->set_mode (tzd, - on ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ); +if (on) +thermal_zone_device_enable (tzd); +else +thermal_zone_device_disable (tzd); }static int sprd_thm_probe (struct platform_device *pdev)
drivers/thermal/thermal_core.c +40 -9
79 lines not on this page · raw message
drivers/thermal/thermal_core.h +3 -0
@@ -141,6 +141,9 @@ thermal_cooling_device_stats_update(struct thermal_cooling_device *cdev, unsigned long new_state) {}#endif /* CONFIG_THERMAL_STATISTICS */ +enum thermal_device_mode +thermal_zone_device_get_mode (struct thermal_zone_device *tz); +/* device tree support */ #ifdef CONFIG_THERMAL_OF int of_parse_thermal_zones (void );
drivers/thermal/thermal_sysfs.c +3 -26
@@ -50,14 +50,8 @@ mode_show(struct device *dev, struct device_attribute *attr, char *buf) {struct thermal_zone_device *tz =to_thermal_zone (dev);enum thermal_device_mode mode; -int result; - -if (!tz->ops->get_mode) -return -EPERM ; - result = tz->ops->get_mode (tz, &mode); -if (result) -return result; + mode =thermal_zone_device_get_mode (tz);return sprintf (buf,"%s\n" , mode ==THERMAL_DEVICE_ENABLED ?"enabled" :"disabled" );
@@ -74,9 +68,9 @@ mode_store(struct device *dev, struct device_attribute *attr,return -EPERM ;if (!strncmp (buf,"enabled" ,sizeof ("enabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_ENABLED ); + result =thermal_zone_device_enable (tz);else if (!strncmp (buf,"disabled" ,sizeof ("disabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_DISABLED ); + result =thermal_zone_device_disable (tz);else result = -EINVAL ;
@@ -428,30 +422,13 @@ static struct attribute_group thermal_zone_attribute_group = { .attrs = thermal_zone_dev_attrs, }; -/* We expose mode only if .get_mode is present */ static struct attribute *thermal_zone_mode_attrs[] = { &dev_attr_mode.attr,NULL , }; -static umode_t thermal_zone_mode_is_visible (struct kobject *kobj, -struct attribute *attr, -int attrno) -{ - struct device *dev = container_of(kobj, struct device, kobj); -struct thermal_zone_device *tz; - - tz = container_of(dev, struct thermal_zone_device, device); - -if (tz->ops->get_mode) -return attr->mode; - -return 0 ; -} -static struct attribute_group thermal_zone_mode_attribute_group = { .attrs = thermal_zone_mode_attrs, - .is_visible = thermal_zone_mode_is_visible, };/* We expose passive only if passive trips are present */
include/linux/thermal.h +20 -2
@@ -76,8 +76,6 @@ struct thermal_zone_device_ops { struct thermal_cooling_device *);int (*get_temp) (struct thermal_zone_device *,int *);int (*set_trips) (struct thermal_zone_device *,int ,int ); -int (*get_mode) (struct thermal_zone_device *, -enum thermal_device_mode *);int (*set_mode) (struct thermal_zone_device *,enum thermal_device_mode ); int (*get_trip_type) (struct thermal_zone_device *, int,
@@ -128,6 +126,7 @@ struct thermal_cooling_device {* @trip_temp_attrs: attributes for trip points for sysfs: trip temperature * @trip_type_attrs: attributes for trip points for sysfs: trip type * @trip_hyst_attrs: attributes for trip points for sysfs: trip hysteresis +* @mode: current mode of this thermal zone * @devdata: private pointer for device private data * @trips: number of trip points the thermal zone supports * @trips_disabled; bitmap for disabled trips
@@ -170,6 +169,7 @@ struct thermal_zone_device {struct thermal_attr *trip_temp_attrs;struct thermal_attr *trip_type_attrs;struct thermal_attr *trip_hyst_attrs; +enum thermal_device_mode mode;void *devdata;int trips;unsigned long trips_disabled;/* bitmap for disabled trips */
@@ -264,6 +264,9 @@ struct thermal_zone_params {int num_tbps;/* Number of tbp entries */ struct thermal_bind_params *tbp; +/* Initial mode of this thermal zone device */ +enum thermal_device_mode initial_mode; +/* * Sustainable power (heat) that this thermal zone can dissipate in * mW
@@ -395,6 +398,8 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int, unsigned int);int thermal_zone_unbind_cooling_device (struct thermal_zone_device *,int ,struct thermal_cooling_device *); +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode);void thermal_zone_device_update (struct thermal_zone_device *,enum thermal_notify_event );
@@ -426,6 +431,9 @@ static inline struct thermal_zone_device *thermal_zone_device_register(static inline void thermal_zone_device_unregister (struct thermal_zone_device *tz) { } +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) +{return -EINVAL ; }static inline struct thermal_cooling_device *thermal_cooling_device_register (char *type,void *devdata,const struct thermal_cooling_device_ops *ops)
@@ -465,4 +473,14 @@ static inline void thermal_notify_framework(struct thermal_zone_device *tz, { }#endif /* CONFIG_THERMAL */ +static inline int thermal_zone_device_enable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_ENABLED ); +} + +static inline int thermal_zone_device_disable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_DISABLED ); +} +#endif /* __THERMAL_H__ */
Signature · 1 line
2.17.1
Re: [PATCH v3 1/2] thermal: core: Let thermal zone device's mode be stored in its struct
Quoted 25 lines · Andrzej Pietrasiewicz
Thermal zone devices' mode is stored in individual drivers. This patch changes it so that mode is stored in struct
thermal_zone_deviceinstead.As a result all driver-specific variables storing the mode are not needed and are removed. Consequently, the
get_mode()implementations have nothing to operate on and need to be removed, too.Some thermal framework functions are introduced:
thermal_zone_device_get_mode()thermal_zone_device_set_mode()thermal_zone_device_enable()thermal_zone_device_disable()
thermal_zone_device_get_mode()and its "set" counterpart take tzd's lock and the "set" calls driver'sset_mode()if provided, so the latter must not take this lock again. At the end of the "set"thermal_zone_device_update()is called so drivers don't need to repeat this invocation in their specificset_mode()implementations.struct
thermal_zone_paramsgains a new member calledinitial_mode, which is used to set tzd's mode at registration time and if tzp is not provided tothermal_zone_device_register()then it is assumed that the initial mode isTHERMAL_DEVICE_ENABLED.
Quoted 7 lines
The sysfs "mode" attribute is always exposed from now on, because all thermal zone devices now have their
get_mode()implemented at the generic level and it is always available. Exposing "mode" doesn't hurt the drivers which don't provide their ownset_mode(), because writing to "mode" will result in-EPERM, as expected.Signed-off-by Andrzej Pietrasiewicz <[email protected]>
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Quoted 1,024 lines
--- drivers/acpi/thermal.c | 35 ++----------- .../ethernet/mellanox/mlxsw/core_thermal.c | 42 ---------------- drivers/platform/x86/acerhdf.c | 17 ++----- drivers/thermal/da9062-thermal.c | 11 ----- drivers/thermal/hisi_thermal.c | 6 ++- drivers/thermal/imx_thermal.c | 36 ++------------ .../intel/int340x_thermal/int3400_thermal.c | 31 ++---------- .../int340x_thermal/int340x_thermal_zone.c | 1 + .../thermal/intel/intel_quark_dts_thermal.c | 30 +++--------- drivers/thermal/intel/x86_pkg_temp_thermal.c | 1 + drivers/thermal/of-thermal.c | 24 +-------- drivers/thermal/rockchip_thermal.c | 6 ++- drivers/thermal/sprd_thermal.c | 6 ++- drivers/thermal/thermal_core.c | 49 +++++++++++++++---- drivers/thermal/thermal_core.h | 3 ++ drivers/thermal/thermal_sysfs.c | 29 ++--------- include/linux/thermal.h | 22 ++++++++- 17 files changed, 105 insertions(+), 244 deletions(-)drivers/acpi/thermal.c +5
-30@@ -172,7 +172,6 @@ struct acpi_thermal {struct acpi_thermal_trips trips;struct acpi_handle_list devices;struct thermal_zone_device *thermal_zone; -int tz_enabled;int kelvin_offset;/* in millidegrees */ struct work_struct thermal_check_work; };@@ -500,7 +499,7 @@ static void acpi_thermal_check(void *data) {struct acpi_thermal *tz = data; -if (!tz->tz_enabled) +if (tz->thermal_zone->mode !=THERMAL_DEVICE_ENABLED )return ; thermal_zone_device_update(tz->thermal_zone,@@ -526,25 +525,10 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)return 0 ; } -static int thermal_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -struct acpi_thermal *tz = thermal->devdata; - -if (!tz) -return -EINVAL ; - - *mode = tz->tz_enabled ?THERMAL_DEVICE_ENABLED : -THERMAL_DEVICE_DISABLED ; - -return 0 ; -} -static int thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {struct acpi_thermal *tz = thermal->devdata; -int enable;if (!tz)return -EINVAL ;@@ -552,20 +536,14 @@ static int thermal_set_mode(struct thermal_zone_device *thermal,/* * enable/disable thermal management from ACPI thermal driver */ -if (mode ==THERMAL_DEVICE_ENABLED ) - enable =1 ; -else if (mode ==THERMAL_DEVICE_DISABLED ) { - enable =0 ; +if (mode ==THERMAL_DEVICE_DISABLED )pr_warn ("thermal zone will be disabled\n" ); - }else -return -EINVAL ; -if (enable != tz->tz_enabled) { - tz->tz_enabled = enable; +if (mode != thermal->mode) {ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"%s kernel ACPI thermal control\n" , - tz->tz_enabled ?"Enable" :"Disable" )); -acpi_thermal_check (tz); + mode ==THERMAL_DEVICE_ENABLED ? +"Enable" :"Disable" )); }return 0 ; }@@ -856,7 +834,6 @@ static struct thermal_zone_device_ops acpi_thermal_zone_ops = { .bind = acpi_thermal_bind_cooling_device, .unbind = acpi_thermal_unbind_cooling_device, .get_temp = thermal_get_temp, - .get_mode = thermal_get_mode, .set_mode = thermal_set_mode, .get_trip_type = thermal_get_trip_type, .get_trip_temp = thermal_get_trip_temp,@@ -913,8 +890,6 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)if (ACPI_FAILURE (status))return -ENODEV ; - tz->tz_enabled =1 ; -dev_info (&tz->device->dev,"registered as thermal_zone%d\n" , tz->thermal_zone->id);return 0 ;drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +0
-42@@ -98,7 +98,6 @@ struct mlxsw_thermal_module {struct mlxsw_thermal *parent;struct thermal_zone_device *tzdev;struct mlxsw_thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS ]; -enum thermal_device_mode mode;int module;/* Module or gearbox number */ };@@ -110,7 +109,6 @@ struct mlxsw_thermal {struct thermal_cooling_device *cdevs[MLXSW_MFCR_PWMS_MAX ];u8 cooling_levels[MLXSW_THERMAL_MAX_STATE +1 ];struct mlxsw_thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS ]; -enum thermal_device_mode mode;struct mlxsw_thermal_module *tz_module_arr;u8 tz_module_num;struct mlxsw_thermal_module *tz_gearbox_arr;@@ -277,33 +275,16 @@ static int mlxsw_thermal_unbind(struct thermal_zone_device *tzdev,return 0 ; } -static int mlxsw_thermal_get_mode (struct thermal_zone_device *tzdev, -enum thermal_device_mode *mode) -{ -struct mlxsw_thermal *thermal = tzdev->devdata; - - *mode = thermal->mode; - -return 0 ; -} -static int mlxsw_thermal_set_mode (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {struct mlxsw_thermal *thermal = tzdev->devdata; -mutex_lock (&tzdev->lock); -if (mode ==THERMAL_DEVICE_ENABLED ) tzdev->polling_delay = thermal->polling_delay;else tzdev->polling_delay =0 ; -mutex_unlock (&tzdev->lock); - - thermal->mode = mode; -thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }@@ -407,7 +388,6 @@ static int mlxsw_thermal_trend_get(struct thermal_zone_device *tzdev,static struct thermal_zone_device_ops mlxsw_thermal_ops = { .bind = mlxsw_thermal_bind, .unbind = mlxsw_thermal_unbind, - .get_mode = mlxsw_thermal_get_mode, .set_mode = mlxsw_thermal_set_mode, .get_temp = mlxsw_thermal_get_temp, .get_trip_type = mlxsw_thermal_get_trip_type,@@ -466,34 +446,17 @@ static int mlxsw_thermal_module_unbind(struct thermal_zone_device *tzdev,return err; } -static int mlxsw_thermal_module_mode_get (struct thermal_zone_device *tzdev, -enum thermal_device_mode *mode) -{ -struct mlxsw_thermal_module *tz = tzdev->devdata; - - *mode = tz->mode; - -return 0 ; -} -static int mlxsw_thermal_module_mode_set (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {struct mlxsw_thermal_module *tz = tzdev->devdata;struct mlxsw_thermal *thermal = tz->parent; -mutex_lock (&tzdev->lock); -if (mode ==THERMAL_DEVICE_ENABLED ) tzdev->polling_delay = thermal->polling_delay;else tzdev->polling_delay =0 ; -mutex_unlock (&tzdev->lock); - - tz->mode = mode; -thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }@@ -596,7 +559,6 @@ mlxsw_thermal_module_trip_hyst_set(struct thermal_zone_device *tzdev, int trip,static struct thermal_zone_device_ops mlxsw_thermal_module_ops = { .bind = mlxsw_thermal_module_bind, .unbind = mlxsw_thermal_module_unbind, - .get_mode = mlxsw_thermal_module_mode_get, .set_mode = mlxsw_thermal_module_mode_set, .get_temp = mlxsw_thermal_module_temp_get, .get_trip_type = mlxsw_thermal_module_trip_type_get,@@ -635,7 +597,6 @@ static int mlxsw_thermal_gearbox_temp_get(struct thermal_zone_device *tzdev,static struct thermal_zone_device_ops mlxsw_thermal_gearbox_ops = { .bind = mlxsw_thermal_module_bind, .unbind = mlxsw_thermal_module_unbind, - .get_mode = mlxsw_thermal_module_mode_get, .set_mode = mlxsw_thermal_module_mode_set, .get_temp = mlxsw_thermal_gearbox_temp_get, .get_trip_type = mlxsw_thermal_module_trip_type_get,@@ -765,7 +726,6 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz)return err; } - module_tz->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }@@ -881,7 +841,6 @@ mlxsw_thermal_gearbox_tz_init(struct mlxsw_thermal_module *gearbox_tz)if (IS_ERR (gearbox_tz->tzdev))return PTR_ERR (gearbox_tz->tzdev); - gearbox_tz->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }@@ -1050,7 +1009,6 @@ int mlxsw_thermal_init(struct mlxsw_core *core,if (err) goto err_unreg_modules_tzdev; - thermal->mode =THERMAL_DEVICE_ENABLED ; *p_thermal = thermal;return 0 ;drivers/platform/x86/acerhdf.c +3
-14@@ -406,22 +406,9 @@ static inline void acerhdf_enable_kernelmode(void) kernelmode =1 ; thz_dev->polling_delay = interval*1000 ; -thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );pr_notice ("kernel mode fan control ON\n" ); } -static int acerhdf_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -if (verbose) -pr_notice ("kernel mode fan control %d\n" , kernelmode); - - *mode = (kernelmode) ?THERMAL_DEVICE_ENABLED - :THERMAL_DEVICE_DISABLED ; - -return 0 ; -} -/* * set operation mode; * enabled: the thermal layer of the kernel takes care about @@ -488,7 +475,6 @@ static struct thermal_zone_device_ops acerhdf_dev_ops = { .bind = acerhdf_bind, .unbind = acerhdf_unbind, .get_temp = acerhdf_get_ec_temp, - .get_mode = acerhdf_get_mode, .set_mode = acerhdf_set_mode, .get_trip_type = acerhdf_get_trip_type, .get_trip_hyst = acerhdf_get_trip_hyst,@@ -554,6 +540,7 @@ static int acerhdf_set_cur_state(struct thermal_cooling_device *cdev, err_out:acerhdf_revert_to_bios_mode (); + thz_dev->mode =THERMAL_DEVICE_DISABLED ;return -EINVAL ; }@@ -739,6 +726,8 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (cl_dev))return -EINVAL ; + acerhdf_zone_params.initial_mode = + kernelmode ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ; thz_dev = thermal_zone_device_register("acerhdf", 2, 0, NULL, &acerhdf_dev_ops, &acerhdf_zone_params, 0,drivers/thermal/da9062-thermal.c +0
-11@@ -49,7 +49,6 @@ struct da9062_thermal {struct da9062 *hw;struct delayed_work work;struct thermal_zone_device *zone; -enum thermal_device_mode mode;struct mutex lock;/* protection for da9062_thermal temperature */ int temperature;int irq;@@ -121,14 +120,6 @@ static irqreturn_t da9062_thermal_irq_handler(int irq, void *data)return IRQ_HANDLED ; } -static int da9062_thermal_get_mode (struct thermal_zone_device *z, -enum thermal_device_mode *mode) -{ -struct da9062_thermal *thermal = z->devdata; - *mode = thermal->mode; -return 0 ; -} -static int da9062_thermal_get_trip_type (struct thermal_zone_device *z,int trip,enum thermal_trip_type *type)@@ -181,7 +172,6 @@ static int da9062_thermal_get_temp(struct thermal_zone_device *z,static struct thermal_zone_device_ops da9062_thermal_ops = { .get_temp = da9062_thermal_get_temp, - .get_mode = da9062_thermal_get_mode, .get_trip_type = da9062_thermal_get_trip_type, .get_trip_temp = da9062_thermal_get_trip_temp, };@@ -233,7 +223,6 @@ static int da9062_thermal_probe(struct platform_device *pdev) thermal->config = match->data; thermal->hw = chip; - thermal->mode =THERMAL_DEVICE_ENABLED ; thermal->dev = &pdev->dev;INIT_DELAYED_WORK (&thermal->work, da9062_thermal_poll_on);drivers/thermal/hisi_thermal.c +4
-2@@ -549,8 +549,10 @@ static void hisi_thermal_toggle_sensor(struct hisi_thermal_sensor *sensor, {struct thermal_zone_device *tzd = sensor->tzd; - tzd->ops->set_mode (tzd, - on ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ); +if (on) +thermal_zone_device_enable (tzd); +else +thermal_zone_device_disable (tzd); }static int hisi_thermal_probe (struct platform_device *pdev)drivers/thermal/imx_thermal.c +5
-31@@ -197,7 +197,6 @@ struct imx_thermal_data {struct cpufreq_policy *policy;struct thermal_zone_device *tz;struct thermal_cooling_device *cdev; -enum thermal_device_mode mode;struct regmap *tempmon;u32 c1, c2;/* See formula in imx_init_calib() */ int temp_passive;@@ -256,7 +255,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)bool wait;u32 val; -if (data->mode ==THERMAL_DEVICE_ENABLED ) { +if (tz->mode ==THERMAL_DEVICE_ENABLED ) {/* Check if a measurement is currently in progress */ regmap_read (map, soc_data->temp_data, &val); wait = !(val & soc_data->temp_valid_mask);@@ -283,7 +282,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)regmap_read (map, soc_data->temp_data, &val); -if (data->mode !=THERMAL_DEVICE_ENABLED ) { +if (tz->mode !=THERMAL_DEVICE_ENABLED ) {regmap_write (map, soc_data->sensor_ctrl +REG_CLR , soc_data->measure_temp_mask); regmap_write(map, soc_data->sensor_ctrl + REG_SET,@@ -331,16 +330,6 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)return 0 ; } -static int imx_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -struct imx_thermal_data *data = tz->devdata; - - *mode = data->mode; - -return 0 ; -} -static int imx_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {@@ -376,9 +365,6 @@ static int imx_set_mode(struct thermal_zone_device *tz, } } - data->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }@@ -467,7 +453,6 @@ static struct thermal_zone_device_ops imx_tz_ops = { .bind = imx_bind, .unbind = imx_unbind, .get_temp = imx_get_temp, - .get_mode = imx_get_mode, .set_mode = imx_set_mode, .get_trip_type = imx_get_trip_type, .get_trip_temp = imx_get_trip_temp,@@ -831,7 +816,6 @@ static int imx_thermal_probe(struct platform_device *pdev) data->socdata->measure_temp_mask); data->irq_enabled = true; - data->mode =THERMAL_DEVICE_ENABLED ; ret = devm_request_threaded_irq(&pdev->dev, data->irq, imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,@@ -873,19 +857,14 @@ static int imx_thermal_remove(struct platform_device *pdev)static int __maybe_unused imx_thermal_suspend (struct device *dev) {struct imx_thermal_data *data =dev_get_drvdata (dev); -struct regmap *map = data->tempmon;/* * Need to disable thermal sensor, otherwise, when thermal core * try to get temperature before thermal sensor resume, a wrong * temperature will be read as the thermal sensor is powered -* down. +* down. This is done in thermal_zone_device_disable(). */ -regmap_write (map, data->socdata->sensor_ctrl +REG_CLR , - data->socdata->measure_temp_mask); -regmap_write (map, data->socdata->sensor_ctrl +REG_SET , - data->socdata->power_down_mask); - data->mode =THERMAL_DEVICE_DISABLED ; +thermal_zone_device_disable (data->tz);clk_disable_unprepare (data->thermal_clk);return 0 ;@@ -894,18 +873,13 @@ static int __maybe_unused imx_thermal_suspend(struct device *dev)static int __maybe_unused imx_thermal_resume (struct device *dev) {struct imx_thermal_data *data =dev_get_drvdata (dev); -struct regmap *map = data->tempmon;int ret; ret =clk_prepare_enable (data->thermal_clk);if (ret)return ret;/* Enabled thermal sensor after resume */ -regmap_write (map, data->socdata->sensor_ctrl +REG_CLR , - data->socdata->power_down_mask); -regmap_write (map, data->socdata->sensor_ctrl +REG_SET , - data->socdata->measure_temp_mask); - data->mode =THERMAL_DEVICE_ENABLED ; +thermal_zone_device_enable (data->tz);return 0 ; }drivers/thermal/intel/int340x_thermal/int3400_thermal.c +4
-27@@ -44,7 +44,6 @@ static char *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = {struct int3400_thermal_priv {struct acpi_device *adev;struct thermal_zone_device *thermal; -int mode;int art_count;struct art *arts;int trt_count;@@ -230,54 +229,32 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal,return 0 ; } -static int int3400_thermal_get_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode *mode) -{ -struct int3400_thermal_priv *priv = thermal->devdata; - -if (!priv) -return -EINVAL ; - - *mode = priv->mode; - -return 0 ; -} -static int int3400_thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {struct int3400_thermal_priv *priv = thermal->devdata; -bool enable;int result =0 ;if (!priv)return -EINVAL ; -if (mode ==THERMAL_DEVICE_ENABLED ) - enable = true; -else if (mode ==THERMAL_DEVICE_DISABLED ) - enable = false; -else -return -EINVAL ; - -if (enable != priv->mode) { - priv->mode = enable; +if (mode != thermal->mode) { result =int3400_thermal_run_osc (priv->adev->handle, - priv->current_uuid_index, - enable); + priv->current_uuid_index, + mode ==THERMAL_DEVICE_ENABLED ); }return result; }static struct thermal_zone_device_ops int3400_thermal_ops = { .get_temp = int3400_thermal_get_temp, - .get_mode = int3400_thermal_get_mode, .set_mode = int3400_thermal_set_mode, };static struct thermal_zone_params int3400_thermal_params = { .governor_name ="user_space" , .no_hwmon = true, + .initial_mode =THERMAL_DEVICE_DISABLED , };static int int3400_thermal_probe (struct platform_device *pdev)drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +1
-0@@ -208,6 +208,7 @@ EXPORT_SYMBOL_GPL(int340x_thermal_read_trips);static struct thermal_zone_params int340x_thermal_params = { .governor_name ="user_space" , .no_hwmon = true, + .initial_mode =THERMAL_DEVICE_ENABLED , }; struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev,drivers/thermal/intel/intel_quark_dts_thermal.c +6
-24@@ -103,7 +103,6 @@ struct soc_sensor_entry {bool locked;u32 store_ptps;u32 store_dts_enable; -enum thermal_device_mode mode;struct thermal_zone_device *tzone; };@@ -128,7 +127,7 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)return ret;if (out &QRK_DTS_ENABLE_BIT ) { - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }@@ -139,9 +138,9 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)if (ret)return ret; - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ; }else { - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ;pr_info ("DTS is locked. Cannot enable DTS\n" ); ret = -EPERM ; }@@ -161,7 +160,7 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)return ret;if (!(out &QRK_DTS_ENABLE_BIT )) { - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ;return 0 ; }@@ -173,9 +172,9 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)if (ret)return ret; - aux_entry->mode =THERMAL_DEVICE_DISABLED ; + tzd->mode =THERMAL_DEVICE_DISABLED ; }else { - aux_entry->mode =THERMAL_DEVICE_ENABLED ; + tzd->mode =THERMAL_DEVICE_ENABLED ;pr_info ("DTS is locked. Cannot disable DTS\n" ); ret = -EPERM ; }@@ -309,14 +308,6 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,return 0 ; } -static int sys_get_mode (struct thermal_zone_device *tzd, -enum thermal_device_mode *mode) -{ -struct soc_sensor_entry *aux_entry = tzd->devdata; - *mode = aux_entry->mode; -return 0 ; -} -static int sys_set_mode (struct thermal_zone_device *tzd,enum thermal_device_mode mode) {@@ -338,7 +329,6 @@ static struct thermal_zone_device_ops tzone_ops = { .get_trip_type = sys_get_trip_type, .set_trip_temp = sys_set_trip_temp, .get_crit_temp = sys_get_crit_temp, - .get_mode = sys_get_mode, .set_mode = sys_set_mode, };@@ -414,16 +404,8 @@ static struct soc_sensor_entry *alloc_soc_dts(void) goto err_ret; } -mutex_lock (&dts_update_mutex); - err =soc_dts_enable (aux_entry->tzone); -mutex_unlock (&dts_update_mutex); -if (err) - goto err_aux_status; -return aux_entry; -err_aux_status: -thermal_zone_device_unregister (aux_entry->tzone); err_ret:kfree (aux_entry);return ERR_PTR (err);drivers/thermal/intel/x86_pkg_temp_thermal.c +1
-0@@ -56,6 +56,7 @@ struct zone_device {static struct thermal_zone_params pkg_temp_tz_params = { .no_hwmon = true, + .initial_mode =THERMAL_DEVICE_ENABLED , };/* Keep track of how many zone pointers we allocated in init() */ drivers/thermal/of-thermal.c +2
-22@@ -51,7 +51,6 @@ struct __thermal_bind_params {/** * struct __thermal_zone - internal representation of a thermal zone -* @mode: current thermal zone device mode (enabled/disabled) * @passive_delay: polling interval while passive cooling is activated * @polling_delay: zone polling interval * @slope: slope of the temperature adjustment curve @@ -65,7 +64,6 @@ struct __thermal_bind_params {*/ struct __thermal_zone { -enum thermal_device_mode mode;int passive_delay;int polling_delay;int slope;@@ -269,23 +267,11 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,return 0 ; } -static int of_thermal_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -struct __thermal_zone *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 *data = tz->devdata; -mutex_lock (&tz->lock); -if (mode ==THERMAL_DEVICE_ENABLED ) { tz->polling_delay = data->polling_delay; tz->passive_delay = data->passive_delay;@@ -294,11 +280,6 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz, tz->passive_delay =0 ; } -mutex_unlock (&tz->lock); - - data->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }@@ -393,7 +374,6 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz, }static struct thermal_zone_device_ops of_thermal_ops = { - .get_mode = of_thermal_get_mode, .set_mode = of_thermal_set_mode, .get_trip_type = of_thermal_get_trip_type,@@ -554,7 +534,7 @@ thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data, tzd =thermal_zone_of_add_sensor (child, sensor_np, data, ops);if (!IS_ERR (tzd)) - tzd->ops->set_mode (tzd,THERMAL_DEVICE_ENABLED ); +thermal_zone_device_enable (tzd);of_node_put (child); goto exit;@@ -979,7 +959,6 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) finish:of_node_put (child); - tz->mode =THERMAL_DEVICE_DISABLED ;return tz;@@ -1120,6 +1099,7 @@ int __init of_parse_thermal_zones(void)/* these two are left for temperature drivers to use */ tzp->slope = tz->slope; tzp->offset = tz->offset; + tzp->initial_mode =THERMAL_DEVICE_DISABLED ; zone = thermal_zone_device_register(child->name, tz->ntrips, mask, tz,drivers/thermal/rockchip_thermal.c +4
-2@@ -1068,8 +1068,10 @@ rockchip_thermal_toggle_sensor(struct rockchip_thermal_sensor *sensor, bool on) {struct thermal_zone_device *tzd = sensor->tzd; - tzd->ops->set_mode (tzd, - on ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ); +if (on) +thermal_zone_device_enable (tzd); +else +thermal_zone_device_disable (tzd); }static irqreturn_t rockchip_thermal_alarm_irq_thread (int irq,void *dev)drivers/thermal/sprd_thermal.c +4
-2@@ -322,8 +322,10 @@ static void sprd_thm_toggle_sensor(struct sprd_thermal_sensor *sen, bool on) {struct thermal_zone_device *tzd = sen->tzd; - tzd->ops->set_mode (tzd, - on ?THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ); +if (on) +thermal_zone_device_enable (tzd); +else +thermal_zone_device_disable (tzd); }static int sprd_thm_probe (struct platform_device *pdev)drivers/thermal/thermal_core.c +40
-9@@ -463,6 +463,41 @@ static void thermal_zone_device_reset(struct thermal_zone_device *tz)thermal_zone_device_init (tz); } +enum thermal_device_mode +thermal_zone_device_get_mode (struct thermal_zone_device *tz) +{ +enum thermal_device_mode mode; + +mutex_lock (&tz->lock); + + mode = tz->mode; + +mutex_unlock (&tz->lock); + +return mode; +} + +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) +{ +int ret =0 ; + +mutex_lock (&tz->lock); + +if (tz->ops->set_mode) + ret = tz->ops->set_mode (tz, mode); + +if (!ret) + tz->mode = mode; + +mutex_unlock (&tz->lock); + +thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); + +return ret; +} +EXPORT_SYMBOL_GPL (thermal_zone_device_set_mode); +void thermal_zone_device_update (struct thermal_zone_device *tz,enum thermal_notify_event event) {@@ -1236,6 +1271,7 @@ thermal_zone_device_register(const char *type, int trips, int mask,int result;int count;struct thermal_governor *governor; +enum thermal_device_mode mode;if (!type ||strlen (type) ==0 ) {pr_err ("Error: No thermal zone type defined\n" );@@ -1290,9 +1326,6 @@ thermal_zone_device_register(const char *type, int trips, int mask,if (result) goto remove_id; -/* A new thermal zone needs to be updated anyway. */ -atomic_set (&tz->need_update,1 ); -dev_set_name (&tz->device,"thermal_zone%d" , tz->id); result =device_register (&tz->device);if (result)@@ -1340,9 +1373,9 @@ thermal_zone_device_register(const char *type, int trips, int mask,INIT_DELAYED_WORK (&tz->poll_queue, thermal_zone_device_check);thermal_zone_device_reset (tz); -/* Update the new thermal zone and mark it as already updated. */ -if (atomic_cmpxchg (&tz->need_update,1 ,0 )) -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); + + mode = tzp ? tzp->initial_mode :THERMAL_DEVICE_ENABLED ; +thermal_zone_device_set_mode (tz, mode);return tz;@@ -1473,9 +1506,7 @@ static int thermal_pm_notify(struct notifier_block *nb,case PM_POST_SUSPEND :atomic_set (&in_suspend,0 );list_for_each_entry (tz, &thermal_tz_list, node) { - tz_mode =THERMAL_DEVICE_ENABLED ; -if (tz->ops->get_mode) - tz->ops->get_mode (tz, &tz_mode); + tz_mode =thermal_zone_device_get_mode (tz);if (tz_mode ==THERMAL_DEVICE_DISABLED )continue ;drivers/thermal/thermal_core.h +3
-0@@ -141,6 +141,9 @@ thermal_cooling_device_stats_update(struct thermal_cooling_device *cdev, unsigned long new_state) {}#endif /* CONFIG_THERMAL_STATISTICS */ +enum thermal_device_mode +thermal_zone_device_get_mode (struct thermal_zone_device *tz); +/* device tree support */ #ifdef CONFIG_THERMAL_OF int of_parse_thermal_zones (void );drivers/thermal/thermal_sysfs.c +3
-26@@ -50,14 +50,8 @@ mode_show(struct device *dev, struct device_attribute *attr, char *buf) {struct thermal_zone_device *tz =to_thermal_zone (dev);enum thermal_device_mode mode; -int result; - -if (!tz->ops->get_mode) -return -EPERM ; - result = tz->ops->get_mode (tz, &mode); -if (result) -return result; + mode =thermal_zone_device_get_mode (tz);return sprintf (buf,"%s\n" , mode ==THERMAL_DEVICE_ENABLED ?"enabled" :"disabled" );@@ -74,9 +68,9 @@ mode_store(struct device *dev, struct device_attribute *attr,return -EPERM ;if (!strncmp (buf,"enabled" ,sizeof ("enabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_ENABLED ); + result =thermal_zone_device_enable (tz);else if (!strncmp (buf,"disabled" ,sizeof ("disabled" ) -1 )) - result = tz->ops->set_mode (tz,THERMAL_DEVICE_DISABLED ); + result =thermal_zone_device_disable (tz);else result = -EINVAL ;@@ -428,30 +422,13 @@ static struct attribute_group thermal_zone_attribute_group = { .attrs = thermal_zone_dev_attrs, }; -/* We expose mode only if .get_mode is present */ static struct attribute *thermal_zone_mode_attrs[] = { &dev_attr_mode.attr,NULL , }; -static umode_t thermal_zone_mode_is_visible (struct kobject *kobj, -struct attribute *attr, -int attrno) -{ - struct device *dev = container_of(kobj, struct device, kobj); -struct thermal_zone_device *tz; - - tz = container_of(dev, struct thermal_zone_device, device); - -if (tz->ops->get_mode) -return attr->mode; - -return 0 ; -} -static struct attribute_group thermal_zone_mode_attribute_group = { .attrs = thermal_zone_mode_attrs, - .is_visible = thermal_zone_mode_is_visible, };/* We expose passive only if passive trips are present */ include/linux/thermal.h +20
-2@@ -76,8 +76,6 @@ struct thermal_zone_device_ops { struct thermal_cooling_device *);int (*get_temp) (struct thermal_zone_device *,int *);int (*set_trips) (struct thermal_zone_device *,int ,int ); -int (*get_mode) (struct thermal_zone_device *, -enum thermal_device_mode *);int (*set_mode) (struct thermal_zone_device *,enum thermal_device_mode ); int (*get_trip_type) (struct thermal_zone_device *, int,@@ -128,6 +126,7 @@ struct thermal_cooling_device {* @trip_temp_attrs: attributes for trip points for sysfs: trip temperature * @trip_type_attrs: attributes for trip points for sysfs: trip type * @trip_hyst_attrs: attributes for trip points for sysfs: trip hysteresis +* @mode: current mode of this thermal zone * @devdata: private pointer for device private data * @trips: number of trip points the thermal zone supports * @trips_disabled; bitmap for disabled trips @@ -170,6 +169,7 @@ struct thermal_zone_device {struct thermal_attr *trip_temp_attrs;struct thermal_attr *trip_type_attrs;struct thermal_attr *trip_hyst_attrs; +enum thermal_device_mode mode;void *devdata;int trips;unsigned long trips_disabled;/* bitmap for disabled trips */ @@ -264,6 +264,9 @@ struct thermal_zone_params {int num_tbps;/* Number of tbp entries */ struct thermal_bind_params *tbp; +/* Initial mode of this thermal zone device */ +enum thermal_device_mode initial_mode; +/* * Sustainable power (heat) that this thermal zone can dissipate in * mW @@ -395,6 +398,8 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int, unsigned int);int thermal_zone_unbind_cooling_device (struct thermal_zone_device *,int ,struct thermal_cooling_device *); +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode);void thermal_zone_device_update (struct thermal_zone_device *,enum thermal_notify_event );@@ -426,6 +431,9 @@ static inline struct thermal_zone_device *thermal_zone_device_register(static inline void thermal_zone_device_unregister (struct thermal_zone_device *tz) { } +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) +{return -EINVAL ; }static inline struct thermal_cooling_device *thermal_cooling_device_register (char *type,void *devdata,const struct thermal_cooling_device_ops *ops)@@ -465,4 +473,14 @@ static inline void thermal_notify_framework(struct thermal_zone_device *tz, { }#endif /* CONFIG_THERMAL */ +static inline int thermal_zone_device_enable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_ENABLED ); +} + +static inline int thermal_zone_device_disable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_DISABLED ); +} +#endif /* __THERMAL_H__ */
PATCH v3 2/2 thermal: core: Stop polling DISABLED thermal devices
In reply to Andrzej PietrasiewiczPolling DISABLED devices is not desired, as all such "disabled" devices are meant to be handled by userspace. This patch introduces and uses should_stop_polling() to decide whether the device should be polled or not.
--- drivers/thermal/thermal_core.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/thermal/thermal_core.c +14 -2
@@ -305,13 +305,22 @@ static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,cancel_delayed_work (&tz->poll_queue); } +static inline bool should_stop_polling (struct thermal_zone_device *tz) +{ +return thermal_zone_device_get_mode (tz) ==THERMAL_DEVICE_DISABLED ; +} +static void monitor_thermal_zone (struct thermal_zone_device *tz) { +bool stop; + + stop =should_stop_polling (tz); +mutex_lock (&tz->lock); -if (tz->passive) +if (!stop && tz->passive)thermal_zone_device_set_polling (tz, tz->passive_delay); -else if (tz->polling_delay) +else if (!stop && tz->polling_delay)thermal_zone_device_set_polling (tz, tz->polling_delay);else thermal_zone_device_set_polling (tz,0 );
@@ -503,6 +512,9 @@ void thermal_zone_device_update(struct thermal_zone_device *tz, {int count; +if (should_stop_polling (tz)) +return ; +if (atomic_read (&in_suspend))return ;
Signature · 1 line
2.17.1
Zhang, Rui
reviewerRE: [PATCH v3 2/2] thermal: core: Stop polling DISABLED thermal devices
Hi, Andrzej,
Thanks for the patches. My Linux laptop was broken and won't get fixed till next week, so I may lost some of the discussions previously.
Quoted 24 lines
-----Original Message-----
From: Andrzej Pietrasiewicz <[email protected]>
Sent: Friday, April 24, 2020 12:57 AM
To: [email protected]
Cc: Zhang, Rui <[email protected]>; Rafael J . Wysocki <[email protected]>; Len Brown <[email protected]>; Jiri Pirko <[email protected]>; Ido Schimmel <[email protected]>; David S . Miller <[email protected]>; Peter Kaestle <[email protected]>; Darren Hart <[email protected]>; Andy Shevchenko <[email protected]>; Support Opensource <[email protected]>; Daniel Lezcano <[email protected]>; Amit Kucheria <[email protected]>; Shawn Guo <[email protected]>; Sascha Hauer <[email protected]>; Pengutronix Kernel Team <[email protected]>; Fabio Estevam <[email protected]>; NXP Linux Team <[email protected]>; Heiko Stuebner <[email protected]>; Orson Zhai <[email protected]>; Baolin Wang <[email protected]>; Chunyan Zhang <[email protected]>; linux- [email protected]; [email protected]; platform-driver- [email protected]; [email protected]; [email protected]; Andrzej Pietrasiewicz <[email protected]>; Barlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH v3 2/2] thermal: core: Stop polling DISABLED thermal devices
Importance: High
Quoted 4 lines
Polling DISABLED devices is not desired, as all such "disabled" devices are meant to be handled by userspace. This patch introduces and uses
should_stop_polling()to decide whether the device should be polled or not.
Thanks for the fix, and IMO, this reveal some more problems. Say, we need to define "DISABLED" thermal zone.
Can we read the temperature? Can we trust the trip point value?
IMO, a disabled thermal zone does not mean it is handled by userspace, because that is what the userspace governor designed for.
Instead, if a thermal zone is disabled, in thermal_zone_device_update(), we should basically skip all the other operations as well.
I'll try your patches and probably make an incremental patch.
Thanks,
rui
Quoted 45 lines
Signed-off-by Andrzej Pietrasiewicz <[email protected]>--- drivers/thermal/thermal_core.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)(quoted diff) +0
-0
b/drivers/thermal/thermal_core.cindexa2a5034f76e7..03c4d8d23284100644drivers/thermal/thermal_core.c +10
-2@@ -305,13 +305,22 @@ static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,cancel_delayed_work (&tz->poll_queue); } +static inline bool should_stop_polling (struct thermal_zone_device *tz) +{ +return thermal_zone_device_get_mode (tz) ==THERMAL_DEVICE_DISABLED ; } +static void monitor_thermal_zone (struct thermal_zone_device *tz) { +bool stop; + + stop =should_stop_polling (tz); +mutex_lock (&tz->lock); -if (tz->passive) +if (!stop && tz->passive)thermal_zone_device_set_polling (tz, tz->passive_delay); -else if (tz->polling_delay) +else if (!stop && tz->polling_delay)thermal_zone_device_set_polling (tz, tz->polling_delay);else thermal_zone_device_set_polling(tz, 0); @@ -503,6 +512,9@@ void thermal_zone_device_update(struct
thermal_zone_device*tz, {drivers/thermal/thermal_core.c +3
-1int count; +if (should_stop_polling (tz)) +return ; +if (atomic_read (&in_suspend))return ; --2.17.1
Zhang, Rui
reviewerRE: [PATCH v3 2/2] thermal: core: Stop polling DISABLED thermal devices
Quoted 65 lines
-----Original Message-----
From: Zhang, Rui
Sent: Friday, April 24, 2020 5:03 PM
To: Andrzej Pietrasiewicz <[email protected]>; linux- [email protected]
Cc: Rafael J . Wysocki <[email protected]>; Len Brown <[email protected]>; Jiri Pirko <[email protected]>; Ido Schimmel <[email protected]>; David S . Miller <[email protected]>; Peter Kaestle <[email protected]>; Darren Hart <[email protected]>; Andy Shevchenko <[email protected]>; Support Opensource <[email protected]>; Daniel Lezcano <[email protected]>; Amit Kucheria <[email protected]>; Shawn Guo <[email protected]>; Sascha Hauer <[email protected]>; Pengutronix Kernel Team <[email protected]>; Fabio Estevam <[email protected]>; NXP Linux Team <[email protected]>; Heiko Stuebner <[email protected]>; Orson Zhai <[email protected]>; Baolin Wang <[email protected]>; Chunyan Zhang <[email protected]>; linux- [email protected]; [email protected]; platform-driver- [email protected]; [email protected]; [email protected]; Barlomiej Zolnierkiewicz <[email protected]>
Subject: RE: [PATCH v3 2/2] thermal: core: Stop polling DISABLED thermal devicesHi, Andrzej,
Thanks for the patches. My Linux laptop was broken and won't get fixed till next week, so I may lost some of the discussions previously.
Quoted 4 lines
-----Original Message-----
From: Andrzej Pietrasiewicz <[email protected]>
Sent: Friday, April 24, 2020 12:57 AM
To: [email protected]Quoted 8 lines
Cc: Zhang, Rui <[email protected]>; Rafael J . Wysocki <[email protected]>; Len Brown <[email protected]>; Jiri Pirko <[email protected]>; Ido Schimmel <[email protected]>; David S . Miller <[email protected]>; Peter Kaestle <[email protected]>; Darren Hart <[email protected]>; Andy Shevchenko <[email protected]>; Support Opensource <[email protected]>; Daniel Lezcano <[email protected]>; Amit Kucheria <[email protected]>; Shawn Guo <[email protected]>;
Sascha
Quoted 2 lines
Hauer <[email protected]>; Pengutronix Kernel Team <[email protected]>; Fabio Estevam <[email protected]>; NXP
Linux
Quoted 1 line
Team <[email protected]>; Heiko Stuebner <[email protected]>; Orson
Zhai
Quoted 1 line
<[email protected]>; Baolin Wang <[email protected]>;
Chunyan
Quoted 9 lines
Zhang <[email protected]>; linux- [email protected]; [email protected]; platform-driver- [email protected]; [email protected];
[email protected]; Andrzej Pietrasiewicz <[email protected]>; Barlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH v3 2/2] thermal: core: Stop polling DISABLED thermal devices
Importance: HighQuoted 4 lines
Polling DISABLED devices is not desired, as all such "disabled" devices are meant to be handled by userspace. This patch introduces and uses
should_stop_polling()to decide whether the device should be polled ornot.
Quoted 1 line
Quoted 9 lines
Thanks for the fix, and IMO, this reveal some more problems. Say, we need to define "DISABLED" thermal zone.
Can we read the temperature? Can we trust the trip point value?IMO, a disabled thermal zone does not mean it is handled by userspace, because that is what the userspace governor designed for. Instead, if a thermal zone is disabled, in
thermal_zone_device_update(), we should basically skip all the other operations as well.
I overlooked the last line of the patch. So thermal_zone_device_update() returns immediately if the thermal zone is disabled, right?
But how can we stop polling in this case?
There is no chance to call into monitor_thermal_zone() in thermal_zone_device_update(), or do I miss something?
Quoted 1 line
I'll try your patches and probably make an incremental patch.
I have finished a small patch set to improve this based on my understanding, and will post it tomorrow after testing.
Thanks,
rui
Quoted 52 lines
Thanks,
ruiQuoted 26 lines
Signed-off-by Andrzej Pietrasiewicz <[email protected]>--- drivers/thermal/thermal_core.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)(quoted diff) +0
-0
b/drivers/thermal/thermal_core.cindexa2a5034f76e7..03c4d8d23284100644drivers/thermal/thermal_core.c +0
-0@@ -305,13 +305,22 @@ static voidthermal_zone_device_set_polling(struct
thermal_zone_device*tz,drivers/thermal/thermal_core.c +3
-0cancel_delayed_work (&tz->poll_queue); } +static inline bool should_stop_polling (struct thermal_zone_device +*tz) { + return thermal_zone_device_get_mode(tz) ==
THERMAL_DEVICE_DISABLED; }drivers/thermal/thermal_core.c +5
-0+static void monitor_thermal_zone (struct thermal_zone_device *tz) { +bool stop; + + stop =should_stop_polling (tz); +drivers/thermal/thermal_core.c static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,
Quoted 10 lines
drivers/thermal/thermal_core.c +2
-2mutex_lock (&tz->lock); -if (tz->passive) +if (!stop && tz->passive)thermal_zone_device_set_polling (tz, tz->passive_delay); -else if (tz->polling_delay) +else if (!stop && tz->polling_delay)thermal_zone_device_set_polling (tz, tz->polling_delay);else thermal_zone_device_set_polling(tz, 0); @@ -503,6 +512,9@@ void
Quoted 11 lines
thermal_zone_device_update(struct
thermal_zone_device*tz, {drivers/thermal/thermal_core.c +3
-1int count; +if (should_stop_polling (tz)) +return ; +if (atomic_read (&in_suspend))return ; --2.17.1
Re: [PATCH v3 2/2] thermal: core: Stop polling DISABLED thermal devices
Hi,
W dniu 27.04.2020 o 16:20, Zhang, Rui pisze:
Quoted 74 lines
Quoted 65 lines
-----Original Message-----
From: Zhang, Rui
Sent: Friday, April 24, 2020 5:03 PM
To: Andrzej Pietrasiewicz <[email protected]>; linux- [email protected]
Cc: Rafael J . Wysocki <[email protected]>; Len Brown <[email protected]>; Jiri Pirko <[email protected]>; Ido Schimmel <[email protected]>; David S . Miller <[email protected]>; Peter Kaestle <[email protected]>; Darren Hart <[email protected]>; Andy Shevchenko <[email protected]>; Support Opensource <[email protected]>; Daniel Lezcano <[email protected]>; Amit Kucheria <[email protected]>; Shawn Guo <[email protected]>; Sascha Hauer <[email protected]>; Pengutronix Kernel Team <[email protected]>; Fabio Estevam <[email protected]>; NXP Linux Team <[email protected]>; Heiko Stuebner <[email protected]>; Orson Zhai <[email protected]>; Baolin Wang <[email protected]>; Chunyan Zhang <[email protected]>; linux- [email protected]; [email protected]; platform-driver- [email protected]; [email protected]; [email protected]; Barlomiej Zolnierkiewicz <[email protected]>
Subject: RE: [PATCH v3 2/2] thermal: core: Stop polling DISABLED thermal devicesHi, Andrzej,
Thanks for the patches. My Linux laptop was broken and won't get fixed till next week, so I may lost some of the discussions previously.
Quoted 4 lines
-----Original Message-----
From: Andrzej Pietrasiewicz <[email protected]>
Sent: Friday, April 24, 2020 12:57 AM
To: [email protected]Quoted 8 lines
Cc: Zhang, Rui <[email protected]>; Rafael J . Wysocki <[email protected]>; Len Brown <[email protected]>; Jiri Pirko <[email protected]>; Ido Schimmel <[email protected]>; David S . Miller <[email protected]>; Peter Kaestle <[email protected]>; Darren Hart <[email protected]>; Andy Shevchenko <[email protected]>; Support Opensource <[email protected]>; Daniel Lezcano <[email protected]>; Amit Kucheria <[email protected]>; Shawn Guo <[email protected]>;
Sascha
Quoted 2 lines
Hauer <[email protected]>; Pengutronix Kernel Team <[email protected]>; Fabio Estevam <[email protected]>; NXP
Linux
Quoted 1 line
Team <[email protected]>; Heiko Stuebner <[email protected]>; Orson
Zhai
Quoted 1 line
<[email protected]>; Baolin Wang <[email protected]>;
Chunyan
Quoted 9 lines
Zhang <[email protected]>; linux- [email protected]; [email protected]; platform-driver- [email protected]; [email protected];
[email protected]; Andrzej Pietrasiewicz <[email protected]>; Barlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH v3 2/2] thermal: core: Stop polling DISABLED thermal devices
Importance: HighQuoted 4 lines
Polling DISABLED devices is not desired, as all such "disabled" devices are meant to be handled by userspace. This patch introduces and uses
should_stop_polling()to decide whether the device should be polled ornot.
Quoted 1 line
Quoted 9 lines
Thanks for the fix, and IMO, this reveal some more problems. Say, we need to define "DISABLED" thermal zone.
Can we read the temperature? Can we trust the trip point value?IMO, a disabled thermal zone does not mean it is handled by userspace, because that is what the userspace governor designed for. Instead, if a thermal zone is disabled, in
thermal_zone_device_update(), we should basically skip all the other operations as well.
Quoted 4 lines
I overlooked the last line of the patch. So
thermal_zone_device_update()returns immediately if the thermal zone is disabled, right?But how can we stop polling in this case?
It does stop. However, I indeed observe an extra call to thermal_zone_device_update() before it fully stops. I think what happens is this:
- storing "disabled" in mode ends up in thermal_zone_device_set_mode(), which calls driver's ->set_mode() and then calls thermal_zone_device_update(), which returns immediately and does not touch the tz->poll_queue delayed work
- thermal_zone_device_update() is called from the delayed work when its time comes and this time it also returns immediately, not modifying the said delayed work, so polling effectively stops now.
Quoted 2 lines
There is no chance to call into
monitor_thermal_zone()inthermal_zone_device_update(), or do I miss something?
Without the last "if" statement in this patch polling stops with the first call to thermal_zone_device_update() because it indeed disables the delayed work.
So you are probably right - that last "if" should not be introduced.
Quoted 6 lines
Quoted 2 lines
I'll try your patches and probably make an incremental patch.
I have finished a small patch set to improve this based on my understanding, and will post it tomorrow after testing.
Is your small patchset based on top of this series or is it a completely rewritten version?
Andrzej
Zhang, Rui
reviewerRE: [PATCH v3 2/2] thermal: core: Stop polling DISABLED thermal devices
The patch is on top of this patch set.
Run into an issue during test today, will send out after the issue resolved.
Thanks,
rui
Quoted 153 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Andrzej Pietrasiewicz
Sent: Tuesday, April 28, 2020 2:35 AM
To: Zhang, Rui <[email protected]>; '[email protected]' <linux- [email protected]>
Cc: 'Rafael J . Wysocki' <[email protected]>; 'Len Brown' <[email protected]>; 'Jiri Pirko' <[email protected]>; 'Ido Schimmel' <[email protected]>; 'David S . Miller' <[email protected]>; 'Peter Kaestle' <[email protected]>; 'Darren Hart' <[email protected]>; 'Andy Shevchenko' <[email protected]>; 'Support Opensource' <[email protected]>; 'Daniel Lezcano' <[email protected]>; 'Amit Kucheria' <[email protected]>; 'Shawn Guo' <[email protected]>; 'Sascha Hauer' <[email protected]>; 'Pengutronix Kernel Team' <[email protected]>; 'Fabio Estevam' <[email protected]>; 'NXP Linux Team' <[email protected]>; 'Heiko Stuebner' <[email protected]>; 'Orson Zhai' <[email protected]>; 'Baolin Wang' <[email protected]>; 'Chunyan Zhang' <[email protected]>; '[email protected]' <[email protected]>; '[email protected]' <[email protected]>; 'platform-driver- [email protected]' <[email protected]>; 'linux-arm- [email protected]' <[email protected]>; '[email protected]' <[email protected]>; 'Barlomiej Zolnierkiewicz' <[email protected]>
Subject: Re: [PATCH v3 2/2] thermal: core: Stop polling DISABLED thermal devices
Importance: HighHi,
W dniu 27.04.2020 o 16:20, Zhang, Rui pisze:
Quoted 10 lines
Quoted 10 lines
-----Original Message-----
From: Zhang, Rui
Sent: Friday, April 24, 2020 5:03 PM
To: Andrzej Pietrasiewicz <[email protected]>; linux- [email protected]
Cc: Rafael J . Wysocki <[email protected]>; Len Brown <[email protected]>; Jiri Pirko <[email protected]>; Ido Schimmel <[email protected]>; David S . Miller <[email protected]>;Peter
Quoted 22 lines
Quoted 22 lines
Kaestle <[email protected]>; Darren Hart <[email protected]>; Andy Shevchenko <[email protected]>; Support Opensource <[email protected]>; Daniel Lezcano <[email protected]>; Amit Kucheria <[email protected]>; Shawn Guo <[email protected]>; Sascha Hauer <[email protected]>; Pengutronix Kernel Team <[email protected]>; Fabio Estevam <[email protected]>; NXP Linux Team <[email protected]>; Heiko Stuebner <[email protected]>; Orson Zhai <[email protected]>; Baolin Wang <[email protected]>; Chunyan Zhang <[email protected]>; linux- [email protected]; [email protected]; platform-driver- [email protected]; [email protected]; [email protected]; Barlomiej Zolnierkiewicz <[email protected]>
Subject: RE: [PATCH v3 2/2] thermal: core: Stop polling DISABLED thermal devicesHi, Andrzej,
Thanks for the patches. My Linux laptop was broken and won't get fixed till next week, so I may lost some of the discussions previously.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
-----Original Message-----
From: Andrzej Pietrasiewicz <[email protected]>
Sent: Friday, April 24, 2020 12:57 AM
To: [email protected]
Cc: Zhang, Rui <[email protected]>; Rafael J . Wysocki <[email protected]>; Len Brown <[email protected]>; Jiri Pirko <[email protected]>; Ido Schimmel <[email protected]>; David S . Miller <[email protected]>; Peter Kaestle <[email protected]>;Darren
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Hart <[email protected]>; Andy Shevchenko <[email protected]>; Support Opensource <[email protected]>; Daniel
Lezcano
Quoted 7 lines
Quoted 7 lines
Quoted 2 lines
<[email protected]>; Amit Kucheria <[email protected]>; Shawn Guo <[email protected]>;
Sascha
Quoted 2 lines
Hauer <[email protected]>; Pengutronix Kernel Team <[email protected]>; Fabio Estevam <[email protected]>; NXP
Linux
Quoted 1 line
Team <[email protected]>; Heiko Stuebner <[email protected]>;
Orson
Quoted 20 lines
Quoted 20 lines
Zhai
Quoted 1 line
<[email protected]>; Baolin Wang <[email protected]>;
Chunyan
Quoted 10 lines
Zhang <[email protected]>; linux- [email protected]; [email protected]; platform-driver- [email protected]; [email protected]; [email protected]; Andrzej Pietrasiewicz <[email protected]>; Barlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH v3 2/2] thermal: core: Stop polling DISABLED thermal devices
Importance: HighQuoted 5 lines
Polling DISABLED devices is not desired, as all such "disabled" devices are meant to be handled by userspace. This patch introduces and uses
should_stop_polling()to decide whether the device should be polled ornot.
Quoted 1 line
Quoted 8 lines
Quoted 8 lines
Thanks for the fix, and IMO, this reveal some more problems. Say, we need to define "DISABLED" thermal zone.
Can we read the temperature? Can we trust the trip point value?IMO, a disabled thermal zone does not mean it is handled by userspace, because that is what the userspace governor designed for. Instead, if a thermal zone is disabled, in
thermal_zone_device_update(), we should basically skip all the otheroperations as well.
Quoted 3 lines
Quoted 1 line
I overlooked the last line of the patch. So
thermal_zone_device_update()returns immediately if the thermal zone isdisabled, right?
Quoted 2 lines
But how can we stop polling in this case?
It does stop. However, I indeed observe an extra call to
thermal_zone_device_update()before it fully stops. I think what happens is this:- storing "disabled" in mode ends up in
thermal_zone_device_set_mode(), which calls driver's ->set_mode() and then callsthermal_zone_device_update(), which returns immediately and does not touch thetz->poll_queuedelayed work-
thermal_zone_device_update()is called from the delayed work when its time comes and this time it also returns immediately, not modifying the said delayed work, so polling effectively stops now.Quoted 2 lines
There is no chance to call into
monitor_thermal_zone()inthermal_zone_device_update(), or do I miss something?Without the last "if" statement in this patch polling stops with the first call to
thermal_zone_device_update()because it indeed disables the delayed work.So you are probably right - that last "if" should not be introduced.
Quoted 6 lines
Quoted 2 lines
I'll try your patches and probably make an incremental patch.
I have finished a small patch set to improve this based on my understanding, and will post it tomorrow after testing.
Is your small patchset based on top of this series or is it a completely rewritten version?
Andrzej
PATCH v3 2/2 thermal: core: Stop polling DISABLED thermal devices
In reply to Andrzej PietrasiewiczPolling DISABLED devices is not desired, as all such "disabled" devices are meant to be handled by userspace. This patch introduces and uses should_stop_polling() to decide whether the device should be polled or not.
--- drivers/thermal/thermal_core.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/thermal/thermal_core.c +14 -2
@@ -305,13 +305,22 @@ static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,cancel_delayed_work (&tz->poll_queue); } +static inline bool should_stop_polling (struct thermal_zone_device *tz) +{ +return thermal_zone_device_get_mode (tz) ==THERMAL_DEVICE_DISABLED ; +} +static void monitor_thermal_zone (struct thermal_zone_device *tz) { +bool stop; + + stop =should_stop_polling (tz); +mutex_lock (&tz->lock); -if (tz->passive) +if (!stop && tz->passive)thermal_zone_device_set_polling (tz, tz->passive_delay); -else if (tz->polling_delay) +else if (!stop && tz->polling_delay)thermal_zone_device_set_polling (tz, tz->polling_delay);else thermal_zone_device_set_polling (tz,0 );
@@ -506,6 +515,9 @@ void thermal_zone_device_update(struct thermal_zone_device *tz, {int count; +if (should_stop_polling (tz)) +return ; +if (atomic_read (&in_suspend))return ;
Signature · 1 line
2.17.1
Re: [RFC v3 1/2] thermal: core: Let thermal zone device's mode be stored in its struct
In reply to Bartlomiej ZolnierkiewiczHi Barlomiej,
Thanks for looking into the series.
@Daniel can you see below?
W dniu 19.04.2020 o 13:38, Bartlomiej Zolnierkiewicz pisze:
Quoted 27 lines
Hi Andrzej,
Quoted 14 lines · Andrzej Pietrasiewicz
Thermal zone devices' mode is stored in individual drivers. This patch changes it so that mode is stored in struct
thermal_zone_deviceinstead.As a result all driver-specific variables storing the mode are not needed and are removed. Consequently, the
get_mode()implementations have nothing to operate on and need to be removed, too.Some thermal framework specific functions are introduced:
thermal_zone_device_get_mode()thermal_zone_device_set_mode()thermal_zone_device_enable()thermal_zone_device_disable()Quoted 8 lines
thermal_zone_device_get_mode()and its "set" counterpart take tzd's lock and the "set" calls driver'sset_mode()if provided, so the latter must not take this lock again. At the end of the "set"thermal_zone_device_update()is called so drivers don't need to repeat this invocation in their specificset_mode()implementations.The scope of the above 4 functions is purposedly limited to the thermal framework and drivers are not supposed to call them. This encapsulation
Quoted 9 lines
This should be true only for thermal_zone_device_{get,set}_mode().
thermal_zone_device_{en,dis}able() should be available for device drivers:
* of/thermal device drivers need to enable thermal device itself (please refer to my patchset for details)
* device drivers need to call them on ->suspend and ->resume operations
@Daniel:
How does this compare to
"Just:
thermal_zone_device_get_mode()thermal_zone_device_set_mode()thermal_zone_device_disable()thermal_zone_device_enable()
And all of them in drivers/thermal/thermal_core.h". Did I understand you correctly?
Andrzej
Re: [RFC v3 1/2] thermal: core: Let thermal zone device's mode be stored in its struct
@Daniel
please see below
W dniu 20.04.2020 o 13:03, Andrzej Pietrasiewicz pisze:
Quoted 50 lines
Hi Barlomiej,
Thanks for looking into the series.
@Daniel can you see below?
W dniu 19.04.2020 o 13:38, Bartlomiej Zolnierkiewicz pisze:
Quoted 27 lines
Hi Andrzej,
Quoted 14 lines · Andrzej Pietrasiewicz
Thermal zone devices' mode is stored in individual drivers. This patch changes it so that mode is stored in struct
thermal_zone_deviceinstead.As a result all driver-specific variables storing the mode are not needed and are removed. Consequently, the
get_mode()implementations have nothing to operate on and need to be removed, too.Some thermal framework specific functions are introduced:
thermal_zone_device_get_mode()thermal_zone_device_set_mode()thermal_zone_device_enable()thermal_zone_device_disable()Quoted 8 lines
thermal_zone_device_get_mode()and its "set" counterpart take tzd's lock and the "set" calls driver'sset_mode()if provided, so the latter must not take this lock again. At the end of the "set"thermal_zone_device_update()is called so drivers don't need to repeat this invocation in their specificset_mode()implementations.The scope of the above 4 functions is purposedly limited to the thermal framework and drivers are not supposed to call them. This encapsulation
Quoted 9 lines
This should be true only for thermal_zone_device_{get,set}_mode().
thermal_zone_device_{en,dis}able() should be available for device drivers:
* of/thermal device drivers need to enable thermal device itself (please refer to my patchset for details)
* device drivers need to call them on ->suspend and ->resume operations
@Daniel:
How does this compare to
"Just:
Quoted 8 lines
thermal_zone_device_get_mode()thermal_zone_device_set_mode()thermal_zone_device_disable()thermal_zone_device_enable()And all of them in
drivers/thermal/thermal_core.h". Did I understand you correctly?
I sent a PATCH series (rather than next iteration of RFC) addressing Bartlomiej's comments. They make sense to me.
Regards,
Andrzej
Re: [RFC v3 1/2] thermal: core: Let thermal zone device's mode be stored in its struct
In reply to Andrzej PietrasiewiczQuoted 20 lines · Andrzej Pietrasiewicz
Thermal zone devices' mode is stored in individual drivers. This patch changes it so that mode is stored in struct
thermal_zone_deviceinstead.As a result all driver-specific variables storing the mode are not needed and are removed. Consequently, the
get_mode()implementations have nothing to operate on and need to be removed, too.Some thermal framework specific functions are introduced:
thermal_zone_device_get_mode()thermal_zone_device_set_mode()thermal_zone_device_enable()thermal_zone_device_disable()
thermal_zone_device_get_mode()and its "set" counterpart take tzd's lock and the "set" calls driver'sset_mode()if provided, so the latter must not take this lock again. At the end of the "set"thermal_zone_device_update()is called so drivers don't need to repeat this invocation in their specificset_mode()implementations.
Quoted 5 lines
The scope of the above 4 functions is purposedly limited to the thermal framework and drivers are not supposed to call them. This encapsulation does not fully work at the moment for some drivers, though:
-
platform/x86/acerhdf.c
[...]
Signature · 1 line
--peter;
Re: [RFC v3 1/2] thermal: core: Let thermal zone device's mode be stored in its struct
In reply to Andrzej PietrasiewiczHi Andrzej,
Quoted 31 lines · Andrzej Pietrasiewicz
Thermal zone devices' mode is stored in individual drivers. This patch changes it so that mode is stored in struct
thermal_zone_deviceinstead.As a result all driver-specific variables storing the mode are not needed and are removed. Consequently, the
get_mode()implementations have nothing to operate on and need to be removed, too.Some thermal framework specific functions are introduced:
thermal_zone_device_get_mode()thermal_zone_device_set_mode()thermal_zone_device_enable()thermal_zone_device_disable()
thermal_zone_device_get_mode()and its "set" counterpart take tzd's lock and the "set" calls driver'sset_mode()if provided, so the latter must not take this lock again. At the end of the "set"thermal_zone_device_update()is called so drivers don't need to repeat this invocation in their specificset_mode()implementations.The scope of the above 4 functions is purposedly limited to the thermal framework and drivers are not supposed to call them. This encapsulation does not fully work at the moment for some drivers, though:
-
platform/x86/acerhdf.c
-drivers/thermal/imx_thermal.c
-drivers/thermal/intel/intel_quark_dts_thermal.c
-drivers/thermal/of-thermal.cand they manipulate struct thermal_zone_device's members directly.
Quoted 8 lines
struct
thermal_zone_paramsgains a new member calledinitial_mode, which is used to set tzd's mode at registration time.The sysfs "mode" attribute is always exposed from now on, because all thermal zone devices now have their
get_mode()implemented at the generic level and it is always available. Exposing "mode" doesn't hurt the drivers which don't provide their ownset_mode(), because writing to "mode" will result in-EPERM, as expected.
The result is great, that is a nice cleanup of the thermal framework.
After review it appears there are still problems IMO, especially with the suspend / resume path. The patch is big, it is a bit complex to comment. I suggest to re-org the changes as following:
- patch 1 : Add the four functions:
* thermal_zone_device_set_mode()
* thermal_zone_device_enable()
* thermal_zone_device_disable()
* thermal_zone_device_is_enabled()
*but* do not export thermal_zone_device_set_mode(), it must stay private to the thermal framework ATM.
- patch 2 : Add the mode THERMAL_DEVICE_SUSPENDED
In the thermal_pm_notify() in the:
- PM_SUSPEND_PREPARE case, set the mode to THERMAL_DEVICE_SUSPENDED if
the mode is THERMAL_DEVICE_ENABLED
- PM_POST_SUSPEND case, set the mode to THERMAL_DEVICE_ENABLED, if the
mode is THERMAL_DEVICE_SUSPENDED
- patch 3 : Change the monitor function
Change monitor_thermal_zone() function to set the polling to zero if the mode is THERMAL_DEVICE_DISABLED
- patch 4 : Do the changes to remove get_mode() ops
Make sure there is no access to tz->mode from the drivers anymore but use of the functions of patch 1. IMO, this is the tricky part because a part of the drivers are not calling the update after setting the mode while the function thermal_zone_device_enable()/disable() call update via the thermal_zone_device_set_mode(), so we must be sure to not break anything.
- patch 5 : Do the changes to remove set_mode() ops users
As the patch 3 sets the polling to zero, the routine in the driver setting the polling to zero is no longer needed (eg. in the mellanox driver). I expect int300 to be the last user of this ops, hopefully we can find a way to get rid of the specific call done inside and then remove the ops.
The initial_mode approach looks hackish, I suggest to make the default the thermal zone disabled after creating and then explicitly enable it. Note that is what do a lot of drivers already.
Hopefully, these changes are git-bisect safe.
Does it make sense ?
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Re: [RFC v3 1/2] thermal: core: Let thermal zone device's mode be stored in its struct
Hi Daniel,
W dniu 23.05.2020 o 23:24, Daniel Lezcano pisze:
Quoted 51 lines
Hi Andrzej,
Quoted 31 lines · Andrzej Pietrasiewicz
Thermal zone devices' mode is stored in individual drivers. This patch changes it so that mode is stored in struct
thermal_zone_deviceinstead.As a result all driver-specific variables storing the mode are not needed and are removed. Consequently, the
get_mode()implementations have nothing to operate on and need to be removed, too.Some thermal framework specific functions are introduced:
thermal_zone_device_get_mode()thermal_zone_device_set_mode()thermal_zone_device_enable()thermal_zone_device_disable()
thermal_zone_device_get_mode()and its "set" counterpart take tzd's lock and the "set" calls driver'sset_mode()if provided, so the latter must not take this lock again. At the end of the "set"thermal_zone_device_update()is called so drivers don't need to repeat this invocation in their specificset_mode()implementations.The scope of the above 4 functions is purposedly limited to the thermal framework and drivers are not supposed to call them. This encapsulation does not fully work at the moment for some drivers, though:
-
platform/x86/acerhdf.c
-drivers/thermal/imx_thermal.c
-drivers/thermal/intel/intel_quark_dts_thermal.c
-drivers/thermal/of-thermal.cand they manipulate struct thermal_zone_device's members directly.
Quoted 8 lines
struct
thermal_zone_paramsgains a new member calledinitial_mode, which is used to set tzd's mode at registration time.The sysfs "mode" attribute is always exposed from now on, because all thermal zone devices now have their
get_mode()implemented at the generic level and it is always available. Exposing "mode" doesn't hurt the drivers which don't provide their ownset_mode(), because writing to "mode" will result in-EPERM, as expected.The result is great, that is a nice cleanup of the thermal framework.
After review it appears there are still problems IMO, especially with the suspend / resume path. The patch is big, it is a bit complex to comment. I suggest to re-org the changes as following:
- patch 1 : Add the four functions:
Quoted 7 lines
*
thermal_zone_device_set_mode()
*thermal_zone_device_enable()
*thermal_zone_device_disable()
*thermal_zone_device_is_enabled()*but* do not export
thermal_zone_device_set_mode(), it must stay private to the thermal framework ATM.
Not exporting thermal_zone_device_set_mode() implies not exporting thermal_zone_device_enable()/thermal_zone_device_disable() because they are implemented in terms of the former. Or do you have a different idea?
Quoted 8 lines
- patch 2 : Add the mode
THERMAL_DEVICE_SUSPENDEDIn the
thermal_pm_notify()in the:-
PM_SUSPEND_PREPAREcase, set the mode toTHERMAL_DEVICE_SUSPENDEDif
the mode isTHERMAL_DEVICE_ENABLED
Quoted 7 lines
-
PM_POST_SUSPENDcase, set the mode toTHERMAL_DEVICE_ENABLED, if the
mode isTHERMAL_DEVICE_SUSPENDED- patch 3 : Change the monitor function
Change
monitor_thermal_zone()function to set the polling to zero if the mode isTHERMAL_DEVICE_DISABLED
So we assume this: if a driver creates a tz which is initially ENABLED, it will be polled. If a driver creates a tz which is initially DISABLED (which is what you suggest the drivers should be doing, but not all of them do), it won't be polled unless the driver explicitly enables its tz.
Am I concluding right that a suspended device will remain polled? Is it ok?
Quoted 9 lines
- patch 4 : Do the changes to remove
get_mode()opsMake sure there is no access to
tz->modefrom the drivers anymore but use of the functions of patch 1. IMO, this is the tricky part because a part of the drivers are not calling the update after setting the mode while the function thermal_zone_device_enable()/disable() call update via thethermal_zone_device_set_mode(), so we must be sure to not break anything.
Ah, I guess now is the time to make the functions from patch 1 exported?
Ensuring no driver accesses tz->mode directly might be tricky, indeed. If it can be shown that calling the update doesn't hurt a particular driver, it can be converted to use the helpers instead of manipulating tz->mode directly. If, however, it does make a difference then it all depends and getting rid of accessing tz->mode directly might require help from the respective maintainers.
This also calls for storing tz's mode in struct thermal_zone_device rather than in individual drivers. In fact it seems the purpose of ->get_mode() is to produce the state stored internally in drivers. Removing ->get_mode() requires changing the place where the state is stored. struct thermal_zone_device seems most appropriate. So this patch is not going to be small.
Once we start storing tz's state in struct thermal_zone_device the ->set_mode() implementations need to be changed, too. To me it seems awkward to split this change in two patches: if we keep the changes split then in patch 4 we need to introduce code which implements ->set_mode() in terms of the new state location, only to remove it in the very next patch.
While we are at it some drivers, namely acpi/thermal and int3400 store their mode in an int rather than enum thermal_device_mode. So maybe changing this should go even before patch 4? acerhdf does not store its mode at all and on top of it it wants to manipulate the polling delay directly and it has a module parameter which specifies it.
Quoted 8 lines
- patch 5 : Do the changes to remove
set_mode()ops usersAs the patch 3 sets the polling to zero, the routine in the driver setting the polling to zero is no longer needed (eg. in the mellanox driver). I expect int300 to be the last user of this ops, hopefully we can find a way to get rid of the specific call done inside and then remove the ops.
acerhdf wants ->set_mode() desperately.
Quoted 3 lines
The
initial_modeapproach looks hackish, I suggest to make the default the thermal zone disabled after creating and then explicitly enable it.
Is it needed in drivers which create their thermal zone enabled?
Regards,
Andrzej
Re: [RFC v3 1/2] thermal: core: Let thermal zone device's mode be stored in its struct
Quoted 64 lines · Andrzej Pietrasiewicz
Hi Daniel,
W dniu 23.05.2020 o 23:24, Daniel Lezcano pisze:
Quoted 61 lines
Hi Andrzej,
Quoted 37 lines · Andrzej Pietrasiewicz
Thermal zone devices' mode is stored in individual drivers. This patch changes it so that mode is stored in struct
thermal_zone_deviceinstead.As a result all driver-specific variables storing the mode are not needed
and are removed. Consequently, theget_mode()implementations have nothing
to operate on and need to be removed, too.Some thermal framework specific functions are introduced:
thermal_zone_device_get_mode()thermal_zone_device_set_mode()thermal_zone_device_enable()thermal_zone_device_disable()
thermal_zone_device_get_mode()and its "set" counterpart take tzd's lock and the "set" calls driver'sset_mode()if provided, so the latter must not take this lock again. At the end of the "set"thermal_zone_device_update()is called so drivers don't need to repeat this
invocation in their specificset_mode()implementations.The scope of the above 4 functions is purposedly limited to the thermal framework and drivers are not supposed to call them. This encapsulation does not fully work at the moment for some drivers, though:
-
platform/x86/acerhdf.c
-drivers/thermal/imx_thermal.c
-drivers/thermal/intel/intel_quark_dts_thermal.c
-drivers/thermal/of-thermal.cand they manipulate struct thermal_zone_device's members directly.
struct
thermal_zone_paramsgains a new member calledinitial_mode, which is used to set tzd's mode at registration time.Quoted 7 lines
The sysfs "mode" attribute is always exposed from now on, because all thermal zone devices now have their
get_mode()implemented at the generic
level and it is always available. Exposing "mode" doesn't hurt the drivers
which don't provide their ownset_mode(), because writing to "mode" will result in-EPERM, as expected.The result is great, that is a nice cleanup of the thermal framework.
After review it appears there are still problems IMO, especially with the suspend / resume path. The patch is big, it is a bit complex to comment. I suggest to re-org the changes as following:
- patch 1 : Add the four functions:
*
thermal_zone_device_set_mode()
*thermal_zone_device_enable()
*thermal_zone_device_disable()
*thermal_zone_device_is_enabled()
Quoted 6 lines
Quoted 2 lines
*but* do not export
thermal_zone_device_set_mode(), it must stay private to the thermal framework ATM.Not exporting
thermal_zone_device_set_mode()implies not exporting thermal_zone_device_enable()/thermal_zone_device_disable() because they are implemented in terms of the former. Or do you have a different idea?
I meant no inline for them but as below:
in .h
extern int thermal_zone_device_enable();
extern int thermal_zone_device_disable();
extern int thermal_zone_device_is_enabled();
in .c
static int thermal_zone_device_set_mode()
{
...
}int thermal_zone_device_enable()
{
thermal_zone_device_set_mode();
}EXPORT_SYMBOL_GPL(thermal_zone_device_enable);
Quoted 12 lines
Quoted 12 lines
- patch 2 : Add the mode
THERMAL_DEVICE_SUSPENDEDIn the
thermal_pm_notify()in the:-
PM_SUSPEND_PREPAREcase, set the mode toTHERMAL_DEVICE_SUSPENDEDif the mode isTHERMAL_DEVICE_ENABLED-
PM_POST_SUSPENDcase, set the mode toTHERMAL_DEVICE_ENABLED, if the mode isTHERMAL_DEVICE_SUSPENDED- patch 3 : Change the monitor function
Quoted 7 lines
Quoted 2 lines
Change
monitor_thermal_zone()function to set the polling to zero if the mode isTHERMAL_DEVICE_DISABLEDSo we assume this: if a driver creates a tz which is initially ENABLED, it will be polled. If a driver creates a tz which is initially DISABLED (which is what you suggest the drivers should be doing, but not all of them do), it won't be polled unless the driver explicitly enables its tz.
Yes.
Quoted 1 line
Am I concluding right that a suspended device will remain polled? Is it ok?
Actually it is not ok but AFAICT, it is the current behavior. The polling do not stop but the 'in_suspend' prevent an update. I thought we can post-pone the suspend case later when the ENABLED/DISABLED changes are consolidated, so SUSPENDED will act as DISABLED.
Quoted 10 lines
Quoted 8 lines
- patch 4 : Do the changes to remove
get_mode()opsMake sure there is no access to
tz->modefrom the drivers anymore but use of the functions of patch 1. IMO, this is the tricky part because a part of the drivers are not calling the update after setting the mode while the function thermal_zone_device_enable()/disable() call update via thethermal_zone_device_set_mode(), so we must be sure to not break anything.Ah, I guess now is the time to make the functions from patch 1 exported?
Yes :)
Quoted 7 lines
Ensuring no driver accesses
tz->modedirectly might be tricky, indeed. If it can be shown that calling the update doesn't hurt a particular driver,
it can be converted to use the helpers instead of manipulatingtz->modedirectly. If, however, it does make a difference then it all depends and getting rid of accessingtz->modedirectly might require help from the respective maintainers.
Agree.
Quoted 6 lines
This also calls for storing tz's mode in struct
thermal_zone_devicerather than in individual drivers. In fact it seems the purpose of ->get_mode() is to produce the state stored internally in drivers. Removing ->get_mode() requires changing the place where the state is stored. structthermal_zone_deviceseems most appropriate. So this patch is not going to be small.
Yes, the patch can be big. It is fine if the changes are only to replace tz->mode by their respective disable/enable/is_enabled functions. More complex changes can be separate.
Quoted 6 lines
Once we start storing tz's state in struct
thermal_zone_devicethe ->set_mode() implementations need to be changed, too. To me it seems awkward to split this change in two patches: if we keep the changes split then in patch 4 we need to introduce code which implements ->set_mode() in terms of the new state location, only to remove it in the very next patch.
Yes, it is a valid point. May be you can do the changes in two patches to see the results in terms of complexity for the review process, then decide if it is worth to merge them before sending.
Quoted 3 lines
While we are at it some drivers, namely acpi/thermal and int3400 store their mode in an int rather than enum
thermal_device_mode. So maybe changing this should go even before patch 4?
I agree.
Quoted 8 lines
acerhdf does not store
its mode at all and on top of it it wants to manipulate the polling delay directly and it has a module parameter which specifies it.Quoted 2 lines
- patch 5 : Do the changes to remove
set_mode()ops users
Quoted 7 lines
Quoted 5 lines
As the patch 3 sets the polling to zero, the routine in the driver setting the polling to zero is no longer needed (eg. in the mellanox driver). I expect int300 to be the last user of this ops, hopefully we can find a way to get rid of the specific call done inside and then remove the ops.
acerhdf wants ->set_mode() desperately.
Yes, there is a couple of drivers which requires for the moment to keep the ops->set_mode to be called: int3400 and acerhdf. Both of them will be greatly simplified with the DISABLED / ENABLED changes.
Quoted 4 lines
Quoted 2 lines
The
initial_modeapproach looks hackish, I suggest to make the default the thermal zone disabled after creating and then explicitly enable it.Is it needed in drivers which create their thermal zone enabled?
IMO, yes. We are doing changes with a code prone to issues, so making the steps: creation + enable will make things more clear. For instance, the clk framework do the same.
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Re: [RFC v3 1/2] thermal: core: Let thermal zone device's mode be stored in its struct
Hi Daniel,
W dniu 26.05.2020 o 00:08, Daniel Lezcano pisze:
Quoted 87 lines · Andrzej Pietrasiewicz
Quoted 64 lines
Hi Daniel,
W dniu 23.05.2020 o 23:24, Daniel Lezcano pisze:
Quoted 61 lines
Hi Andrzej,
Quoted 37 lines · Andrzej Pietrasiewicz
Thermal zone devices' mode is stored in individual drivers. This patch changes it so that mode is stored in struct
thermal_zone_deviceinstead.As a result all driver-specific variables storing the mode are not needed
and are removed. Consequently, theget_mode()implementations have nothing
to operate on and need to be removed, too.Some thermal framework specific functions are introduced:
thermal_zone_device_get_mode()thermal_zone_device_set_mode()thermal_zone_device_enable()thermal_zone_device_disable()
thermal_zone_device_get_mode()and its "set" counterpart take tzd's lock and the "set" calls driver'sset_mode()if provided, so the latter must not take this lock again. At the end of the "set"thermal_zone_device_update()is called so drivers don't need to repeat this
invocation in their specificset_mode()implementations.The scope of the above 4 functions is purposedly limited to the thermal framework and drivers are not supposed to call them. This encapsulation does not fully work at the moment for some drivers, though:
-
platform/x86/acerhdf.c
-drivers/thermal/imx_thermal.c
-drivers/thermal/intel/intel_quark_dts_thermal.c
-drivers/thermal/of-thermal.cand they manipulate struct thermal_zone_device's members directly.
struct
thermal_zone_paramsgains a new member calledinitial_mode, which is used to set tzd's mode at registration time.Quoted 7 lines
The sysfs "mode" attribute is always exposed from now on, because all thermal zone devices now have their
get_mode()implemented at the generic
level and it is always available. Exposing "mode" doesn't hurt the drivers
which don't provide their ownset_mode(), because writing to "mode" will result in-EPERM, as expected.The result is great, that is a nice cleanup of the thermal framework.
After review it appears there are still problems IMO, especially with the suspend / resume path. The patch is big, it is a bit complex to comment. I suggest to re-org the changes as following:
- patch 1 : Add the four functions:
*
thermal_zone_device_set_mode()
*thermal_zone_device_enable()
*thermal_zone_device_disable()
*thermal_zone_device_is_enabled()Quoted 6 lines
Quoted 2 lines
*but* do not export
thermal_zone_device_set_mode(), it must stay private to the thermal framework ATM.Not exporting
thermal_zone_device_set_mode()implies not exporting thermal_zone_device_enable()/thermal_zone_device_disable() because they are implemented in terms of the former. Or do you have a different idea?I meant no inline for them but as below:
in .h
extern int
thermal_zone_device_enable();
extern intthermal_zone_device_disable();
extern intthermal_zone_device_is_enabled();in .c
static int
thermal_zone_device_set_mode(){ ... }
Quoted 6 lines
int
thermal_zone_device_enable(){ thermal_zone_device_set_mode(); }
EXPORT_SYMBOL_GPL(thermal_zone_device_enable);
Hmm. I'm trying to proceed according to what you outline, but it doesn't feel the right approach. Let me show you patch 1:
drivers/thermal/thermal_core.c:
+int thermal_zone_device_set_mode(struct thermal_zone_device *tz,
+ enum thermal_device_mode mode)
+{
+ int ret = 0;
+
+ mutex_lock(&tz->lock);
+
+ if (tz->ops->set_mode)
+ ret = tz->ops->set_mode(tz, mode);
+
+ mutex_unlock(&tz->lock);
+
+ thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);
+
+ return ret;
+}
+
+int thermal_zone_device_enable(struct thermal_zone_device *tz) +{
+ return thermal_zone_device_set_mode(tz, THERMAL_DEVICE_ENABLED);
+}
+EXPORT_SYMBOL(thermal_zone_device_enable);
+
+int thermal_zone_device_disable(struct thermal_zone_device *tz) +{
+ return thermal_zone_device_set_mode(tz, THERMAL_DEVICE_DISABLED);
+}
+EXPORT_SYMBOL(thermal_zone_device_disable);
+
+int thermal_zone_device_is_enabled(struct thermal_zone_device *tz) +{
+ enum thermal_device_mode mode = THERMAL_DEVICE_ENABLED;
+ int ret;
+
+ mutex_lock(&tz->lock);
+
+ if (tz->ops->get_mode)
+ ret = tz->ops->get_mode(tz, &mode);
+
+ mutex_unlock(&tz->lock);
+
+ return mode == THERMAL_DEVICE_ENABLED;
+}
+EXPORT_SYMBOL(thermal_zone_device_is_enabled);
+
plus prototypes of all except set_mode in include/linux/thermal.h
I can see 2 problems:
1) we add unused code to the kernel (perhaps this is ok if patches in this series will start using it)
2) tzd *does not* store mode. These are drivers that provide mode access with get_mode()/set_mode() - if they implement them. What if they don't? If thermal_zone_device_set_mode() is introduced now its effect depends on whether a driver implements set_mode() or not. If it doesn't then despite thermal_zone_device_set_mode() being invoked the mode is not changed. Then what does thermal_zone_device_is_enabled() mean? We don't know, because we don't know what the effect of thermal_zone_device_set_mode() is in the first place. And if the driver does not provide get_mode() then thermal_zone_device_is_enabled() always returns "enabled".
Adding these functions now without mode being stored in tzd seems awkward to me. Consequently, IMO the first thing to do is make tzd store device's mode and this way be independent from whether drivers implement or not implement get_mode()/set_mode().
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
- patch 2 : Add the mode
THERMAL_DEVICE_SUSPENDEDIn the
thermal_pm_notify()in the:-
PM_SUSPEND_PREPAREcase, set the mode toTHERMAL_DEVICE_SUSPENDEDif
the mode isTHERMAL_DEVICE_ENABLED-
PM_POST_SUSPENDcase, set the mode toTHERMAL_DEVICE_ENABLED, if the
mode isTHERMAL_DEVICE_SUSPENDED
drivers/thermal/thermal_core.c:
case PM_HIBERNATION_PREPARE:
case PM_RESTORE_PREPARE:
case PM_SUSPEND_PREPARE:
+ list_for_each_entry(tz, &thermal_tz_list, node) {
+ tz_mode = THERMAL_DEVICE_ENABLED;
+ if (tz->ops->get_mode)
+ tz->ops->get_mode(tz, &tz_mode);
+ if (tz_mode == THERMAL_DEVICE_ENABLED)
+ thermal_zone_device_set_mode(tz,
+ THERMAL_DEVICE_SUSPENDED);
+ }
atomic_set(&in_suspend, 1);
break;
case PM_POST_HIBERNATION:
@@ -1530,6 +1538,9 @@ static int thermal_pm_notify(struct notifier_block *nb,
tz_mode = THERMAL_DEVICE_ENABLED;
if (tz->ops->get_mode)
tz->ops->get_mode(tz, &tz_mode);
if (tz_mode == THERMAL_DEVICE_DISABLED)
continue;
+ if (tz_mode == THERMAL_DEVICE_SUSPENDED)
+ thermal_zone_device_set_mode(tz,
+ THERMAL_DEVICE_ENABLED);
include/linux/thermal.h:
enum thermal_device_mode {
THERMAL_DEVICE_DISABLED = 0,
THERMAL_DEVICE_ENABLED,
+ THERMAL_DEVICE_SUSPENDED,
We don't know if set_mode() was effective in PM_SUSPEND_PREPARE_PATH. If it wasn't then instead of being SUSPENDED the device is still ENABLED. If still enabled it doesn't need enabling so the last "if" does the right thing, but does not feel right.
Quoted 10 lines
Quoted 9 lines
Quoted 4 lines
- patch 3 : Change the monitor function
Change
monitor_thermal_zone()function to set the polling to zero if the mode isTHERMAL_DEVICE_DISABLEDSo we assume this: if a driver creates a tz which is initially ENABLED, it will be polled. If a driver creates a tz which is initially DISABLED (which is what you suggest the drivers should be doing, but not all of them do), it won't be polled unless the driver explicitly enables its tz.
Quoted 9 lines
Yes.
Quoted 1 line
Am I concluding right that a suspended device will remain polled? Is it ok?
Actually it is not ok but AFAICT, it is the current behavior. The polling do not stop but the '
in_suspend' prevent an update. I thought we can post-pone the suspend case later when the ENABLED/DISABLED changes are consolidated, so SUSPENDED will act as DISABLED.
drivers/thermal/thermal_core.c:
static void monitor_thermal_zone(struct thermal_zone_device *tz) {
+ enum thermal_device_mode tz_mode = THERMAL_DEVICE_ENABLED;
+
mutex_lock(&tz->lock);
- if (tz->passive)
+ if (tz->ops->get_mode)
+ tz->ops->get_mode(tz, &tz_mode);
+
+ if (tz->passive && mode != THERMAL_DEVICE_DISABLED)
thermal_zone_device_set_polling(tz, tz->passive_delay);
- else if (tz->polling_delay)
+ else if (tz->polling_delay && mode != THERMAL_DEVICE_DISABLED)
thermal_zone_device_set_polling(tz, tz->polling_delay);
else
thermal_zone_device_set_polling(tz, 0);
If the driver does not implement get_mode() then we assume ENABLED. What if it is actually DISABLED?
How does this depend on patch 1 or patch 2?
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
- patch 4 : Do the changes to remove
get_mode()opsMake sure there is no access to
tz->modefrom the drivers anymore but use of the functions of patch 1. IMO, this is the tricky part because a part of the drivers are not calling the update after setting the mode while the function thermal_zone_device_enable()/disable() call update via thethermal_zone_device_set_mode(), so we must be sure to not break anything.
I haven't started this yet, but again it seems to me that drivers need to start storing their mode in tzd->mode in the first place
So what I envision is this:
1) Make all drivers store their state still locally, but using the enum (not all of them do)
2) Once all drivers store their state in the enum, store the enum in struct tzd instead of locally in drivers. This makes get_mode() driver op redundant, but if you prefer more granularity removing it might be done in a separate patch (at the expense of modifying it now to use tzd's member instead of driver-local variable). This also impacts set_mode() ops, because they need to actually change tzd's member instead of some driver-level variable. Changing set_mode() IMO needs to be done in one go.
3) Remove get_mode() driver op altogether, as the mode is stored in struct tzd.
4) patch 1 you outlined - set_mode() and is_enabled() will now operate on tzd's members, so their effect does not depend on drivers implementing or not implementing set_mode(). These effects don't depend on get_mode() any more because of 3). set_mode() would still be calling the set_mode() op in drivers before modifying tzd->mode.
5) patch 2 you outlined - but it can't use thermal_zone_device_set_mode(), because if it gets and then changes tzd's mode, it must do so under tzd->lock. This is ok as this is the very implementation of thermal_core, so accessing "private" members of tzd is a valid approach here.
6) patch 3 you outlined - now it makes much more sense to query tzd's member for mode instead of relying on drivers implementing get_mode().
7) patch 4 you outlined but under a different name, because get_mode() is already gone. The guts of the patch should be doing what you wrote, though, which is use the helpers instead of directly modifying tzd's members in drivers.
8) patch 5 you outlined - perhaps under a different name, but still doing the same thing: removing portions of code which set polling time to zero in drivers, as that is already being done at tzd's level. This would hopefully make at least some set_mode() implementations no-ops and, consequently, redundant. I can see these drivers: mellanox, part of acerhdf (this driver wants to know when it is becoming enabled/disabled, but the part setting polling can be removed), part of imx (similar situation to that of acerhdf) and of-thermal.
After 8) there would be 5 non-empty set_mode() implementations:
acpi - but apparently only to print some debug, maybe can be removed acerhdf - no idea if it can live without knowing when the mode changes imx - ditto
int3400 - ditto
quark - ditto
Perhaps after 8) instead of removing set_mode() maybe we should change its name to better reflect its purpose: mode_changing() ? Or maybe even such a change should be a part of 4)?
Regards,
Andrzej
Re: [RFC v3 1/2] thermal: core: Let thermal zone device's mode be stored in its struct
In reply to Daniel LezcanoHi Daniel,
Quoted 43 lines · Daniel Lezcano
Hi Andrzej,
Quoted 31 lines · Andrzej Pietrasiewicz
Thermal zone devices' mode is stored in individual drivers. This patch changes it so that mode is stored in struct
thermal_zone_deviceinstead.As a result all driver-specific variables storing the mode are not needed and are removed. Consequently, the
get_mode()implementations have nothing to operate on and need to be removed, too.Some thermal framework specific functions are introduced:
thermal_zone_device_get_mode()thermal_zone_device_set_mode()thermal_zone_device_enable()thermal_zone_device_disable()
thermal_zone_device_get_mode()and its "set" counterpart take tzd's lock and the "set" calls driver'sset_mode()if provided, so the latter must not take this lock again. At the end of the "set"thermal_zone_device_update()is called so drivers don't need to repeat this invocation in their specificset_mode()implementations.The scope of the above 4 functions is purposedly limited to the thermal framework and drivers are not supposed to call them. This encapsulation does not fully work at the moment for some drivers, though:
-
platform/x86/acerhdf.c
-drivers/thermal/imx_thermal.c
-drivers/thermal/intel/intel_quark_dts_thermal.c
-drivers/thermal/of-thermal.cand they manipulate struct thermal_zone_device's members directly.
Quoted 8 lines
struct
thermal_zone_paramsgains a new member calledinitial_mode, which is used to set tzd's mode at registration time.The sysfs "mode" attribute is always exposed from now on, because all thermal zone devices now have their
get_mode()implemented at the generic level and it is always available. Exposing "mode" doesn't hurt the drivers which don't provide their ownset_mode(), because writing to "mode" will result in-EPERM, as expected.
Quoted 5 lines
The result is great, that is a nice cleanup of the thermal framework.
After review it appears there are still problems IMO, especially with the suspend / resume path. The patch is big, it is a bit complex to comment. I suggest to re-org the changes as following:
There are still issues with the related existing thermal code but this patch seems to be a step in the right direction.
For the latest version posted ("v3" one, your mail was replied to the older "RFC v3" one):
https://lore.kernel.org/linux-pm/[email protected]/
I couldn't find the problems with the patch itself (no new issues being introduced, all changes seem to be improvements over the current situation).
Also the patch is not small but it also not that big and it mostly removes the code:
17 files changed, 105 insertions(+), 244 deletions(-)
I worry that since the original code is intertwined in the interesting ways the cost of work on splitting the patch on smaller changes may be higher than its benefits.
Quoted 42 lines
- patch 1 : Add the four functions:
*
thermal_zone_device_set_mode()
*thermal_zone_device_enable()
*thermal_zone_device_disable()
*thermal_zone_device_is_enabled()*but* do not export
thermal_zone_device_set_mode(), it must stay private to the thermal framework ATM.- patch 2 : Add the mode
THERMAL_DEVICE_SUSPENDEDIn the
thermal_pm_notify()in the:-
PM_SUSPEND_PREPAREcase, set the mode toTHERMAL_DEVICE_SUSPENDEDif
the mode isTHERMAL_DEVICE_ENABLED-
PM_POST_SUSPENDcase, set the mode toTHERMAL_DEVICE_ENABLED, if the
mode isTHERMAL_DEVICE_SUSPENDED- patch 3 : Change the monitor function
Change
monitor_thermal_zone()function to set the polling to zero if the mode isTHERMAL_DEVICE_DISABLED- patch 4 : Do the changes to remove
get_mode()opsMake sure there is no access to
tz->modefrom the drivers anymore but use of the functions of patch 1. IMO, this is the tricky part because a part of the drivers are not calling the update after setting the mode while the function thermal_zone_device_enable()/disable() call update via thethermal_zone_device_set_mode(), so we must be sure to not break anything.- patch 5 : Do the changes to remove
set_mode()ops usersAs the patch 3 sets the polling to zero, the routine in the driver setting the polling to zero is no longer needed (eg. in the mellanox driver). I expect int300 to be the last user of this ops, hopefully we can find a way to get rid of the specific call done inside and then remove the ops.
Quoted 7 lines
The
initial_modeapproach looks hackish, I suggest to make the default the thermal zone disabled after creating and then explicitly enable it. Note that is what do a lot of drivers already.Hopefully, these changes are git-bisect safe.
Does it make sense ?
Besides the requirement to split the patch it seems that the above list contains a lot of problematic areas with the existing thermal code yet to be addressed..
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
RFC v3 2/2 thermal: core: Stop polling DISABLED thermal devices
In reply to Andrzej PietrasiewiczPolling DISABLED devices is not desired, as all such "disabled" devices are meant to be handled by userspace. This patch introduces and uses should_stop_polling() to decide whether the device should be polled or not.
--- drivers/thermal/thermal_core.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/thermal/thermal_core.c +14 -2
@@ -305,13 +305,22 @@ static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,cancel_delayed_work (&tz->poll_queue); } +static inline bool should_stop_polling (struct thermal_zone_device *tz) +{ +return thermal_zone_device_get_mode (tz) ==THERMAL_DEVICE_DISABLED ; +} +static void monitor_thermal_zone (struct thermal_zone_device *tz) { +bool stop; + + stop =should_stop_polling (tz); +mutex_lock (&tz->lock); -if (tz->passive) +if (!stop && tz->passive)thermal_zone_device_set_polling (tz, tz->passive_delay); -else if (tz->polling_delay) +else if (!stop && tz->polling_delay)thermal_zone_device_set_polling (tz, tz->polling_delay);else thermal_zone_device_set_polling (tz,0 );
@@ -505,6 +514,9 @@ void thermal_zone_device_update(struct thermal_zone_device *tz, {int count; +if (should_stop_polling (tz)) +return ; +if (atomic_read (&in_suspend))return ;
Signature · 1 line
2.17.1
RFC v2 6/9 thermal: Remove get_mode() method
In reply to Andrzej PietrasiewiczNow that mode of all thermal zone devices is stored in struct thermal_zone_device the get_mode() method is not used nor necessary any more. All its former users used it only to report the state of their then-internal variable.
The sysfs "mode" attribute is always exposed from now on. It doesn't hurt the drivers which don't provide their own set_mode(), because writing to "mode" will result in -EPERM, as expected.
thermal_zone_device_get_mode() will always succeed, so let it return the actual value rather than an always-zero return code.
--- drivers/acpi/thermal.c | 12 ++-------- drivers/thermal/imx_thermal.c | 6 +---- .../intel/int340x_thermal/int3400_thermal.c | 6 +---- drivers/thermal/thermal_core.c | 16 +------------- drivers/thermal/thermal_sysfs.c | 22 +------------------ include/linux/thermal.h | 16 ++++++++------ 6 files changed, 15 insertions(+), 63 deletions(-)
drivers/acpi/thermal.c +2 -10
@@ -500,11 +500,7 @@ static void acpi_thermal_check(void *data)struct acpi_thermal *tz = data;enum thermal_device_mode mode; -/* -* this driver does not provide ->get_mode(), so calling -* thermal_zone_device_get_mode() always succeeds -*/ -thermal_zone_device_get_mode (tz->thermal_zone, &mode); + mode =thermal_zone_device_get_mode (tz->thermal_zone);if (mode !=THERMAL_DEVICE_ENABLED )return ;
@@ -546,11 +542,7 @@ static int thermal_set_mode(struct thermal_zone_device *thermal,if (mode ==THERMAL_DEVICE_DISABLED )pr_warn ("thermal zone will be disabled\n" ); -/* -* this driver does not provide ->get_mode(), so calling -* thermal_zone_device_get_mode() always succeeds -*/ -thermal_zone_device_get_mode (thermal, &old_mode); + old_mode =thermal_zone_device_get_mode (thermal);if (mode != old_mode) {thermal_zone_device_store_mode (thermal, mode);
drivers/thermal/imx_thermal.c +1 -5
@@ -256,11 +256,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)bool wait;u32 val; -/* -* this driver does not provide ->get_mode(), so calling -* thermal_zone_device_get_mode() always succeeds -*/ -thermal_zone_device_get_mode (tz, &mode); + mode =thermal_zone_device_get_mode (tz);if (mode ==THERMAL_DEVICE_ENABLED ) {/* Check if a measurement is currently in progress */ regmap_read (map, soc_data->temp_data, &val);
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +1 -5
@@ -240,11 +240,7 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal, mode != THERMAL_DEVICE_DISABLED)return -EINVAL ; -/* -* this driver does not provide ->get_mode(), so calling -* thermal_zone_device_get_mode() always succeeds -*/ -thermal_zone_device_get_mode (thermal, &old_mode); + old_mode =thermal_zone_device_get_mode (thermal);if (mode != old_mode) {thermal_zone_device_store_mode (thermal, mode); result = int3400_thermal_run_osc(priv->adev->handle,
drivers/thermal/thermal_core.c +1 -15
@@ -469,18 +469,6 @@ static void thermal_zone_device_reset(struct thermal_zone_device *tz)thermal_zone_device_init (tz); } -int thermal_zone_device_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{ -if (tz->ops->get_mode) -return tz->ops->get_mode (tz, mode); - - *mode = tz->mode; - -return 0 ; -} -EXPORT_SYMBOL_GPL (thermal_zone_device_get_mode); -int thermal_zone_device_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {
@@ -1507,9 +1495,7 @@ static int thermal_pm_notify(struct notifier_block *nb,case PM_POST_SUSPEND :atomic_set (&in_suspend,0 );list_for_each_entry (tz, &thermal_tz_list, node) { - tz_mode =THERMAL_DEVICE_ENABLED ; -if (tz->ops->get_mode) - tz->ops->get_mode (tz, &tz_mode); + tz_mode =thermal_zone_device_get_mode (tz);if (tz_mode ==THERMAL_DEVICE_DISABLED )continue ;
drivers/thermal/thermal_sysfs.c +1 -21
@@ -50,11 +50,8 @@ mode_show(struct device *dev, struct device_attribute *attr, char *buf) {struct thermal_zone_device *tz =to_thermal_zone (dev);enum thermal_device_mode mode; -int result; - result =thermal_zone_device_get_mode (tz, &mode); -if (result) -return result; + mode =thermal_zone_device_get_mode (tz);return sprintf (buf,"%s\n" , mode ==THERMAL_DEVICE_ENABLED ?"enabled" :"disabled" );
@@ -425,30 +422,13 @@ static struct attribute_group thermal_zone_attribute_group = { .attrs = thermal_zone_dev_attrs, }; -/* We expose mode only if .get_mode is present */ static struct attribute *thermal_zone_mode_attrs[] = { &dev_attr_mode.attr,NULL , }; -static umode_t thermal_zone_mode_is_visible (struct kobject *kobj, -struct attribute *attr, -int attrno) -{ - struct device *dev = container_of(kobj, struct device, kobj); -struct thermal_zone_device *tz; - - tz = container_of(dev, struct thermal_zone_device, device); - -if (tz->ops->get_mode) -return attr->mode; - -return 0 ; -} -static struct attribute_group thermal_zone_mode_attribute_group = { .attrs = thermal_zone_mode_attrs, - .is_visible = thermal_zone_mode_is_visible, };/* We expose passive only if passive trips are present */
include/linux/thermal.h +9 -7
@@ -86,8 +86,6 @@ struct thermal_zone_device_ops { struct thermal_cooling_device *);int (*get_temp) (struct thermal_zone_device *,int *);int (*set_trips) (struct thermal_zone_device *,int ,int ); -int (*get_mode) (struct thermal_zone_device *, -enum thermal_device_mode *);int (*set_mode) (struct thermal_zone_device *,enum thermal_device_mode ); int (*get_trip_type) (struct thermal_zone_device *, int,
@@ -440,8 +438,12 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int,int thermal_zone_unbind_cooling_device (struct thermal_zone_device *,int ,struct thermal_cooling_device *); -int thermal_zone_device_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode); +static inline enum thermal_device_mode +thermal_zone_device_get_mode (struct thermal_zone_device *tz) +{ +return tz->mode; +} +int thermal_zone_device_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode);
@@ -509,9 +511,9 @@ static inline int thermal_zone_unbind_cooling_device( struct thermal_zone_device *tz, int trip, struct thermal_cooling_device *cdev) { return -ENODEV; } -static inline int thermal_zone_device_get_mode (struct thermal_zone_device *tz, -enum thermal_device_mode *mode) -{return -ENODEV ; } +static inline enum thermal_device_mode +thermal_zone_device_get_mode (struct thermal_zone_device *tz) +{return THERMAL_DEVICE_DISABLED ; }static inline int thermal_zone_device_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {return -ENODEV ; }
Signature · 1 line
2.17.1
RFC v2 7/9 thermal: core: Monitor thermal zone after mode change
In reply to Andrzej PietrasiewiczMode changing might imply a need to stop/start polling the device. monitor_thermal_zone() when mode changes.
--- drivers/thermal/thermal_core.c | 2 +- drivers/thermal/thermal_core.h | 2 ++ drivers/thermal/thermal_sysfs.c | 7 +++++++ 3 files changed, 10 insertions(+), 1 deletion(-)
drivers/thermal/thermal_core.c +1 -1
@@ -305,7 +305,7 @@ static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,cancel_delayed_work (&tz->poll_queue); } -static void monitor_thermal_zone (struct thermal_zone_device *tz) +void monitor_thermal_zone (struct thermal_zone_device *tz) {mutex_lock (&tz->lock);
drivers/thermal/thermal_core.h +2 -0
@@ -89,6 +89,8 @@ thermal_cooling_device_stats_update(struct thermal_cooling_device *cdev, unsigned long new_state) {}#endif /* CONFIG_THERMAL_STATISTICS */ +void monitor_thermal_zone (struct thermal_zone_device *tz); +/* device tree support */ #ifdef CONFIG_THERMAL_OF int of_parse_thermal_zones (void );
drivers/thermal/thermal_sysfs.c +7 -0
@@ -62,11 +62,14 @@ mode_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) {struct thermal_zone_device *tz =to_thermal_zone (dev); +enum thermal_device_mode old_mode, mode;int result;if (!tz->ops->set_mode)return -EPERM ; + old_mode =thermal_zone_device_get_mode (tz); +if (!strncmp (buf,"enabled" ,sizeof ("enabled" ) -1 )) result =thermal_zone_device_enable (tz);else if (!strncmp (buf,"disabled" ,sizeof ("disabled" ) -1 ))
@@ -77,6 +80,10 @@ mode_store(struct device *dev, struct device_attribute *attr,if (result)return result; + mode =thermal_zone_device_get_mode (tz); +if (mode != old_mode) +monitor_thermal_zone (tz); +return count; }
Signature · 1 line
2.17.1
RFC v2 8/9 thermal: of: Monitor thermal zone after enabling it
In reply to Andrzej Pietrasiewiczthermal/of calls its own ->set_mode() method, so monitor thermal zone afterwards. This is needed for the DISABLED->ENABLED transition.
--- drivers/thermal/of-thermal.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/thermal/of-thermal.c +4 -1
@@ -542,8 +542,11 @@ thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data,if (id == sensor_id) { tzd =thermal_zone_of_add_sensor (child, sensor_np, data, ops); -if (!IS_ERR (tzd)) +if (!IS_ERR (tzd)) {thermal_zone_device_enable (tzd); +thermal_zone_device_update (tzd, +THERMAL_EVENT_UNSPECIFIED ); + }of_node_put (child); goto exit;
Signature · 1 line
2.17.1
RFC v2 9/9 thermal: core: Stop polling DISABLED thermal devices
In reply to Andrzej PietrasiewiczPolling DISABLED devices is not desired, as all such "disabled" devices are meant to be handled by userspace.
Add a new mode: THERMAL_DEVICE_INITIAL. It is dedicated to handle devices which must be initially DISABLED, but which are polled at startup nonetheless. THERMAL_DEVICE_INITIAL shall be reported as "enabled" in sysfs to keep the userspace interface intact.
--- drivers/thermal/thermal_core.c | 18 ++++++++++++++++-- drivers/thermal/thermal_sysfs.c | 4 ++-- include/linux/thermal.h | 1 + 3 files changed, 19 insertions(+), 4 deletions(-)
drivers/thermal/thermal_core.c +16 -2
@@ -305,13 +305,22 @@ static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,cancel_delayed_work (&tz->poll_queue); } +static inline bool should_stop_polling (struct thermal_zone_device *tz) +{ +return thermal_zone_device_get_mode (tz) ==THERMAL_DEVICE_DISABLED ; +} +void monitor_thermal_zone (struct thermal_zone_device *tz) { +bool stop; + + stop =should_stop_polling (tz); +mutex_lock (&tz->lock); -if (tz->passive) +if (!stop && tz->passive)thermal_zone_device_set_polling (tz, tz->passive_delay); -else if (tz->polling_delay) +else if (!stop && tz->polling_delay)thermal_zone_device_set_polling (tz, tz->polling_delay);else thermal_zone_device_set_polling (tz,0 );
@@ -490,6 +499,9 @@ void thermal_zone_device_update(struct thermal_zone_device *tz, {int count; +if (should_stop_polling (tz)) +return ; +if (atomic_read (&in_suspend))return ;
@@ -1356,6 +1368,8 @@ thermal_zone_device_register(const char *type, int trips, int mask,list_add_tail (&tz->node, &thermal_tz_list);mutex_unlock (&thermal_list_lock); + tz->mode =THERMAL_DEVICE_INITIAL ; +/* Bind cooling devices for this zone */ bind_tz (tz);
drivers/thermal/thermal_sysfs.c +2 -2
@@ -53,8 +53,8 @@ mode_show(struct device *dev, struct device_attribute *attr, char *buf) mode =thermal_zone_device_get_mode (tz); -return sprintf (buf,"%s\n" , mode ==THERMAL_DEVICE_ENABLED ?"enabled" - :"disabled" ); +return sprintf (buf,"%s\n" , mode ==THERMAL_DEVICE_DISABLED ?"disabled" + :"enabled" ); } static ssize_t
include/linux/thermal.h +1 -0
@@ -50,6 +50,7 @@ struct thermal_instance;enum thermal_device_mode {THERMAL_DEVICE_DISABLED =0 ,THERMAL_DEVICE_ENABLED , +THERMAL_DEVICE_INITIAL , };enum thermal_trip_type {
Signature · 1 line
2.17.1
Hi Andrzej,
Thanks for your patches.
Quoted 5 lines · Andrzej Pietrasiewicz
This is the second iteration of this RFC.
The series now focuses on cleaning up the code in the first place.
[..]
Quoted 2 lines
12 files changed, 180 insertions(+), 208 deletions(-)
Compared with the previous iteration, and just judging by this diffstat, I think it's a step in the right direction.
Nice job :-)
Ezequiel
A message that is not in the archive (sent off-list or not yet received): Message-ID: <[email protected]
v4 cover Stop monitoring disabled devices
There is already a reviewed v3 (not to be confused with RFC v3), which can be considered for merging:
https://lore.kernel.org/linux-pm/[email protected]/
Let me cite Bartlomiej Zolnierkiewicz:
"I couldn't find the problems with the patch itself (no new issues being introduced, all changes seem to be improvements over the current situation).
Also the patch is not small but it also not that big and it mostly removes the code:
17 files changed, 105 insertions(+), 244 deletions(-)"
There have been raised some concerns about bisectability and about introducing "initial_mode" member in struct thermal_zone_params.
This v4 series addresses those concerns: it takes a more gradual approach and uses explicit tzd state initialization, hence there are more insertions than in v3, and the net effect is -63 lines versus -139 lines in v3.
Patch 2/11 converts the 3 drivers which don't store their mode in enum thermal_device_mode to do so. Once that is cleared, struct thermal_zone_device gains its "mode" member (patch 3/11) and then all interested drivers change the location where they store their
state: instead of storing it in some variable in a driver, they store it in struct thermal_zone_device (patch 4/11). Patch 4/11 does not introduce other changes. Then get_mode() driver method becomes redundant, and so it is removed (patch 5/11). This is the first part of the groundwork.
The second part of the groundwork is to add (patch 6/11) and use (patch 7/11) helpers for accessing tzd's state from drivers. From this moment on the drivers don't access tzd->mode directly. Please note that after patch 4/11 all thermal zone devices have their mode implicitly initialized to DISABLED, as a result of kzalloc and THERMAL_DEVICE_DISABLED == 0. This is not a problem from the point of view of polling them, because their state is not considered when deciding to poll or to cease polling. In preparation for considering tzd's state when deciding to poll or to cease polling it ensured (patch 8/11 and some in patch 7/11) that all the drivers are explicitly initialized with regard to their state.
With all that groundwork in place now it makes sense to modify thermal_core so that it stops polling DISABLED devices (patch 9/11), which is the ultimate purpose of this work.
While at it, some set_mode() implementations only change the polling variables to make the core stop polling their drivers, but that is now unnecessary and those set_mode() implementations are removed. In other implementations polling variables modifications are removed. Some other set_mode() implementations are simplified or removed (patch 10/11).
set_mode() is now only called when tzd's mode is about to change. Actual setting is performed in thermal_core, in thermal_zone_device_set_mode(). The meaning of set_mode() callback is actually to notify the driver about the mode being changed and giving the driver a chance to oppose such a change. To better reflect the purpose of the method it is renamed to change_mode() (patch 11/11).
Andrzej Pietrasiewicz (11):
acpi: thermal: Fix error handling in the register function
thermal: Store thermal mode in a dedicated enum
thermal: Add current mode to thermal zone device
thermal: Store device mode in struct thermal_zone_device
thermal: remove get_mode() operation of drivers
thermal: Add mode helpers
thermal: Use mode helpers in drivers
thermal: Explicitly enable non-changing thermal zone devices
thermal: core: Stop polling DISABLED thermal devices
thermal: Simplify or eliminate unnecessary set_mode() methods
thermal: Rename set_mode() to change_mode()
drivers/acpi/thermal.c | 75 +++++---------- .../ethernet/chelsio/cxgb4/cxgb4_thermal.c | 8 ++ .../ethernet/mellanox/mlxsw/core_thermal.c | 91 ++++--------------- drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 9 +- drivers/platform/x86/acerhdf.c | 33 +++---- drivers/platform/x86/intel_mid_thermal.c | 6 ++ drivers/power/supply/power_supply_core.c | 9 +- drivers/thermal/armada_thermal.c | 6 ++ drivers/thermal/da9062-thermal.c | 16 +--- drivers/thermal/dove_thermal.c | 6 ++ drivers/thermal/hisi_thermal.c | 6 +- drivers/thermal/imx_thermal.c | 57 ++++-------- .../intel/int340x_thermal/int3400_thermal.c | 43 +++------ .../int340x_thermal/int340x_thermal_zone.c | 5 + drivers/thermal/intel/intel_pch_thermal.c | 5 + .../thermal/intel/intel_quark_dts_thermal.c | 34 ++----- drivers/thermal/intel/intel_soc_dts_iosf.c | 3 + drivers/thermal/intel/x86_pkg_temp_thermal.c | 6 ++ drivers/thermal/kirkwood_thermal.c | 7 ++ drivers/thermal/rcar_thermal.c | 9 +- drivers/thermal/rockchip_thermal.c | 6 +- drivers/thermal/spear_thermal.c | 7 ++ drivers/thermal/sprd_thermal.c | 6 +- drivers/thermal/st/st_thermal.c | 5 + drivers/thermal/thermal_core.c | 76 ++++++++++++++-- drivers/thermal/thermal_of.c | 51 ++--------- drivers/thermal/thermal_sysfs.c | 37 +------- include/linux/thermal.h | 19 +++- 28 files changed, 289 insertions(+), 352 deletions(-)
base-commit: 351f4911a477ae01239c42f771f621d85b06ea10
Signature · 1 line
2.17.1
PATCH v4 1/11 acpi: thermal: Fix error handling in the register function
The acpi_thermal_register_thermal_zone() is missing any error handling. This needs to be fixed.
--- drivers/acpi/thermal.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
drivers/acpi/thermal.c +16 -4
@@ -901,23 +901,35 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) result =sysfs_create_link (&tz->device->dev.kobj, &tz->thermal_zone->device.kobj,"thermal_zone" );if (result) -return result; + goto unregister_tzd; result =sysfs_create_link (&tz->thermal_zone->device.kobj, &tz->device->dev.kobj,"device" );if (result) -return result; + goto remove_tz_link; status =acpi_bus_attach_private_data (tz->device->handle, tz->thermal_zone); -if (ACPI_FAILURE (status)) -return -ENODEV ; +if (ACPI_FAILURE (status)) { + result = -ENODEV ; + goto remove_dev_link; + } tz->tz_enabled =1 ;dev_info (&tz->device->dev,"registered as thermal_zone%d\n" , tz->thermal_zone->id); +return 0 ; + +remove_dev_link: +sysfs_remove_link (&tz->thermal_zone->device.kobj,"device" ); +remove_tz_link: +sysfs_remove_link (&tz->device->dev.kobj,"thermal_zone" ); +unregister_tzd: +thermal_zone_device_unregister (tz->thermal_zone); + +return result; }static void acpi_thermal_unregister_thermal_zone (struct acpi_thermal *tz)
Signature · 1 line
2.17.1