Stop monitoring disabled devices
Subsystems (17)
Re: [PATCH v4 01/11] acpi: thermal: Fix error handling in the register function
In reply to Andrzej PietrasiewiczQuoted 4 lines · Andrzej Pietrasiewicz
The
acpi_thermal_register_thermal_zone()is missing any error handling. This needs to be fixed.Signed-off-by Andrzej Pietrasiewicz <[email protected]>
Quoted 48 lines
--- 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)
Re: [PATCH v4 01/11] acpi: thermal: Fix error handling in the register function
In reply to Andrzej PietrasiewiczQuoted 4 lines · Andrzej Pietrasiewicz
The
acpi_thermal_register_thermal_zone()is missing any error handling. This needs to be fixed.Signed-off-by Andrzej Pietrasiewicz <[email protected]>
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Quoted 49 lines
--- 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)
Rafael J. Wysocki
maintainerRe: [PATCH v4 01/11] acpi: thermal: Fix error handling in the register function
In reply to Andrzej PietrasiewiczQuoted 5 lines · Andrzej Pietrasiewicz
The
acpi_thermal_register_thermal_zone()is missing any error handling. This needs to be fixed.Signed-off-by Andrzej Pietrasiewicz <[email protected]>
Does anything in the rest of the series depend on this patch?
I'd rather route it through the ACPI tree.
Quoted 49 lines
--- drivers/acpi/thermal.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)drivers/acpi/thermal.c +16
-5@@ -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) --
Quoted 2 lines
2.17.1
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v4 01/11] acpi: thermal: Fix error handling in the register function
Hi Rafael,
W dniu 24.06.2020 o 14:54, Rafael J. Wysocki pisze:
Quoted 10 lines
Quoted 5 lines · Andrzej Pietrasiewicz
The
acpi_thermal_register_thermal_zone()is missing any error handling. This needs to be fixed.Signed-off-by Andrzej Pietrasiewicz <[email protected]>Does anything in the rest of the series depend on this patch?
It does, in a sense that the patches most likely won't apply.
Regards,
Andrzej
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Rafael J. Wysocki
Acked-byRe: [PATCH v4 01/11] acpi: thermal: Fix error handling in the register function
Quoted 9 lines · CEST Andrzej Pietrasiewicz
Hi Rafael,
W dniu 24.06.2020 o 14:54, Rafael J. Wysocki pisze:
Quoted 6 lines
Quoted 4 lines · Andrzej Pietrasiewicz
The
acpi_thermal_register_thermal_zone()is missing any error handling. This needs to be fixed.
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Andrzej Pietrasiewicz <[email protected]>Does anything in the rest of the series depend on this patch?
It does, in a sense that the patches most likely won't apply.
Sp please feel free to add
to it or let me know if you want me to pick it up after all.
Thanks!
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v4 2/11 thermal: Store thermal mode in a dedicated enum
In reply to Andrzej PietrasiewiczPrepare for storing mode in struct thermal_zone_device.
--- drivers/acpi/thermal.c | 27 +++++++++---------- drivers/platform/x86/acerhdf.c | 8 ++++-- .../intel/int340x_thermal/int3400_thermal.c | 18 +++++-------- 3 files changed, 25 insertions(+), 28 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 ;
@@ -915,7 +912,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) goto remove_dev_link; } - 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 +6 -2
@@ -68,6 +68,7 @@ static int kernelmode = 1;#else static int kernelmode;#endif +static enum thermal_device_mode thermal_mode;static unsigned int interval =10 ;static unsigned int fanon =60000 ;
@@ -397,6 +398,7 @@ static inline void acerhdf_revert_to_bios_mode(void) {acerhdf_change_fanstate (ACERHDF_FAN_AUTO ); kernelmode =0 ; + thermal_mode =THERMAL_DEVICE_DISABLED ;if (thz_dev) thz_dev->polling_delay =0 ;pr_notice ("kernel mode fan control OFF\n" );
@@ -404,6 +406,7 @@ static inline void acerhdf_revert_to_bios_mode(void)static inline void acerhdf_enable_kernelmode (void ) { kernelmode =1 ; + thermal_mode =THERMAL_DEVICE_ENABLED ; thz_dev->polling_delay = interval*1000 ;thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );
@@ -416,8 +419,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 ; }
@@ -739,6 +741,8 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (cl_dev))return -EINVAL ; + thermal_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/intel/int340x_thermal/int3400_thermal.c +7 -11
@@ -48,7 +48,7 @@ struct int3400_thermal_priv {struct acpi_device *adev;struct platform_device *pdev;struct thermal_zone_device *thermal; -int mode; +enum thermal_device_mode mode;int art_count;struct art *arts;int trt_count;
@@ -395,24 +395,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 ); }evaluate_odvp (priv);
Signature · 1 line
2.17.1
Re: [PATCH v4 02/11] thermal: Store thermal mode in a dedicated enum
Quoted 43 lines · Andrzej Pietrasiewicz
Prepare for storing mode in struct
thermal_zone_device.Signed-off-by Andrzej Pietrasiewicz <[email protected]>--- drivers/acpi/thermal.c | 27 +++++++++---------- drivers/platform/x86/acerhdf.c | 8 ++++-- .../intel/int340x_thermal/int3400_thermal.c | 18 +++++-------- 3 files changed, 25 insertions(+), 28 deletions(-)drivers/acpi/thermal.c +3
-4@@ -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)
drivers/acpi/thermal.c static int thermal_set_mode(struct thermal_zone_device *thermal, · line 552
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 ;
Personally I find this check unnecessary: The enum has no other values, and it is verifyable that the callers provide the enum and not some other value.
Quoted 101 lines
drivers/acpi/thermal.c +6
-10/* * 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 ;@@ -915,7 +912,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) goto remove_dev_link; } - 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 +6
-2@@ -68,6 +68,7 @@ static int kernelmode = 1;#else static int kernelmode;#endif +static enum thermal_device_mode thermal_mode;static unsigned int interval =10 ;static unsigned int fanon =60000 ;@@ -397,6 +398,7 @@ static inline void acerhdf_revert_to_bios_mode(void) {acerhdf_change_fanstate (ACERHDF_FAN_AUTO ); kernelmode =0 ; + thermal_mode =THERMAL_DEVICE_DISABLED ;if (thz_dev) thz_dev->polling_delay =0 ;pr_notice ("kernel mode fan control OFF\n" );@@ -404,6 +406,7 @@ static inline void acerhdf_revert_to_bios_mode(void)static inline void acerhdf_enable_kernelmode (void ) { kernelmode =1 ; + thermal_mode =THERMAL_DEVICE_ENABLED ; thz_dev->polling_delay = interval*1000 ;thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );@@ -416,8 +419,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 ; }@@ -739,6 +741,8 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (cl_dev))return -EINVAL ; + thermal_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/intel/int340x_thermal/int3400_thermal.c +1
-2@@ -48,7 +48,7 @@ struct int3400_thermal_priv {struct acpi_device *adev;struct platform_device *pdev;struct thermal_zone_device *thermal; -int mode; +enum thermal_device_mode mode;int art_count;struct art *arts;int trt_count;@@ -395,24 +395,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)
drivers/thermal/intel/int340x_thermal/int3400_thermal.c static int int3400_thermal_set_mode(struct thermal_zone_device *thermal, · line 405
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 ;
Same as above.
Quoted 13 lines
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +4
-4-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 ); }evaluate_odvp (priv);
Re: [PATCH v4 02/11] thermal: Store thermal mode in a dedicated enum
Hi Guenter,
W dniu 29.05.2020 o 16:48, Guenter Roeck pisze:
Quoted 9 lines · Andrzej Pietrasiewicz
Quoted 8 lines
Prepare for storing mode in struct
thermal_zone_device.Signed-off-by Andrzej Pietrasiewicz <[email protected]>--- drivers/acpi/thermal.c | 27 +++++++++---------- drivers/platform/x86/acerhdf.c | 8 ++++-- .../intel/int340x_thermal/int3400_thermal.c | 18 +++++-------- 3 files changed, 25 insertions(+), 28 deletions(-)
<snip>
Quoted 9 lines
Quoted 9 lines
drivers/acpi/thermal.c +0
-1@@ -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 ;
Quoted 7 lines
drivers/acpi/thermal.c static int thermal_set_mode(struct thermal_zone_device *thermal, · line 552
Quoted 3 lines
drivers/acpi/thermal.c +3
-0+if (mode !=THERMAL_DEVICE_DISABLED && + mode !=THERMAL_DEVICE_ENABLED ) +return -EINVAL ;Personally I find this check unnecessary: The enum has no other values, and it is verifyable that the callers provide the enum and not some other value.
It is getting removed in PATCH 10/11.
Quoted 5 lines
drivers/thermal/intel/int340x_thermal/int3400_thermal.c static int int3400_thermal_set_mode(struct thermal_zone_device *thermal, · line 405
Quoted 3 lines
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +2
-0+if (mode !=THERMAL_DEVICE_ENABLED && + mode !=THERMAL_DEVICE_DISABLED )return -EINVAL ;Same as above.
ditto.
Guenter Roeck
Reviewed-byRe: [PATCH v4 02/11] thermal: Store thermal mode in a dedicated enum
Quoted 33 lines · Andrzej Pietrasiewicz
Hi Guenter,
W dniu 29.05.2020 o 16:48, Guenter Roeck pisze:
Quoted 9 lines · Andrzej Pietrasiewicz
Quoted 8 lines
Prepare for storing mode in struct
thermal_zone_device.Signed-off-by Andrzej Pietrasiewicz <[email protected]>---
drivers/acpi/thermal.c | 27 +++++++++---------- drivers/platform/x86/acerhdf.c | 8 ++++-- .../intel/int340x_thermal/int3400_thermal.c | 18 +++++--------3 files changed, 25 insertions(+), 28 deletions(-)<snip>
Quoted 6 lines
Quoted 6 lines
drivers/acpi/thermal.c +0
-1@@ -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)Quoted 8 lines
Quoted 4 lines
(quoted diff) +0
-0return -EINVAL;+ if (mode !=
THERMAL_DEVICE_DISABLED&&
+ mode !=THERMAL_DEVICE_ENABLED)
+ return-EINVAL;Personally I find this check unnecessary: The enum has no other values, and it is verifyable that the callers provide the enum and not some other value.
It is getting removed in PATCH 10/11.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
+ if (mode !=
THERMAL_DEVICE_ENABLED&&
+ mode !=THERMAL_DEVICE_DISABLED)
return-EINVAL;Same as above.
ditto.
Hmm, I think that would be better done with this patch. But I guess that is a bit of PoV, so
since I don't have any other objections/observations.
Guenter
Re: [PATCH v4 02/11] thermal: Store thermal mode in a dedicated enum
In reply to Andrzej PietrasiewiczQuoted 4 lines · Andrzej Pietrasiewicz
Prepare for storing mode in struct
thermal_zone_device.Signed-off-by Andrzej Pietrasiewicz <[email protected]>---
[...]
Quoted 1 line
drivers/platform/x86/acerhdf.c| 8 ++++--
Re: [PATCH v4 02/11] thermal: Store thermal mode in a dedicated enum
In reply to Andrzej PietrasiewiczQuoted 3 lines · Andrzej Pietrasiewicz
Prepare for storing mode in struct
thermal_zone_device.Signed-off-by Andrzej Pietrasiewicz <[email protected]>
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Quoted 175 lines
--- drivers/acpi/thermal.c | 27 +++++++++---------- drivers/platform/x86/acerhdf.c | 8 ++++-- .../intel/int340x_thermal/int3400_thermal.c | 18 +++++-------- 3 files changed, 25 insertions(+), 28 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 ;@@ -915,7 +912,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) goto remove_dev_link; } - 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 +6
-2@@ -68,6 +68,7 @@ static int kernelmode = 1;#else static int kernelmode;#endif +static enum thermal_device_mode thermal_mode;static unsigned int interval =10 ;static unsigned int fanon =60000 ;@@ -397,6 +398,7 @@ static inline void acerhdf_revert_to_bios_mode(void) {acerhdf_change_fanstate (ACERHDF_FAN_AUTO ); kernelmode =0 ; + thermal_mode =THERMAL_DEVICE_DISABLED ;if (thz_dev) thz_dev->polling_delay =0 ;pr_notice ("kernel mode fan control OFF\n" );@@ -404,6 +406,7 @@ static inline void acerhdf_revert_to_bios_mode(void)static inline void acerhdf_enable_kernelmode (void ) { kernelmode =1 ; + thermal_mode =THERMAL_DEVICE_ENABLED ; thz_dev->polling_delay = interval*1000 ;thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );@@ -416,8 +419,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 ; }@@ -739,6 +741,8 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (cl_dev))return -EINVAL ; + thermal_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/intel/int340x_thermal/int3400_thermal.c +7
-11@@ -48,7 +48,7 @@ struct int3400_thermal_priv {struct acpi_device *adev;struct platform_device *pdev;struct thermal_zone_device *thermal; -int mode; +enum thermal_device_mode mode;int art_count;struct art *arts;int trt_count;@@ -395,24 +395,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 ); }evaluate_odvp (priv);
PATCH v4 3/11 thermal: Add current mode to thermal zone device
In reply to Andrzej PietrasiewiczPrepare for changing the place where the mode is stored: now it is in drivers, which might or might not implement get_mode()/set_mode() methods. A lot of cleanup can be done thanks to storing it in struct tzd. The get_mode() methods will become redundant.
--- include/linux/thermal.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/thermal.h +2 -0
@@ -128,6 +128,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 +171,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 */
Signature · 1 line
2.17.1
Re: [PATCH v4 03/11] thermal: Add current mode to thermal zone device
Quoted 6 lines · Andrzej Pietrasiewicz
Prepare for changing the place where the mode is stored: now it is in drivers, which might or might not implement get_mode()/set_mode() methods. A lot of cleanup can be done thanks to storing it in struct tzd. The
get_mode()methods will become redundant.Signed-off-by Andrzej Pietrasiewicz <[email protected]>
Quoted 24 lines
--- include/linux/thermal.h | 2 ++ 1 file changed, 2 insertions(+)include/linux/thermal.h +2
-0@@ -128,6 +128,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 +171,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 */
Re: [PATCH v4 03/11] thermal: Add current mode to thermal zone device
In reply to Andrzej PietrasiewiczQuoted 6 lines · Andrzej Pietrasiewicz
Prepare for changing the place where the mode is stored: now it is in drivers, which might or might not implement get_mode()/set_mode() methods. A lot of cleanup can be done thanks to storing it in struct tzd. The
get_mode()methods will become redundant.Signed-off-by Andrzej Pietrasiewicz <[email protected]>
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Quoted 25 lines
--- include/linux/thermal.h | 2 ++ 1 file changed, 2 insertions(+)include/linux/thermal.h +2
-0@@ -128,6 +128,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 +171,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 */
PATCH v4 4/11 thermal: Store device mode in struct thermal_zone_device
In reply to Andrzej PietrasiewiczPrepare for eliminating get_mode().
--- drivers/acpi/thermal.c | 18 ++++++---------- .../ethernet/mellanox/mlxsw/core_thermal.c | 21 +++++++------------ drivers/platform/x86/acerhdf.c | 15 ++++++------- drivers/thermal/da9062-thermal.c | 6 ++---- drivers/thermal/imx_thermal.c | 17 +++++++-------- .../intel/int340x_thermal/int3400_thermal.c | 12 +++-------- .../thermal/intel/intel_quark_dts_thermal.c | 16 +++++++------- drivers/thermal/thermal_of.c | 10 +++------ 8 files changed, 44 insertions(+), 71 deletions(-)
drivers/acpi/thermal.c +6 -12
@@ -172,7 +172,6 @@ struct acpi_thermal {struct acpi_thermal_trips trips;struct acpi_handle_list devices;struct thermal_zone_device *thermal_zone; -enum thermal_device_mode mode;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->mode !=THERMAL_DEVICE_ENABLED ) +if (tz->thermal_zone->mode !=THERMAL_DEVICE_ENABLED )return ; thermal_zone_device_update(tz->thermal_zone,
@@ -529,12 +528,7 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)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->mode; + *mode = thermal->mode;return 0 ; }
@@ -556,11 +550,11 @@ static int thermal_set_mode(struct thermal_zone_device *thermal,if (mode ==THERMAL_DEVICE_DISABLED )pr_warn ("thermal zone will be disabled\n" ); -if (mode != tz->mode) { - tz->mode = mode; +if (mode != tz->thermal_zone->mode) { + tz->thermal_zone->mode = mode;ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"%s kernel ACPI thermal control\n" , - tz->mode ==THERMAL_DEVICE_ENABLED ? + tz->thermal_zone->mode ==THERMAL_DEVICE_ENABLED ?"Enable" :"Disable" ));acpi_thermal_check (tz); }
@@ -912,7 +906,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) goto remove_dev_link; } - tz->mode =THERMAL_DEVICE_ENABLED ; + tz->thermal_zone->mode =THERMAL_DEVICE_ENABLED ;dev_info (&tz->device->dev,"registered as thermal_zone%d\n" , tz->thermal_zone->id);
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +8 -13
@@ -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;
@@ -280,9 +278,7 @@ static int mlxsw_thermal_unbind(struct thermal_zone_device *tzdev,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; + *mode = tzdev->mode;return 0 ; }
@@ -299,9 +295,9 @@ static int mlxsw_thermal_set_mode(struct thermal_zone_device *tzdev,else tzdev->polling_delay =0 ; + tzdev->mode = mode;mutex_unlock (&tzdev->lock); - thermal->mode = mode;thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED );return 0 ;
@@ -469,9 +465,7 @@ static int mlxsw_thermal_module_unbind(struct thermal_zone_device *tzdev,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; + *mode = tzdev->mode;return 0 ; }
@@ -489,9 +483,10 @@ static int mlxsw_thermal_module_mode_set(struct thermal_zone_device *tzdev,else tzdev->polling_delay =0 ; + tzdev->mode = mode; +mutex_unlock (&tzdev->lock); - tz->mode = mode;thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED );return 0 ;
@@ -765,7 +760,7 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz)return err; } - module_tz->mode =THERMAL_DEVICE_ENABLED ; + module_tz->tzdev->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }
@@ -881,7 +876,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 ; + gearbox_tz->tzdev->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }
@@ -1050,7 +1045,7 @@ int mlxsw_thermal_init(struct mlxsw_core *core,if (err) goto err_unreg_modules_tzdev; - thermal->mode =THERMAL_DEVICE_ENABLED ; + thermal->tzdev->mode =THERMAL_DEVICE_ENABLED ; *p_thermal = thermal;return 0 ;
drivers/platform/x86/acerhdf.c +8 -7
@@ -68,7 +68,6 @@ static int kernelmode = 1;#else static int kernelmode;#endif -static enum thermal_device_mode thermal_mode;static unsigned int interval =10 ;static unsigned int fanon =60000 ;
@@ -398,15 +397,16 @@ static inline void acerhdf_revert_to_bios_mode(void) {acerhdf_change_fanstate (ACERHDF_FAN_AUTO ); kernelmode =0 ; - thermal_mode =THERMAL_DEVICE_DISABLED ; -if (thz_dev) +if (thz_dev) { + thz_dev->mode =THERMAL_DEVICE_DISABLED ; thz_dev->polling_delay =0 ; + }pr_notice ("kernel mode fan control OFF\n" ); }static inline void acerhdf_enable_kernelmode (void ) { kernelmode =1 ; - thermal_mode =THERMAL_DEVICE_ENABLED ; + thz_dev->mode =THERMAL_DEVICE_ENABLED ; thz_dev->polling_delay = interval*1000 ;thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );
@@ -419,7 +419,7 @@ static int acerhdf_get_mode(struct thermal_zone_device *thermal,if (verbose)pr_notice ("kernel mode fan control %d\n" , kernelmode); - *mode = thermal_mode; + *mode = thermal->mode;return 0 ; }
@@ -741,8 +741,6 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (cl_dev))return -EINVAL ; - thermal_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,
@@ -750,6 +748,9 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (thz_dev))return -EINVAL ; + thz_dev->mode = kernelmode ? +THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ; +if (strcmp (thz_dev->governor->name, acerhdf_zone_params.governor_name)) { pr_err("Didn't get thermal governor %s, perhaps not compiled into thermal subsystem.\n",
drivers/thermal/da9062-thermal.c +2 -4
@@ -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;
@@ -124,8 +123,7 @@ static irqreturn_t da9062_thermal_irq_handler(int irq, void *data)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; + *mode = z->mode;return 0 ; }
@@ -233,7 +231,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 +245,7 @@ static int da9062_thermal_probe(struct platform_device *pdev) ret =PTR_ERR (thermal->zone); goto err; } + thermal->zone->mode =THERMAL_DEVICE_ENABLED ; dev_dbg(&pdev->dev, "TJUNC temperature polling period set at %d ms\n",
drivers/thermal/imx_thermal.c +7 -10
@@ -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,
@@ -334,9 +333,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)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; + *mode = tz->mode;return 0 ; }
@@ -376,7 +373,7 @@ static int imx_set_mode(struct thermal_zone_device *tz, } } - data->mode = mode; + tz->mode = mode;thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED );return 0 ;
@@ -831,7 +828,7 @@ static int imx_thermal_probe(struct platform_device *pdev) data->socdata->measure_temp_mask); data->irq_enabled = true; - data->mode =THERMAL_DEVICE_ENABLED ; + data->tz->mode =THERMAL_DEVICE_ENABLED ; ret = devm_request_threaded_irq(&pdev->dev, data->irq, imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,
@@ -885,7 +882,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 +902,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 +3 -9
@@ -48,7 +48,6 @@ struct int3400_thermal_priv {struct acpi_device *adev;struct platform_device *pdev;struct thermal_zone_device *thermal; -enum thermal_device_mode mode;int art_count;struct art *arts;int trt_count;
@@ -381,12 +380,7 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal,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; + *mode = thermal->mode;return 0 ; }
@@ -404,8 +398,8 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal, mode != THERMAL_DEVICE_DISABLED)return -EINVAL ; -if (mode != priv->mode) { - priv->mode = mode; +if (mode != thermal->mode) { + thermal->mode = mode; result =int3400_thermal_run_osc (priv->adev->handle, priv->current_uuid_index, mode ==THERMAL_DEVICE_ENABLED );
drivers/thermal/intel/intel_quark_dts_thermal.c +7 -9
@@ -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 ; }
@@ -312,8 +311,7 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,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; + *mode = tzd->mode;return 0 ; }
drivers/thermal/thermal_of.c +3 -7
@@ -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;
@@ -272,9 +270,7 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,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; + *mode = tz->mode;return 0 ; }
@@ -296,7 +292,7 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz,mutex_unlock (&tz->lock); - data->mode = mode; + tz->mode = mode;thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED );return 0 ;
@@ -979,7 +975,6 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) finish:of_node_put (child); - tz->mode =THERMAL_DEVICE_DISABLED ;return tz;
@@ -1134,6 +1129,7 @@ int __init of_parse_thermal_zones(void)of_thermal_free_zone (tz);/* attempting to build remaining zones still */ } + zone->mode =THERMAL_DEVICE_DISABLED ; }of_node_put (np);
Signature · 1 line
2.17.1
Re: [PATCH v4 04/11] thermal: Store device mode in struct thermal_zone_device
Quoted 4 lines · Andrzej Pietrasiewicz
Prepare for eliminating
get_mode().Signed-off-by Andrzej Pietrasiewicz <[email protected]>---
[...]
Quoted 1 line
drivers/platform/x86/acerhdf.c| 15 ++++++-------
Re: [PATCH v4 04/11] thermal: Store device mode in struct thermal_zone_device
In reply to Andrzej PietrasiewiczQuoted 3 lines · Andrzej Pietrasiewicz
Prepare for eliminating
get_mode().Signed-off-by Andrzej Pietrasiewicz <[email protected]>
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Quoted 495 lines
--- drivers/acpi/thermal.c | 18 ++++++---------- .../ethernet/mellanox/mlxsw/core_thermal.c | 21 +++++++------------ drivers/platform/x86/acerhdf.c | 15 ++++++------- drivers/thermal/da9062-thermal.c | 6 ++---- drivers/thermal/imx_thermal.c | 17 +++++++-------- .../intel/int340x_thermal/int3400_thermal.c | 12 +++-------- .../thermal/intel/intel_quark_dts_thermal.c | 16 +++++++------- drivers/thermal/thermal_of.c | 10 +++------ 8 files changed, 44 insertions(+), 71 deletions(-)drivers/acpi/thermal.c +6
-12@@ -172,7 +172,6 @@ struct acpi_thermal {struct acpi_thermal_trips trips;struct acpi_handle_list devices;struct thermal_zone_device *thermal_zone; -enum thermal_device_mode mode;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->mode !=THERMAL_DEVICE_ENABLED ) +if (tz->thermal_zone->mode !=THERMAL_DEVICE_ENABLED )return ; thermal_zone_device_update(tz->thermal_zone,@@ -529,12 +528,7 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)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->mode; + *mode = thermal->mode;return 0 ; }@@ -556,11 +550,11 @@ static int thermal_set_mode(struct thermal_zone_device *thermal,if (mode ==THERMAL_DEVICE_DISABLED )pr_warn ("thermal zone will be disabled\n" ); -if (mode != tz->mode) { - tz->mode = mode; +if (mode != tz->thermal_zone->mode) { + tz->thermal_zone->mode = mode;ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"%s kernel ACPI thermal control\n" , - tz->mode ==THERMAL_DEVICE_ENABLED ? + tz->thermal_zone->mode ==THERMAL_DEVICE_ENABLED ?"Enable" :"Disable" ));acpi_thermal_check (tz); }@@ -912,7 +906,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) goto remove_dev_link; } - tz->mode =THERMAL_DEVICE_ENABLED ; + tz->thermal_zone->mode =THERMAL_DEVICE_ENABLED ;dev_info (&tz->device->dev,"registered as thermal_zone%d\n" , tz->thermal_zone->id);drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +8
-13@@ -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;@@ -280,9 +278,7 @@ static int mlxsw_thermal_unbind(struct thermal_zone_device *tzdev,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; + *mode = tzdev->mode;return 0 ; }@@ -299,9 +295,9 @@ static int mlxsw_thermal_set_mode(struct thermal_zone_device *tzdev,else tzdev->polling_delay =0 ; + tzdev->mode = mode;mutex_unlock (&tzdev->lock); - thermal->mode = mode;thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED );return 0 ;@@ -469,9 +465,7 @@ static int mlxsw_thermal_module_unbind(struct thermal_zone_device *tzdev,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; + *mode = tzdev->mode;return 0 ; }@@ -489,9 +483,10 @@ static int mlxsw_thermal_module_mode_set(struct thermal_zone_device *tzdev,else tzdev->polling_delay =0 ; + tzdev->mode = mode; +mutex_unlock (&tzdev->lock); - tz->mode = mode;thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED );return 0 ;@@ -765,7 +760,7 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz)return err; } - module_tz->mode =THERMAL_DEVICE_ENABLED ; + module_tz->tzdev->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }@@ -881,7 +876,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 ; + gearbox_tz->tzdev->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }@@ -1050,7 +1045,7 @@ int mlxsw_thermal_init(struct mlxsw_core *core,if (err) goto err_unreg_modules_tzdev; - thermal->mode =THERMAL_DEVICE_ENABLED ; + thermal->tzdev->mode =THERMAL_DEVICE_ENABLED ; *p_thermal = thermal;return 0 ;drivers/platform/x86/acerhdf.c +8
-7@@ -68,7 +68,6 @@ static int kernelmode = 1;#else static int kernelmode;#endif -static enum thermal_device_mode thermal_mode;static unsigned int interval =10 ;static unsigned int fanon =60000 ;@@ -398,15 +397,16 @@ static inline void acerhdf_revert_to_bios_mode(void) {acerhdf_change_fanstate (ACERHDF_FAN_AUTO ); kernelmode =0 ; - thermal_mode =THERMAL_DEVICE_DISABLED ; -if (thz_dev) +if (thz_dev) { + thz_dev->mode =THERMAL_DEVICE_DISABLED ; thz_dev->polling_delay =0 ; + }pr_notice ("kernel mode fan control OFF\n" ); }static inline void acerhdf_enable_kernelmode (void ) { kernelmode =1 ; - thermal_mode =THERMAL_DEVICE_ENABLED ; + thz_dev->mode =THERMAL_DEVICE_ENABLED ; thz_dev->polling_delay = interval*1000 ;thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );@@ -419,7 +419,7 @@ static int acerhdf_get_mode(struct thermal_zone_device *thermal,if (verbose)pr_notice ("kernel mode fan control %d\n" , kernelmode); - *mode = thermal_mode; + *mode = thermal->mode;return 0 ; }@@ -741,8 +741,6 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (cl_dev))return -EINVAL ; - thermal_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,@@ -750,6 +748,9 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (thz_dev))return -EINVAL ; + thz_dev->mode = kernelmode ? +THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ; +if (strcmp (thz_dev->governor->name, acerhdf_zone_params.governor_name)) { pr_err("Didn't get thermal governor %s, perhaps not compiled into thermal subsystem.\n",drivers/thermal/da9062-thermal.c +2
-4@@ -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;@@ -124,8 +123,7 @@ static irqreturn_t da9062_thermal_irq_handler(int irq, void *data)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; + *mode = z->mode;return 0 ; }@@ -233,7 +231,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 +245,7 @@ static int da9062_thermal_probe(struct platform_device *pdev) ret =PTR_ERR (thermal->zone); goto err; } + thermal->zone->mode =THERMAL_DEVICE_ENABLED ; dev_dbg(&pdev->dev, "TJUNC temperature polling period set at %d ms\n",drivers/thermal/imx_thermal.c +7
-10@@ -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,@@ -334,9 +333,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)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; + *mode = tz->mode;return 0 ; }@@ -376,7 +373,7 @@ static int imx_set_mode(struct thermal_zone_device *tz, } } - data->mode = mode; + tz->mode = mode;thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED );return 0 ;@@ -831,7 +828,7 @@ static int imx_thermal_probe(struct platform_device *pdev) data->socdata->measure_temp_mask); data->irq_enabled = true; - data->mode =THERMAL_DEVICE_ENABLED ; + data->tz->mode =THERMAL_DEVICE_ENABLED ; ret = devm_request_threaded_irq(&pdev->dev, data->irq, imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,@@ -885,7 +882,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 +902,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 +3
-9@@ -48,7 +48,6 @@ struct int3400_thermal_priv {struct acpi_device *adev;struct platform_device *pdev;struct thermal_zone_device *thermal; -enum thermal_device_mode mode;int art_count;struct art *arts;int trt_count;@@ -381,12 +380,7 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal,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; + *mode = thermal->mode;return 0 ; }@@ -404,8 +398,8 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal, mode != THERMAL_DEVICE_DISABLED)return -EINVAL ; -if (mode != priv->mode) { - priv->mode = mode; +if (mode != thermal->mode) { + thermal->mode = mode; result =int3400_thermal_run_osc (priv->adev->handle, priv->current_uuid_index, mode ==THERMAL_DEVICE_ENABLED );drivers/thermal/intel/intel_quark_dts_thermal.c +7
-9@@ -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 ; }@@ -312,8 +311,7 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,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; + *mode = tzd->mode;return 0 ; }drivers/thermal/thermal_of.c +3
-7@@ -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;@@ -272,9 +270,7 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,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; + *mode = tz->mode;return 0 ; }@@ -296,7 +292,7 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz,mutex_unlock (&tz->lock); - data->mode = mode; + tz->mode = mode;thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED );return 0 ;@@ -979,7 +975,6 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) finish:of_node_put (child); - tz->mode =THERMAL_DEVICE_DISABLED ;return tz;@@ -1134,6 +1129,7 @@ int __init of_parse_thermal_zones(void)of_thermal_free_zone (tz);/* attempting to build remaining zones still */ } + zone->mode =THERMAL_DEVICE_DISABLED ; }of_node_put (np);
PATCH v4 5/11 thermal: remove get_mode() operation of drivers
In reply to Andrzej Pietrasiewiczget_mode() is now redundant, as the state is stored in struct thermal_zone_device.
Consequently the "mode" attribute in sysfs can always be visible, because it is always possible to get the mode from struct tzd.
--- drivers/acpi/thermal.c | 9 ------ .../ethernet/mellanox/mlxsw/core_thermal.c | 19 ------------ drivers/platform/x86/acerhdf.c | 12 -------- drivers/thermal/da9062-thermal.c | 8 ----- drivers/thermal/imx_thermal.c | 9 ------ .../intel/int340x_thermal/int3400_thermal.c | 9 ------ .../thermal/intel/intel_quark_dts_thermal.c | 8 ----- drivers/thermal/thermal_core.c | 7 +---- drivers/thermal/thermal_of.c | 9 ------ drivers/thermal/thermal_sysfs.c | 30 ++----------------- include/linux/thermal.h | 2 -- 11 files changed, 3 insertions(+), 119 deletions(-)
drivers/acpi/thermal.c +0 -9
@@ -525,14 +525,6 @@ 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) -{ - *mode = thermal->mode; - -return 0 ; -} -static int thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {
@@ -847,7 +839,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,
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +0 -19
@@ -275,14 +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) -{ - *mode = tzdev->mode; - -return 0 ; -} -static int mlxsw_thermal_set_mode (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {
@@ -403,7 +395,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,
@@ -462,14 +453,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) -{ - *mode = tzdev->mode; - -return 0 ; -} -static int mlxsw_thermal_module_mode_set (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {
@@ -591,7 +574,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,
@@ -630,7 +612,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,
drivers/platform/x86/acerhdf.c +0 -12
@@ -413,17 +413,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 = thermal->mode; - -return 0 ; -} -/* * set operation mode; * enabled: the thermal layer of the kernel takes care about
@@ -490,7 +479,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,
drivers/thermal/da9062-thermal.c +0 -8
@@ -120,13 +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) -{ - *mode = z->mode; -return 0 ; -} -static int da9062_thermal_get_trip_type (struct thermal_zone_device *z,int trip,enum thermal_trip_type *type)
@@ -179,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, };
drivers/thermal/imx_thermal.c +0 -9
@@ -330,14 +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) -{ - *mode = tz->mode; - -return 0 ; -} -static int imx_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {
@@ -464,7 +456,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,
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +0 -9
@@ -377,14 +377,6 @@ 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) -{ - *mode = thermal->mode; - -return 0 ; -} -static int int3400_thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {
@@ -412,7 +404,6 @@ 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, };
drivers/thermal/intel/intel_quark_dts_thermal.c +0 -8
@@ -308,13 +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) -{ - *mode = tzd->mode; -return 0 ; -} -static int sys_set_mode (struct thermal_zone_device *tzd,enum thermal_device_mode mode) {
@@ -336,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/thermal_core.c +1 -6
@@ -1456,7 +1456,6 @@ static int thermal_pm_notify(struct notifier_block *nb, unsigned long mode, void *_unused) { struct thermal_zone_device *tz; -enum thermal_device_mode tz_mode;switch (mode) {case PM_HIBERNATION_PREPARE :
@@ -1469,11 +1468,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); - -if (tz_mode ==THERMAL_DEVICE_DISABLED ) +if (tz->mode ==THERMAL_DEVICE_DISABLED )continue ;thermal_zone_device_init (tz);
drivers/thermal/thermal_of.c +0 -9
@@ -267,14 +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) -{ - *mode = tz->mode; - -return 0 ; -} -static int of_thermal_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {
@@ -389,7 +381,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,
drivers/thermal/thermal_sysfs.c +2 -28
@@ -49,18 +49,9 @@ static ssize_t 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; - -return sprintf (buf,"%s\n" , mode ==THERMAL_DEVICE_ENABLED ?"enabled" - :"disabled" ); +return sprintf (buf,"%s\n" , tz->mode ==THERMAL_DEVICE_ENABLED ? +"enabled" :"disabled" ); } static ssize_t
@@ -428,30 +419,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 +0 -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,
Signature · 1 line
2.17.1
Re: [PATCH v4 05/11] thermal: remove get_mode() operation of drivers
Quoted 8 lines · Andrzej Pietrasiewicz
get_mode()is now redundant, as the state is stored in structthermal_zone_device.Consequently the "mode" attribute in sysfs can always be visible, because it is always possible to get the mode from struct tzd.
Signed-off-by Andrzej Pietrasiewicz <[email protected]>---
[...]
Quoted 1 line
drivers/platform/x86/acerhdf.c| 12 --------
Re: [PATCH v4 05/11] thermal: remove get_mode() operation of drivers
In reply to Andrzej PietrasiewiczQuoted 7 lines · Andrzej Pietrasiewicz
get_mode()is now redundant, as the state is stored in structthermal_zone_device.Consequently the "mode" attribute in sysfs can always be visible, because it is always possible to get the mode from struct tzd.
The side-effect of splitting the v3 is that some devices will be marked in sysfs as disabled (however they are in reality enabled) after applying this patch (it gets fixed by patch #08).
I think that we can live with that so:
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Quoted 357 lines
--- drivers/acpi/thermal.c | 9 ------ .../ethernet/mellanox/mlxsw/core_thermal.c | 19 ------------ drivers/platform/x86/acerhdf.c | 12 -------- drivers/thermal/da9062-thermal.c | 8 ----- drivers/thermal/imx_thermal.c | 9 ------ .../intel/int340x_thermal/int3400_thermal.c | 9 ------ .../thermal/intel/intel_quark_dts_thermal.c | 8 ----- drivers/thermal/thermal_core.c | 7 +---- drivers/thermal/thermal_of.c | 9 ------ drivers/thermal/thermal_sysfs.c | 30 ++----------------- include/linux/thermal.h | 2 -- 11 files changed, 3 insertions(+), 119 deletions(-)drivers/acpi/thermal.c +0
-9@@ -525,14 +525,6 @@ 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) -{ - *mode = thermal->mode; - -return 0 ; -} -static int thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {@@ -847,7 +839,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,drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +0
-19@@ -275,14 +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) -{ - *mode = tzdev->mode; - -return 0 ; -} -static int mlxsw_thermal_set_mode (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {@@ -403,7 +395,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,@@ -462,14 +453,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) -{ - *mode = tzdev->mode; - -return 0 ; -} -static int mlxsw_thermal_module_mode_set (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {@@ -591,7 +574,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,@@ -630,7 +612,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,drivers/platform/x86/acerhdf.c +0
-12@@ -413,17 +413,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 = thermal->mode; - -return 0 ; -} -/* * set operation mode; * enabled: the thermal layer of the kernel takes care about @@ -490,7 +479,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,drivers/thermal/da9062-thermal.c +0
-8@@ -120,13 +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) -{ - *mode = z->mode; -return 0 ; -} -static int da9062_thermal_get_trip_type (struct thermal_zone_device *z,int trip,enum thermal_trip_type *type)@@ -179,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, };drivers/thermal/imx_thermal.c +0
-9@@ -330,14 +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) -{ - *mode = tz->mode; - -return 0 ; -} -static int imx_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {@@ -464,7 +456,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,drivers/thermal/intel/int340x_thermal/int3400_thermal.c +0
-9@@ -377,14 +377,6 @@ 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) -{ - *mode = thermal->mode; - -return 0 ; -} -static int int3400_thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {@@ -412,7 +404,6 @@ 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, };drivers/thermal/intel/intel_quark_dts_thermal.c +0
-8@@ -308,13 +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) -{ - *mode = tzd->mode; -return 0 ; -} -static int sys_set_mode (struct thermal_zone_device *tzd,enum thermal_device_mode mode) {@@ -336,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/thermal_core.c +1
-6@@ -1456,7 +1456,6 @@ static int thermal_pm_notify(struct notifier_block *nb, unsigned long mode, void *_unused) { struct thermal_zone_device *tz; -enum thermal_device_mode tz_mode;switch (mode) {case PM_HIBERNATION_PREPARE :@@ -1469,11 +1468,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); - -if (tz_mode ==THERMAL_DEVICE_DISABLED ) +if (tz->mode ==THERMAL_DEVICE_DISABLED )continue ;thermal_zone_device_init (tz);drivers/thermal/thermal_of.c +0
-9@@ -267,14 +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) -{ - *mode = tz->mode; - -return 0 ; -} -static int of_thermal_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {@@ -389,7 +381,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,drivers/thermal/thermal_sysfs.c +2
-28@@ -49,18 +49,9 @@ static ssize_t 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; - -return sprintf (buf,"%s\n" , mode ==THERMAL_DEVICE_ENABLED ?"enabled" - :"disabled" ); +return sprintf (buf,"%s\n" , tz->mode ==THERMAL_DEVICE_ENABLED ? +"enabled" :"disabled" ); } static ssize_t@@ -428,30 +419,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 +0
-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,
PATCH v4 6/11 thermal: Add mode helpers
In reply to Andrzej PietrasiewiczPrepare for making the drivers not access tzd's private members.
--- drivers/thermal/thermal_core.c | 53 ++++++++++++++++++++++++++++++++++ include/linux/thermal.h | 13 +++++++++ 2 files changed, 66 insertions(+)
drivers/thermal/thermal_core.c +53 -0
@@ -459,6 +459,59 @@ static void thermal_zone_device_reset(struct thermal_zone_device *tz)thermal_zone_device_init (tz); } +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) +{ +int ret =0 ; + +mutex_lock (&tz->lock); + +/* do nothing if mode isn't changing */ +if (mode == tz->mode) { +mutex_unlock (&tz->lock); + +return ret; + } + +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; +} + +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; + +mutex_lock (&tz->lock); + + mode = tz->mode; + +mutex_unlock (&tz->lock); + +return mode ==THERMAL_DEVICE_ENABLED ; +} +EXPORT_SYMBOL (thermal_zone_device_is_enabled); +void thermal_zone_device_update (struct thermal_zone_device *tz,enum thermal_notify_event event) {
include/linux/thermal.h +13 -0
@@ -416,6 +416,9 @@ int thermal_zone_get_offset(struct thermal_zone_device *tz);void thermal_cdev_update (struct thermal_cooling_device *);void thermal_notify_framework (struct thermal_zone_device *,int ); +int thermal_zone_device_enable (struct thermal_zone_device *tz); +int thermal_zone_device_disable (struct thermal_zone_device *tz); +int thermal_zone_device_is_enabled (struct thermal_zone_device *tz);#else static inline struct thermal_zone_device *thermal_zone_device_register( const char *type, int trips, int mask, void *devdata,
@@ -463,6 +466,16 @@ static inline void thermal_cdev_update(struct thermal_cooling_device *cdev)static inline void thermal_notify_framework (struct thermal_zone_device *tz,int trip) { } + +static inline int thermal_zone_device_enable (struct thermal_zone_device *tz) +{return -ENODEV ; } + +static inline int thermal_zone_device_disable (struct thermal_zone_device *tz) +{return -ENODEV ; } + +static inline int +thermal_zone_device_is_enabled (struct thermal_zone_device *tz) +{return -ENODEV ; }#endif /* CONFIG_THERMAL */ #endif /* __THERMAL_H__ */
Signature · 1 line
2.17.1
Re: [PATCH v4 06/11] thermal: Add mode helpers
Quoted 3 lines · Andrzej Pietrasiewicz
Prepare for making the drivers not access tzd's private members.
Signed-off-by Andrzej Pietrasiewicz <[email protected]>
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Quoted 101 lines
--- drivers/thermal/thermal_core.c | 53 ++++++++++++++++++++++++++++++++++ include/linux/thermal.h | 13 +++++++++ 2 files changed, 66 insertions(+)drivers/thermal/thermal_core.c +53
-0@@ -459,6 +459,59 @@ static void thermal_zone_device_reset(struct thermal_zone_device *tz)thermal_zone_device_init (tz); } +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) +{ +int ret =0 ; + +mutex_lock (&tz->lock); + +/* do nothing if mode isn't changing */ +if (mode == tz->mode) { +mutex_unlock (&tz->lock); + +return ret; + } + +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; +} + +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; + +mutex_lock (&tz->lock); + + mode = tz->mode; + +mutex_unlock (&tz->lock); + +return mode ==THERMAL_DEVICE_ENABLED ; +} +EXPORT_SYMBOL (thermal_zone_device_is_enabled); +void thermal_zone_device_update (struct thermal_zone_device *tz,enum thermal_notify_event event) {include/linux/thermal.h +13
-0@@ -416,6 +416,9 @@ int thermal_zone_get_offset(struct thermal_zone_device *tz);void thermal_cdev_update (struct thermal_cooling_device *);void thermal_notify_framework (struct thermal_zone_device *,int ); +int thermal_zone_device_enable (struct thermal_zone_device *tz); +int thermal_zone_device_disable (struct thermal_zone_device *tz); +int thermal_zone_device_is_enabled (struct thermal_zone_device *tz);#else static inline struct thermal_zone_device *thermal_zone_device_register( const char *type, int trips, int mask, void *devdata,@@ -463,6 +466,16 @@ static inline void thermal_cdev_update(struct thermal_cooling_device *cdev)static inline void thermal_notify_framework (struct thermal_zone_device *tz,int trip) { } + +static inline int thermal_zone_device_enable (struct thermal_zone_device *tz) +{return -ENODEV ; } + +static inline int thermal_zone_device_disable (struct thermal_zone_device *tz) +{return -ENODEV ; } + +static inline int +thermal_zone_device_is_enabled (struct thermal_zone_device *tz) +{return -ENODEV ; }#endif /* CONFIG_THERMAL */ #endif /* __THERMAL_H__ */
PATCH v4 7/11 thermal: Use mode helpers in drivers
In reply to Andrzej PietrasiewiczUse thermal_zone_device_{en|dis}able() and thermal_zone_device_is_enabled().
Consequently, all set_mode() implementations in drivers:
- can stop modifying tzd's "mode" member,
- shall stop taking tzd's lock, as it is taken in the helpers
- shall stop calling thermal_zone_device_update() as it is called in the helpers
- can assume they are called when the mode truly changes, so checks to verify that can be dropped
Not providing set_mode() by a driver no longer prevents the core from being able to set tzd's mode, so the relevant check in mode_store() is removed.
Other comments:
- acpi/thermal.c: tz->thermal_zone->mode will be updated only after we return from set_mode(), so use function parameter in thermal_set_mode() instead, no need to call acpi_thermal_check() in set_mode()
- thermal/imx_thermal.c: regmap writes and mode assignment are done in thermal_zone_device_{en|dis}able() and set_mode() callback
- thermal/intel/intel_quark_dts_thermal.c: soc_dts_{en|dis}able() are a part of set_mode() callback, so they don't need to modify tzd->mode, and don't need to fall back to the opposite mode if unsuccessful, as the return value will be propagated to thermal_zone_device_{en|dis}able() and ultimately tzd's member will not be changed in thermal_zone_device_set_mode().
- thermal/of-thermal.c: no need to set zone->mode to DISABLED in of_parse_thermal_zones() as a tzd is kzalloc'ed so mode is DISABLED anyway
--- drivers/acpi/thermal.c | 21 ++++++----- .../ethernet/mellanox/mlxsw/core_thermal.c | 37 +++++++++---------- drivers/platform/x86/acerhdf.c | 17 +++++---- drivers/thermal/da9062-thermal.c | 6 ++- drivers/thermal/hisi_thermal.c | 6 ++- drivers/thermal/imx_thermal.c | 33 +++++++---------- .../intel/int340x_thermal/int3400_thermal.c | 5 +-- .../thermal/intel/intel_quark_dts_thermal.c | 18 ++------- drivers/thermal/rockchip_thermal.c | 6 ++- drivers/thermal/sprd_thermal.c | 6 ++- drivers/thermal/thermal_core.c | 2 +- drivers/thermal/thermal_of.c | 10 +---- drivers/thermal/thermal_sysfs.c | 11 ++---- 13 files changed, 80 insertions(+), 98 deletions(-)
drivers/acpi/thermal.c +11 -10
@@ -499,7 +499,7 @@ static void acpi_thermal_check(void *data) {struct acpi_thermal *tz = data; -if (tz->thermal_zone->mode !=THERMAL_DEVICE_ENABLED ) +if (!thermal_zone_device_is_enabled (tz->thermal_zone))return ; thermal_zone_device_update(tz->thermal_zone,
@@ -542,14 +542,11 @@ static int thermal_set_mode(struct thermal_zone_device *thermal,if (mode ==THERMAL_DEVICE_DISABLED )pr_warn ("thermal zone will be disabled\n" ); -if (mode != tz->thermal_zone->mode) { - tz->thermal_zone->mode = mode; -ACPI_DEBUG_PRINT ((ACPI_DB_INFO , -"%s kernel ACPI thermal control\n" , - tz->thermal_zone->mode ==THERMAL_DEVICE_ENABLED ? -"Enable" :"Disable" )); -acpi_thermal_check (tz); - } +ACPI_DEBUG_PRINT ((ACPI_DB_INFO , +"%s kernel ACPI thermal control\n" , + mode ==THERMAL_DEVICE_ENABLED ? +"Enable" :"Disable" )); +return 0 ; }
@@ -897,13 +894,17 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) goto remove_dev_link; } - tz->thermal_zone->mode =THERMAL_DEVICE_ENABLED ; + result =thermal_zone_device_enable (tz->thermal_zone); +if (result) + goto acpi_bus_detach;dev_info (&tz->device->dev,"registered as thermal_zone%d\n" , tz->thermal_zone->id);return 0 ; +acpi_bus_detach: +acpi_bus_detach_private_data (tz->device->handle); remove_dev_link:sysfs_remove_link (&tz->thermal_zone->device.kobj,"device" ); remove_tz_link:
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +17 -20
@@ -280,18 +280,11 @@ static int mlxsw_thermal_set_mode(struct thermal_zone_device *tzdev, {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 ; - tzdev->mode = mode; -mutex_unlock (&tzdev->lock); - -thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }
@@ -459,19 +452,11 @@ static int mlxsw_thermal_module_mode_set(struct thermal_zone_device *tzdev,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 ; - tzdev->mode = mode; - -mutex_unlock (&tzdev->lock); - -thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }
@@ -741,8 +726,11 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz)return err; } - module_tz->tzdev->mode =THERMAL_DEVICE_ENABLED ; -return 0 ; + err =thermal_zone_device_enable (module_tz->tzdev); +if (err) +thermal_zone_device_unregister (module_tz->tzdev); + +return err; }static void mlxsw_thermal_module_tz_fini (struct thermal_zone_device *tzdev)
@@ -845,6 +833,7 @@ static int mlxsw_thermal_gearbox_tz_init(struct mlxsw_thermal_module *gearbox_tz) {char tz_name[MLXSW_THERMAL_ZONE_MAX_NAME ]; +int ret;snprintf (tz_name,sizeof (tz_name),"mlxsw-gearbox%d" , gearbox_tz->module +1 );
@@ -857,8 +846,11 @@ 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->tzdev->mode =THERMAL_DEVICE_ENABLED ; -return 0 ; + ret =thermal_zone_device_enable (gearbox_tz->tzdev); +if (ret) +thermal_zone_device_unregister (gearbox_tz->tzdev); + +return ret; } static void
@@ -1026,10 +1018,15 @@ int mlxsw_thermal_init(struct mlxsw_core *core,if (err) goto err_unreg_modules_tzdev; - thermal->tzdev->mode =THERMAL_DEVICE_ENABLED ; + err =thermal_zone_device_enable (thermal->tzdev); +if (err) + goto err_unreg_gearboxes; + *p_thermal = thermal;return 0 ; +err_unreg_gearboxes: +mlxsw_thermal_gearboxes_fini (thermal); err_unreg_modules_tzdev:mlxsw_thermal_modules_fini (thermal); err_unreg_tzdev:
drivers/platform/x86/acerhdf.c +10 -7
@@ -397,19 +397,16 @@ static inline void acerhdf_revert_to_bios_mode(void) {acerhdf_change_fanstate (ACERHDF_FAN_AUTO ); kernelmode =0 ; -if (thz_dev) { - thz_dev->mode =THERMAL_DEVICE_DISABLED ; +if (thz_dev) thz_dev->polling_delay =0 ; - } +pr_notice ("kernel mode fan control OFF\n" ); }static inline void acerhdf_enable_kernelmode (void ) { kernelmode =1 ; - thz_dev->mode =THERMAL_DEVICE_ENABLED ; thz_dev->polling_delay = interval*1000 ; -thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );pr_notice ("kernel mode fan control ON\n" ); }
@@ -723,6 +720,8 @@ static void acerhdf_unregister_platform(void)static int __init acerhdf_register_thermal (void ) { +int ret; + cl_dev =thermal_cooling_device_register ("acerhdf-fan" ,NULL , &acerhdf_cooling_ops);
@@ -736,8 +735,12 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (thz_dev))return -EINVAL ; - thz_dev->mode = kernelmode ? -THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ; +if (kernelmode) + ret =thermal_zone_device_enable (thz_dev); +else + ret =thermal_zone_device_disable (thz_dev); +if (ret) +return ret;if (strcmp (thz_dev->governor->name, acerhdf_zone_params.governor_name)) {
drivers/thermal/da9062-thermal.c +5 -1
@@ -237,7 +237,11 @@ static int da9062_thermal_probe(struct platform_device *pdev) ret =PTR_ERR (thermal->zone); goto err; } - thermal->zone->mode =THERMAL_DEVICE_ENABLED ; + ret =thermal_zone_device_enable (thermal->zone); +if (ret) { +dev_err (&pdev->dev,"Cannot enable thermal zone device\n" ); + goto err_zone; + } dev_dbg(&pdev->dev, "TJUNC temperature polling period set at %d ms\n",
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 +14 -19
@@ -255,7 +255,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)bool wait;u32 val; -if (tz->mode ==THERMAL_DEVICE_ENABLED ) { +if (thermal_zone_device_is_enabled (tz)) {/* Check if a measurement is currently in progress */ regmap_read (map, soc_data->temp_data, &val); wait = !(val & soc_data->temp_valid_mask);
@@ -282,7 +282,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)regmap_read (map, soc_data->temp_data, &val); -if (tz->mode !=THERMAL_DEVICE_ENABLED ) { +if (!thermal_zone_device_is_enabled (tz)) {regmap_write (map, soc_data->sensor_ctrl +REG_CLR , soc_data->measure_temp_mask); regmap_write(map, soc_data->sensor_ctrl + REG_SET,
@@ -365,9 +365,6 @@ static int imx_set_mode(struct thermal_zone_device *tz, } } - tz->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }
@@ -819,7 +816,9 @@ static int imx_thermal_probe(struct platform_device *pdev) data->socdata->measure_temp_mask); data->irq_enabled = true; - data->tz->mode =THERMAL_DEVICE_ENABLED ; + ret =thermal_zone_device_enable (data->tz); +if (ret) + goto thermal_zone_unregister; ret = devm_request_threaded_irq(&pdev->dev, data->irq, imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,
@@ -861,19 +860,18 @@ 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; +int ret;/* * 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 set_mode() operation called from +* 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->tz->mode =THERMAL_DEVICE_DISABLED ; + ret =thermal_zone_device_disable (data->tz); +if (ret) +return ret;clk_disable_unprepare (data->thermal_clk);return 0 ;
@@ -882,18 +880,15 @@ 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->tz->mode =THERMAL_DEVICE_ENABLED ; + ret =thermal_zone_device_enable (data->tz); +if (ret) +return ret;return 0 ; }
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +2 -3
@@ -390,12 +390,11 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal, mode != THERMAL_DEVICE_DISABLED)return -EINVAL ; -if (mode != thermal->mode) { - thermal->mode = mode; +if (mode != thermal->mode) result =int3400_thermal_run_osc (priv->adev->handle, priv->current_uuid_index, mode ==THERMAL_DEVICE_ENABLED ); - } +evaluate_odvp (priv);
drivers/thermal/intel/intel_quark_dts_thermal.c +3 -15
@@ -126,10 +126,8 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)if (ret)return ret; -if (out &QRK_DTS_ENABLE_BIT ) { - tzd->mode =THERMAL_DEVICE_ENABLED ; +if (out &QRK_DTS_ENABLE_BIT )return 0 ; - }if (!aux_entry->locked) { out |=QRK_DTS_ENABLE_BIT ;
@@ -137,10 +135,7 @@ static int soc_dts_enable(struct thermal_zone_device *tzd) QRK_DTS_REG_OFFSET_ENABLE, out);if (ret)return ret; - - tzd->mode =THERMAL_DEVICE_ENABLED ; }else { - tzd->mode =THERMAL_DEVICE_DISABLED ;pr_info ("DTS is locked. Cannot enable DTS\n" ); ret = -EPERM ; }
@@ -159,10 +154,8 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)if (ret)return ret; -if (!(out &QRK_DTS_ENABLE_BIT )) { - tzd->mode =THERMAL_DEVICE_DISABLED ; +if (!(out &QRK_DTS_ENABLE_BIT ))return 0 ; - }if (!aux_entry->locked) { out &= ~QRK_DTS_ENABLE_BIT ;
@@ -171,10 +164,7 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)if (ret)return ret; - - tzd->mode =THERMAL_DEVICE_DISABLED ; }else { - tzd->mode =THERMAL_DEVICE_ENABLED ;pr_info ("DTS is locked. Cannot disable DTS\n" ); ret = -EPERM ; }
@@ -404,9 +394,7 @@ 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); + err =thermal_zone_device_enable (aux_entry->tzone);if (err) goto err_aux_status;
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 +1 -1
@@ -1521,7 +1521,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) { -if (tz->mode ==THERMAL_DEVICE_DISABLED ) +if (!thermal_zone_device_is_enabled (tz))continue ;thermal_zone_device_init (tz);
drivers/thermal/thermal_of.c +1 -9
@@ -272,8 +272,6 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz, {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;
@@ -282,11 +280,6 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz, tz->passive_delay =0 ; } -mutex_unlock (&tz->lock); - - tz->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }
@@ -541,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;
@@ -1120,7 +1113,6 @@ int __init of_parse_thermal_zones(void)of_thermal_free_zone (tz);/* attempting to build remaining zones still */ } - zone->mode =THERMAL_DEVICE_DISABLED ; }of_node_put (np);
drivers/thermal/thermal_sysfs.c +4 -7
@@ -49,9 +49,9 @@ static ssize_t mode_show(struct device *dev, struct device_attribute *attr, char *buf) { struct thermal_zone_device *tz = to_thermal_zone(dev); +int enabled =thermal_zone_device_is_enabled (tz); -return sprintf (buf,"%s\n" , tz->mode ==THERMAL_DEVICE_ENABLED ? -"enabled" :"disabled" ); +return sprintf (buf,"%s\n" , enabled ?"enabled" :"disabled" ); } static ssize_t
@@ -61,13 +61,10 @@ mode_store(struct device *dev, struct device_attribute *attr,struct thermal_zone_device *tz =to_thermal_zone (dev);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 ); + 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 ;
Signature · 1 line
2.17.1
Re: [PATCH v4 07/11] thermal: Use mode helpers in drivers
Quoted 32 lines · Andrzej Pietrasiewicz
Use thermal_zone_device_{en|dis}able() and
thermal_zone_device_is_enabled().Consequently, all
set_mode()implementations in drivers:- can stop modifying tzd's "mode" member,
- shall stop taking tzd's lock, as it is taken in the helpers
- shall stop callingthermal_zone_device_update()as it is called in the helpers
- can assume they are called when the mode truly changes, so checks to verify that can be droppedNot providing
set_mode()by a driver no longer prevents the core from being able to set tzd's mode, so the relevant check inmode_store()is removed.Other comments:
-
acpi/thermal.c:tz->thermal_zone->modewill be updated only after we return fromset_mode(), so use function parameter inthermal_set_mode()instead, no need to callacpi_thermal_check()inset_mode()
-thermal/imx_thermal.c: regmap writes and mode assignment are done in thermal_zone_device_{en|dis}able() andset_mode()callback
-thermal/intel/intel_quark_dts_thermal.c: soc_dts_{en|dis}able() are a part ofset_mode()callback, so they don't need to modifytzd->mode, and don't need to fall back to the opposite mode if unsuccessful, as the return value will be propagated to thermal_zone_device_{en|dis}able() and ultimately tzd's member will not be changed inthermal_zone_device_set_mode().
-thermal/of-thermal.c: no need to setzone->modeto DISABLED inof_parse_thermal_zones()as a tzd is kzalloc'ed so mode is DISABLED anywaySigned-off-by Andrzej Pietrasiewicz <[email protected]>---
[...]
Quoted 1 line
drivers/platform/x86/acerhdf.c| 17 +++++----
Re: [PATCH v4 07/11] thermal: Use mode helpers in drivers
In reply to Andrzej PietrasiewiczQuoted 46 lines · Andrzej Pietrasiewicz
Use thermal_zone_device_{en|dis}able() and
thermal_zone_device_is_enabled().Consequently, all
set_mode()implementations in drivers:- can stop modifying tzd's "mode" member,
- shall stop taking tzd's lock, as it is taken in the helpers
- shall stop callingthermal_zone_device_update()as it is called in the helpers
- can assume they are called when the mode truly changes, so checks to verify that can be droppedNot providing
set_mode()by a driver no longer prevents the core from being able to set tzd's mode, so the relevant check inmode_store()is removed.Other comments:
-
acpi/thermal.c:tz->thermal_zone->modewill be updated only after we return fromset_mode(), so use function parameter inthermal_set_mode()instead, no need to callacpi_thermal_check()inset_mode()
-thermal/imx_thermal.c: regmap writes and mode assignment are done in thermal_zone_device_{en|dis}able() andset_mode()callback
-thermal/intel/intel_quark_dts_thermal.c: soc_dts_{en|dis}able() are a part ofset_mode()callback, so they don't need to modifytzd->mode, and don't need to fall back to the opposite mode if unsuccessful, as the return value will be propagated to thermal_zone_device_{en|dis}able() and ultimately tzd's member will not be changed inthermal_zone_device_set_mode().
-thermal/of-thermal.c: no need to setzone->modeto DISABLED inof_parse_thermal_zones()as a tzd is kzalloc'ed so mode is DISABLED anywaySigned-off-by Andrzej Pietrasiewicz <[email protected]>--- drivers/acpi/thermal.c | 21 ++++++----- .../ethernet/mellanox/mlxsw/core_thermal.c | 37 +++++++++---------- drivers/platform/x86/acerhdf.c | 17 +++++---- drivers/thermal/da9062-thermal.c | 6 ++- drivers/thermal/hisi_thermal.c | 6 ++- drivers/thermal/imx_thermal.c | 33 +++++++---------- .../intel/int340x_thermal/int3400_thermal.c | 5 +-- .../thermal/intel/intel_quark_dts_thermal.c | 18 ++------- drivers/thermal/rockchip_thermal.c | 6 ++- drivers/thermal/sprd_thermal.c | 6 ++- drivers/thermal/thermal_core.c | 2 +- drivers/thermal/thermal_of.c | 10 +---- drivers/thermal/thermal_sysfs.c | 11 ++---- 13 files changed, 80 insertions(+), 98 deletions(-)
[...]
Quoted 36 lines
drivers/platform/x86/acerhdf.c +4
-5@@ -397,19 +397,16 @@ static inline void acerhdf_revert_to_bios_mode(void) {acerhdf_change_fanstate (ACERHDF_FAN_AUTO ); kernelmode =0 ; -if (thz_dev) { - thz_dev->mode =THERMAL_DEVICE_DISABLED ; +if (thz_dev) thz_dev->polling_delay =0 ; - } +pr_notice ("kernel mode fan control OFF\n" ); }static inline void acerhdf_enable_kernelmode (void ) { kernelmode =1 ; - thz_dev->mode =THERMAL_DEVICE_ENABLED ; thz_dev->polling_delay = interval*1000 ; -thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );pr_notice ("kernel mode fan control ON\n" ); }@@ -723,6 +720,8 @@ static void acerhdf_unregister_platform(void)static int __init acerhdf_register_thermal (void ) { +int ret; + cl_dev =thermal_cooling_device_register ("acerhdf-fan" ,NULL , &acerhdf_cooling_ops);
drivers/platform/x86/acerhdf.c static int __init acerhdf_register_thermal(void) · line 742
Quoted 10 lines
drivers/platform/x86/acerhdf.c +5
-2@@ -736,8 +735,12 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (thz_dev))return -EINVAL ; - thz_dev->mode = kernelmode ? -THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ; +if (kernelmode) + ret =thermal_zone_device_enable (thz_dev); +else + ret =thermal_zone_device_disable (thz_dev); +if (ret)
Cleanup on error seems to be missing here.
drivers/platform/x86/acerhdf.c static int __init acerhdf_register_thermal(void) · line 746
Quoted 4 lines
drivers/platform/x86/acerhdf.c +1
-0+return ret;if (strcmp (thz_dev->governor->name, acerhdf_zone_params.governor_name)) {
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Re: [PATCH v4 07/11] thermal: Use mode helpers in drivers
Hi Bartlomiej,
W dniu 24.06.2020 o 11:51, Bartlomiej Zolnierkiewicz pisze:
Quoted 90 lines · Andrzej Pietrasiewicz
Quoted 46 lines
Use thermal_zone_device_{en|dis}able() and
thermal_zone_device_is_enabled().Consequently, all
set_mode()implementations in drivers:- can stop modifying tzd's "mode" member,
- shall stop taking tzd's lock, as it is taken in the helpers
- shall stop callingthermal_zone_device_update()as it is called in the helpers
- can assume they are called when the mode truly changes, so checks to verify that can be droppedNot providing
set_mode()by a driver no longer prevents the core from being able to set tzd's mode, so the relevant check inmode_store()is removed.Other comments:
-
acpi/thermal.c:tz->thermal_zone->modewill be updated only after we return fromset_mode(), so use function parameter inthermal_set_mode()instead, no need to callacpi_thermal_check()inset_mode()
-thermal/imx_thermal.c: regmap writes and mode assignment are done in thermal_zone_device_{en|dis}able() andset_mode()callback
-thermal/intel/intel_quark_dts_thermal.c: soc_dts_{en|dis}able() are a part ofset_mode()callback, so they don't need to modifytzd->mode, and don't need to fall back to the opposite mode if unsuccessful, as the return value will be propagated to thermal_zone_device_{en|dis}able() and ultimately tzd's member will not be changed inthermal_zone_device_set_mode().
-thermal/of-thermal.c: no need to setzone->modeto DISABLED inof_parse_thermal_zones()as a tzd is kzalloc'ed so mode is DISABLED anywaySigned-off-by Andrzej Pietrasiewicz <[email protected]>--- drivers/acpi/thermal.c | 21 ++++++----- .../ethernet/mellanox/mlxsw/core_thermal.c | 37 +++++++++---------- drivers/platform/x86/acerhdf.c | 17 +++++---- drivers/thermal/da9062-thermal.c | 6 ++- drivers/thermal/hisi_thermal.c | 6 ++- drivers/thermal/imx_thermal.c | 33 +++++++---------- .../intel/int340x_thermal/int3400_thermal.c | 5 +-- .../thermal/intel/intel_quark_dts_thermal.c | 18 ++------- drivers/thermal/rockchip_thermal.c | 6 ++- drivers/thermal/sprd_thermal.c | 6 ++- drivers/thermal/thermal_core.c | 2 +- drivers/thermal/thermal_of.c | 10 +---- drivers/thermal/thermal_sysfs.c | 11 ++---- 13 files changed, 80 insertions(+), 98 deletions(-)[...]
Quoted 39 lines
drivers/platform/x86/acerhdf.c +4
-5@@ -397,19 +397,16 @@ static inline void acerhdf_revert_to_bios_mode(void) {acerhdf_change_fanstate (ACERHDF_FAN_AUTO ); kernelmode =0 ; -if (thz_dev) { - thz_dev->mode =THERMAL_DEVICE_DISABLED ; +if (thz_dev) thz_dev->polling_delay =0 ; - } +pr_notice ("kernel mode fan control OFF\n" ); }static inline void acerhdf_enable_kernelmode (void ) { kernelmode =1 ; - thz_dev->mode =THERMAL_DEVICE_ENABLED ; thz_dev->polling_delay = interval*1000 ; -thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );pr_notice ("kernel mode fan control ON\n" ); }@@ -723,6 +720,8 @@ static void acerhdf_unregister_platform(void)static int __init acerhdf_register_thermal (void ) { +int ret; + cl_dev =thermal_cooling_device_register ("acerhdf-fan" ,NULL , &acerhdf_cooling_ops);@@ -736,8 +735,12 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (thz_dev))return -EINVAL ;
Quoted 9 lines
drivers/platform/x86/acerhdf.c static int __init acerhdf_register_thermal(void) · line 742
Quoted 7 lines
drivers/platform/x86/acerhdf.c +5
-2- thz_dev->mode = kernelmode ? -THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ; +if (kernelmode) + ret =thermal_zone_device_enable (thz_dev); +else + ret =thermal_zone_device_disable (thz_dev); +if (ret)Cleanup on error seems to be missing here.
It does seem so, but it is not the case.
acerhdf_register_thermal() is called from acerhdf_init(). The latter checks the return value of the former and on error jumps to the err_unreg label, where thermal zone(s) is/are unregistered.
Regards,
Andrzej
PATCH v4 8/11 thermal: Explicitly enable non-changing thermal zone devices
In reply to Andrzej PietrasiewiczSome thermal zone devices never change their state, so they should be always enabled.
--- drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c | 8 ++++++++ drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 9 ++++++++- drivers/platform/x86/intel_mid_thermal.c | 6 ++++++ drivers/power/supply/power_supply_core.c | 9 +++++++-- drivers/thermal/armada_thermal.c | 6 ++++++ drivers/thermal/dove_thermal.c | 6 ++++++ .../thermal/intel/int340x_thermal/int3400_thermal.c | 5 +++++ .../intel/int340x_thermal/int340x_thermal_zone.c | 5 +++++ drivers/thermal/intel/intel_pch_thermal.c | 5 +++++ 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/spear_thermal.c | 7 +++++++ drivers/thermal/st/st_thermal.c | 5 +++++ drivers/thermal/thermal_of.c | 10 +++++++++- 16 files changed, 101 insertions(+), 5 deletions(-)
drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c +8 -0
@@ -92,6 +92,14 @@ int cxgb4_thermal_init(struct adapter *adap) ch_thermal->tzdev =NULL ;return ret; } + + ret =thermal_zone_device_enable (ch_thermal->tzdev); +if (ret) { +dev_err (adap->pdev_dev,"Failed to enable thermal zone\n" ); +thermal_zone_device_unregister (adap->ch_thermal.tzdev); +return ret; + } +return 0 ; }
drivers/net/wireless/intel/iwlwifi/mvm/tt.c +8 -1
@@ -733,7 +733,7 @@ static struct thermal_zone_device_ops tzone_ops = {static void iwl_mvm_thermal_zone_register (struct iwl_mvm *mvm) { -int i; +int i, ret;char name[16 ];static atomic_t counter =ATOMIC_INIT (0 );
@@ -759,6 +759,13 @@ static void iwl_mvm_thermal_zone_register(struct iwl_mvm *mvm)return ; } + ret =thermal_zone_device_enable (mvm->tz_device.tzone); +if (ret) { +IWL_DEBUG_TEMP (mvm,"Failed to enable thermal zone\n" ); +thermal_zone_device_unregister (mvm->tz_device.tzone); +return ; + } +/* 0 is a valid temperature, * so initialize the array with S16_MIN which invalid temperature */
drivers/platform/x86/intel_mid_thermal.c +6 -0
@@ -493,6 +493,12 @@ static int mid_thermal_probe(struct platform_device *pdev) ret =PTR_ERR (pinfo->tzd[i]); goto err; } + ret =thermal_zone_device_enable (pinfo->tzd[i]); +if (ret) { +kfree (td_info); +thermal_zone_device_unregister (pinfo->tzd[i]); + goto err; + } } pinfo->pdev = pdev;
drivers/power/supply/power_supply_core.c +7 -2
@@ -931,7 +931,7 @@ static struct thermal_zone_device_ops psy_tzd_ops = {static int psy_register_thermal (struct power_supply *psy) { -int i; +int i, ret;if (psy->desc->no_thermal)return 0 ;
@@ -941,7 +941,12 @@ static int psy_register_thermal(struct power_supply *psy)if (psy->desc->properties[i] ==POWER_SUPPLY_PROP_TEMP ) { psy->tzd =thermal_zone_device_register (psy->desc->name,0 ,0 , psy, &psy_tzd_ops,NULL ,0 ,0 ); -return PTR_ERR_OR_ZERO (psy->tzd); +if (IS_ERR (psy->tzd)) +return PTR_ERR (psy->tzd); + ret =thermal_zone_device_enable (psy->tzd); +if (ret) +thermal_zone_device_unregister (psy->tzd); +return ret; } }return 0 ;
drivers/thermal/armada_thermal.c +6 -0
@@ -874,6 +874,12 @@ static int armada_thermal_probe(struct platform_device *pdev)return PTR_ERR (tz); } + ret =thermal_zone_device_enable (tz); +if (ret) { +thermal_zone_device_unregister (tz); +return ret; + } + drvdata->type =LEGACY ; drvdata->data.tz = tz;platform_set_drvdata (pdev, drvdata);
drivers/thermal/dove_thermal.c +6 -0
@@ -153,6 +153,12 @@ static int dove_thermal_probe(struct platform_device *pdev)return PTR_ERR (thermal); } + ret =thermal_zone_device_enable (thermal); +if (ret) { +thermal_zone_device_unregister (thermal); +return ret; + } +platform_set_drvdata (pdev, thermal);return 0 ;
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +5 -0
@@ -485,6 +485,10 @@ static int int3400_thermal_probe(struct platform_device *pdev) goto free_art_trt; } + result =thermal_zone_device_enable (priv->thermal); +if (result) + goto free_tzd; + priv->rel_misc_dev_res =acpi_thermal_rel_misc_device_add ( priv->adev->handle);
@@ -518,6 +522,7 @@ static int int3400_thermal_probe(struct platform_device *pdev) free_rel_misc:if (!priv->rel_misc_dev_res)acpi_thermal_rel_misc_device_remove (priv->adev->handle); +free_tzd:thermal_zone_device_unregister (priv->thermal); free_art_trt:kfree (priv->trts);
drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +5 -0
@@ -259,9 +259,14 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev, ret =PTR_ERR (int34x_thermal_zone->zone); goto err_thermal_zone; } + ret =thermal_zone_device_enable (int34x_thermal_zone->zone); +if (ret) + goto err_enable;return int34x_thermal_zone; +err_enable: +thermal_zone_device_unregister (int34x_thermal_zone->zone); err_thermal_zone:acpi_lpat_free_conversion_table (int34x_thermal_zone->lpat_table);kfree (int34x_thermal_zone->aux_trips);
drivers/thermal/intel/intel_pch_thermal.c +5 -0
@@ -352,9 +352,14 @@ static int intel_pch_thermal_probe(struct pci_dev *pdev, err =PTR_ERR (ptd->tzd); goto error_cleanup; } + err =thermal_zone_device_enable (ptd->tzd); +if (err) + goto err_unregister;return 0 ; +err_unregister: +thermal_zone_device_unregister (ptd->tzd); error_cleanup:iounmap (ptd->hw_base); error_release:
drivers/thermal/intel/intel_soc_dts_iosf.c +3 -0
@@ -329,6 +329,9 @@ static int add_dts_thermal_zone(int id, struct intel_soc_dts_sensor_entry *dts, ret =PTR_ERR (dts->tzone); goto err_ret; } + ret =thermal_zone_device_enable (dts->tzone); +if (ret) + goto err_enable; ret =soc_dts_enable (id);if (ret)
drivers/thermal/intel/x86_pkg_temp_thermal.c +6 -0
@@ -363,6 +363,12 @@ static int pkg_temp_thermal_device_add(unsigned int cpu)kfree (zonedev);return err; } + err =thermal_zone_device_enable (zonedev->tzone); +if (err) { +thermal_zone_device_unregister (zonedev->tzone); +kfree (zonedev); +return err; + }/* Store MSR value for package thermal interrupt, to restore at exit */ rdmsr (MSR_IA32_PACKAGE_THERM_INTERRUPT , zonedev->msr_pkg_therm_low, zonedev->msr_pkg_therm_high);
drivers/thermal/kirkwood_thermal.c +7 -0
@@ -65,6 +65,7 @@ static int kirkwood_thermal_probe(struct platform_device *pdev)struct thermal_zone_device *thermal =NULL ;struct kirkwood_thermal_priv *priv;struct resource *res; +int ret; priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_KERNEL );if (!priv)
@@ -82,6 +83,12 @@ static int kirkwood_thermal_probe(struct platform_device *pdev) "Failed to register thermal zone device\n");return PTR_ERR (thermal); } + ret =thermal_zone_device_enable (thermal); +if (ret) { +thermal_zone_device_unregister (thermal); +dev_err (&pdev->dev,"Failed to enable thermal zone device\n" ); +return ret; + }platform_set_drvdata (pdev, thermal);
drivers/thermal/rcar_thermal.c +8 -1
@@ -550,12 +550,19 @@ static int rcar_thermal_probe(struct platform_device *pdev) priv->zone =devm_thermal_zone_of_sensor_register ( dev, i, priv, &rcar_thermal_zone_of_ops); - else + else { priv->zone =thermal_zone_device_register ("rcar_thermal" ,1 ,0 , priv, &rcar_thermal_zone_ops,NULL ,0 , idle); + + ret =thermal_zone_device_enable (priv->zone); +if (ret) { +thermal_zone_device_unregister (priv->zone); + priv->zone =ERR_PTR (ret); + } + }if (IS_ERR (priv->zone)) {dev_err (dev,"can't register thermal zone\n" ); ret =PTR_ERR (priv->zone);
drivers/thermal/spear_thermal.c +7 -0
@@ -131,6 +131,11 @@ static int spear_thermal_probe(struct platform_device *pdev) ret =PTR_ERR (spear_thermal); goto disable_clk; } + ret =thermal_zone_device_enable (spear_thermal); +if (ret) { +dev_err (&pdev->dev,"Cannot enable thermal zone\n" ); + goto unregister_tzd; + }platform_set_drvdata (pdev, spear_thermal);
@@ -139,6 +144,8 @@ static int spear_thermal_probe(struct platform_device *pdev)return 0 ; +unregister_tzd: +thermal_zone_device_unregister (spear_thermal); disable_clk:clk_disable (stdev->clk);
drivers/thermal/st/st_thermal.c +5 -0
@@ -246,11 +246,16 @@ int st_thermal_register(struct platform_device *pdev, ret =PTR_ERR (sensor->thermal_dev); goto sensor_off; } + ret =thermal_zone_device_enable (sensor->thermal_dev); +if (ret) + goto tzd_unregister;platform_set_drvdata (pdev, sensor);return 0 ; +tzd_unregister: +thermal_zone_device_unregister (sensor->thermal_dev); sensor_off:st_thermal_sensor_off (sensor);
drivers/thermal/thermal_of.c +9 -1
@@ -1066,7 +1066,7 @@ int __init of_parse_thermal_zones(void)for_each_available_child_of_node (np, child) {struct thermal_zone_device *zone;struct thermal_zone_params *tzp; -int i, mask =0 ; +int i, ret, mask =0 ;u32 prop; tz =thermal_of_build_thermal_zone (child);
@@ -1113,6 +1113,14 @@ int __init of_parse_thermal_zones(void)of_thermal_free_zone (tz);/* attempting to build remaining zones still */ } + ret =thermal_zone_device_enable (zone); +if (ret) { +thermal_zone_device_unregister (zone); +pr_err ("Failed to enable thermal zone\n" ); +kfree (tzp); +kfree (ops); +of_thermal_free_zone (tz); + } }of_node_put (np);
Signature · 1 line
2.17.1
Re: [PATCH v4 08/11] thermal: Explicitly enable non-changing thermal zone devices
Quoted 22 lines · Andrzej Pietrasiewicz
Some thermal zone devices never change their state, so they should be always enabled.
--- drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c | 8 ++++++++ drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 9 ++++++++- drivers/platform/x86/intel_mid_thermal.c | 6 ++++++ drivers/power/supply/power_supply_core.c | 9 +++++++-- drivers/thermal/armada_thermal.c | 6 ++++++ drivers/thermal/dove_thermal.c | 6 ++++++ .../thermal/intel/int340x_thermal/int3400_thermal.c | 5 +++++ .../intel/int340x_thermal/int340x_thermal_zone.c | 5 +++++ drivers/thermal/intel/intel_pch_thermal.c | 5 +++++ 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/spear_thermal.c | 7 +++++++ drivers/thermal/st/st_thermal.c | 5 +++++ drivers/thermal/thermal_of.c | 10 +++++++++- 16 files changed, 101 insertions(+), 5 deletions(-)
[...]
drivers/thermal/intel/int340x_thermal/int3400_thermal.c static int int3400_thermal_probe(struct platform_device *pdev) · line 488
Quoted 9 lines
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +1
-0@@ -485,6 +485,10 @@ static int int3400_thermal_probe(struct platform_device *pdev) goto free_art_trt; } + result =thermal_zone_device_enable (priv->thermal);
I'm not sure about correctness of this addition.
This driver contains ->set_mode but doesn't call it on initialization (in v3 it was using THERMAL_DEVICE_DISABLED as .initial_mode parameter).
Quoted 14 lines
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +4
-0+if (result) + goto free_tzd; + priv->rel_misc_dev_res =acpi_thermal_rel_misc_device_add ( priv->adev->handle);@@ -518,6 +522,7 @@ static int int3400_thermal_probe(struct platform_device *pdev) free_rel_misc:if (!priv->rel_misc_dev_res)acpi_thermal_rel_misc_device_remove (priv->adev->handle); +free_tzd:thermal_zone_device_unregister (priv->thermal); free_art_trt:kfree (priv->trts);
[...]
Quoted 14 lines
drivers/thermal/thermal_of.c +1
-1@@ -1066,7 +1066,7 @@ int __init of_parse_thermal_zones(void)for_each_available_child_of_node (np, child) {struct thermal_zone_device *zone;struct thermal_zone_params *tzp; -int i, mask =0 ; +int i, ret, mask =0 ;u32 prop; tz =thermal_of_build_thermal_zone (child);
drivers/thermal/thermal_of.c int __init of_parse_thermal_zones(void) · line 1116
Quoted 4 lines
drivers/thermal/thermal_of.c +1
-0@@ -1113,6 +1113,14 @@ int __init of_parse_thermal_zones(void)of_thermal_free_zone (tz);/* attempting to build remaining zones still */ } + ret =thermal_zone_device_enable (zone);
This doesn't seem correct as it is done too early and there is already proper thermal_zone_device_enable() call in thermal_zone_of_sensor_register().
drivers/thermal/thermal_of.c int __init of_parse_thermal_zones(void) · line 1126
Quoted 10 lines
drivers/thermal/thermal_of.c +7
-0+if (ret) { +thermal_zone_device_unregister (zone); +pr_err ("Failed to enable thermal zone\n" ); +kfree (tzp); +kfree (ops); +of_thermal_free_zone (tz); + } }of_node_put (np);
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
PATCH v4 9/11 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
@@ -301,13 +301,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_is_enabled (tz); +} +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 );
@@ -517,6 +526,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: [PATCH v4 09/11] thermal: core: Stop polling DISABLED thermal devices
Quoted 5 lines · Andrzej Pietrasiewicz
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.Signed-off-by Andrzej Pietrasiewicz <[email protected]>
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Quoted 44 lines
--- drivers/thermal/thermal_core.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)drivers/thermal/thermal_core.c +14
-2@@ -301,13 +301,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_is_enabled (tz); +} +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 );@@ -517,6 +526,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 ;
PATCH v4 10/11 thermal: Simplify or eliminate unnecessary set_mode() methods
In reply to Andrzej PietrasiewiczSetting polling_delay is now done at thermal_core level (by not polling DISABLED devices), so no need to repeat this code.
int340x: Checking for an impossible enum value is unnecessary. acpi/thermal: It only prints debug messages.
--- drivers/acpi/thermal.c | 26 ---------------- .../ethernet/mellanox/mlxsw/core_thermal.c | 30 ------------------- drivers/platform/x86/acerhdf.c | 3 -- drivers/thermal/imx_thermal.c | 6 ---- .../intel/int340x_thermal/int3400_thermal.c | 4 --- drivers/thermal/thermal_of.c | 18 ----------- 6 files changed, 87 deletions(-)
drivers/acpi/thermal.c +0 -26
@@ -525,31 +525,6 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)return 0 ; } -static int thermal_set_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode mode) -{ -struct acpi_thermal *tz = thermal->devdata; - -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_DISABLED ) -pr_warn ("thermal zone will be disabled\n" ); - -ACPI_DEBUG_PRINT ((ACPI_DB_INFO , -"%s kernel ACPI thermal control\n" , - mode ==THERMAL_DEVICE_ENABLED ? -"Enable" :"Disable" )); - -return 0 ; -} -static int thermal_get_trip_type (struct thermal_zone_device *thermal,int trip,enum thermal_trip_type *type) {
@@ -836,7 +811,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, - .set_mode = thermal_set_mode, .get_trip_type = thermal_get_trip_type, .get_trip_temp = thermal_get_trip_temp, .get_crit_temp = thermal_get_crit_temp,
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +0 -30
@@ -275,19 +275,6 @@ static int mlxsw_thermal_unbind(struct thermal_zone_device *tzdev,return 0 ; } -static int mlxsw_thermal_set_mode (struct thermal_zone_device *tzdev, -enum thermal_device_mode mode) -{ -struct mlxsw_thermal *thermal = tzdev->devdata; - -if (mode ==THERMAL_DEVICE_ENABLED ) - tzdev->polling_delay = thermal->polling_delay; -else - tzdev->polling_delay =0 ; - -return 0 ; -} -static int mlxsw_thermal_get_temp (struct thermal_zone_device *tzdev,int *p_temp) {
@@ -388,7 +375,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, - .set_mode = mlxsw_thermal_set_mode, .get_temp = mlxsw_thermal_get_temp, .get_trip_type = mlxsw_thermal_get_trip_type, .get_trip_temp = mlxsw_thermal_get_trip_temp,
@@ -446,20 +432,6 @@ static int mlxsw_thermal_module_unbind(struct thermal_zone_device *tzdev,return err; } -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; - -if (mode ==THERMAL_DEVICE_ENABLED ) - tzdev->polling_delay = thermal->polling_delay; -else - tzdev->polling_delay =0 ; - -return 0 ; -} -static int mlxsw_thermal_module_temp_get (struct thermal_zone_device *tzdev,int *p_temp) {
@@ -559,7 +531,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, - .set_mode = mlxsw_thermal_module_mode_set, .get_temp = mlxsw_thermal_module_temp_get, .get_trip_type = mlxsw_thermal_module_trip_type_get, .get_trip_temp = mlxsw_thermal_module_trip_temp_get,
@@ -597,7 +568,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, - .set_mode = mlxsw_thermal_module_mode_set, .get_temp = mlxsw_thermal_gearbox_temp_get, .get_trip_type = mlxsw_thermal_module_trip_type_get, .get_trip_temp = mlxsw_thermal_module_trip_temp_get,
drivers/platform/x86/acerhdf.c +0 -3
@@ -397,8 +397,6 @@ static inline void acerhdf_revert_to_bios_mode(void) {acerhdf_change_fanstate (ACERHDF_FAN_AUTO ); kernelmode =0 ; -if (thz_dev) - thz_dev->polling_delay =0 ;pr_notice ("kernel mode fan control OFF\n" ); }
@@ -406,7 +404,6 @@ static inline void acerhdf_enable_kernelmode(void) { kernelmode =1 ; - thz_dev->polling_delay = interval*1000 ;pr_notice ("kernel mode fan control ON\n" ); }
drivers/thermal/imx_thermal.c +0 -6
@@ -338,9 +338,6 @@ static int imx_set_mode(struct thermal_zone_device *tz,const struct thermal_soc_data *soc_data = data->socdata;if (mode ==THERMAL_DEVICE_ENABLED ) { - tz->polling_delay =IMX_POLLING_DELAY ; - tz->passive_delay =IMX_PASSIVE_DELAY ; -regmap_write (map, soc_data->sensor_ctrl +REG_CLR , soc_data->power_down_mask); regmap_write(map, soc_data->sensor_ctrl + REG_SET,
@@ -356,9 +353,6 @@ static int imx_set_mode(struct thermal_zone_device *tz,regmap_write (map, soc_data->sensor_ctrl +REG_SET , soc_data->power_down_mask); - tz->polling_delay =0 ; - tz->passive_delay =0 ; -if (data->irq_enabled) {disable_irq (data->irq); data->irq_enabled = false;
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +0 -4
@@ -386,10 +386,6 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal,if (!priv)return -EINVAL ; -if (mode !=THERMAL_DEVICE_ENABLED && - mode !=THERMAL_DEVICE_DISABLED ) -return -EINVAL ; -if (mode != thermal->mode) result = int3400_thermal_run_osc(priv->adev->handle, priv->current_uuid_index,
drivers/thermal/thermal_of.c +0 -18
@@ -267,22 +267,6 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,return 0 ; } -static int of_thermal_set_mode (struct thermal_zone_device *tz, -enum thermal_device_mode mode) -{ -struct __thermal_zone *data = tz->devdata; - -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 ; - } - -return 0 ; -} -static int of_thermal_get_trip_type (struct thermal_zone_device *tz,int trip,enum thermal_trip_type *type) {
@@ -374,8 +358,6 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz, }static struct thermal_zone_device_ops of_thermal_ops = { - .set_mode = of_thermal_set_mode, - .get_trip_type = of_thermal_get_trip_type, .get_trip_temp = of_thermal_get_trip_temp, .set_trip_temp = of_thermal_set_trip_temp,
Signature · 1 line
2.17.1
Re: [PATCH v4 10/11] thermal: Simplify or eliminate unnecessary set_mode() methods
Quoted 8 lines · Andrzej Pietrasiewicz
Setting
polling_delayis now done atthermal_corelevel (by not polling DISABLED devices), so no need to repeat this code.int340x: Checking for an impossible enum value is unnecessary. acpi/thermal: It only prints debug messages.
Signed-off-by Andrzej Pietrasiewicz <[email protected]>---
[...]
Quoted 1 line
drivers/platform/x86/acerhdf.c| 3 --
Re: [PATCH v4 10/11] thermal: Simplify or eliminate unnecessary set_mode() methods
In reply to Andrzej PietrasiewiczQuoted 7 lines · Andrzej Pietrasiewicz
Setting
polling_delayis now done atthermal_corelevel (by not polling DISABLED devices), so no need to repeat this code.int340x: Checking for an impossible enum value is unnecessary. acpi/thermal: It only prints debug messages.
Signed-off-by Andrzej Pietrasiewicz <[email protected]>
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Quoted 219 lines
--- drivers/acpi/thermal.c | 26 ---------------- .../ethernet/mellanox/mlxsw/core_thermal.c | 30 ------------------- drivers/platform/x86/acerhdf.c | 3 -- drivers/thermal/imx_thermal.c | 6 ---- .../intel/int340x_thermal/int3400_thermal.c | 4 --- drivers/thermal/thermal_of.c | 18 ----------- 6 files changed, 87 deletions(-)drivers/acpi/thermal.c +0
-26@@ -525,31 +525,6 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)return 0 ; } -static int thermal_set_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode mode) -{ -struct acpi_thermal *tz = thermal->devdata; - -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_DISABLED ) -pr_warn ("thermal zone will be disabled\n" ); - -ACPI_DEBUG_PRINT ((ACPI_DB_INFO , -"%s kernel ACPI thermal control\n" , - mode ==THERMAL_DEVICE_ENABLED ? -"Enable" :"Disable" )); - -return 0 ; -} -static int thermal_get_trip_type (struct thermal_zone_device *thermal,int trip,enum thermal_trip_type *type) {@@ -836,7 +811,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, - .set_mode = thermal_set_mode, .get_trip_type = thermal_get_trip_type, .get_trip_temp = thermal_get_trip_temp, .get_crit_temp = thermal_get_crit_temp,drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +0
-30@@ -275,19 +275,6 @@ static int mlxsw_thermal_unbind(struct thermal_zone_device *tzdev,return 0 ; } -static int mlxsw_thermal_set_mode (struct thermal_zone_device *tzdev, -enum thermal_device_mode mode) -{ -struct mlxsw_thermal *thermal = tzdev->devdata; - -if (mode ==THERMAL_DEVICE_ENABLED ) - tzdev->polling_delay = thermal->polling_delay; -else - tzdev->polling_delay =0 ; - -return 0 ; -} -static int mlxsw_thermal_get_temp (struct thermal_zone_device *tzdev,int *p_temp) {@@ -388,7 +375,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, - .set_mode = mlxsw_thermal_set_mode, .get_temp = mlxsw_thermal_get_temp, .get_trip_type = mlxsw_thermal_get_trip_type, .get_trip_temp = mlxsw_thermal_get_trip_temp,@@ -446,20 +432,6 @@ static int mlxsw_thermal_module_unbind(struct thermal_zone_device *tzdev,return err; } -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; - -if (mode ==THERMAL_DEVICE_ENABLED ) - tzdev->polling_delay = thermal->polling_delay; -else - tzdev->polling_delay =0 ; - -return 0 ; -} -static int mlxsw_thermal_module_temp_get (struct thermal_zone_device *tzdev,int *p_temp) {@@ -559,7 +531,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, - .set_mode = mlxsw_thermal_module_mode_set, .get_temp = mlxsw_thermal_module_temp_get, .get_trip_type = mlxsw_thermal_module_trip_type_get, .get_trip_temp = mlxsw_thermal_module_trip_temp_get,@@ -597,7 +568,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, - .set_mode = mlxsw_thermal_module_mode_set, .get_temp = mlxsw_thermal_gearbox_temp_get, .get_trip_type = mlxsw_thermal_module_trip_type_get, .get_trip_temp = mlxsw_thermal_module_trip_temp_get,drivers/platform/x86/acerhdf.c +0
-3@@ -397,8 +397,6 @@ static inline void acerhdf_revert_to_bios_mode(void) {acerhdf_change_fanstate (ACERHDF_FAN_AUTO ); kernelmode =0 ; -if (thz_dev) - thz_dev->polling_delay =0 ;pr_notice ("kernel mode fan control OFF\n" ); }@@ -406,7 +404,6 @@ static inline void acerhdf_enable_kernelmode(void) { kernelmode =1 ; - thz_dev->polling_delay = interval*1000 ;pr_notice ("kernel mode fan control ON\n" ); }drivers/thermal/imx_thermal.c +0
-6@@ -338,9 +338,6 @@ static int imx_set_mode(struct thermal_zone_device *tz,const struct thermal_soc_data *soc_data = data->socdata;if (mode ==THERMAL_DEVICE_ENABLED ) { - tz->polling_delay =IMX_POLLING_DELAY ; - tz->passive_delay =IMX_PASSIVE_DELAY ; -regmap_write (map, soc_data->sensor_ctrl +REG_CLR , soc_data->power_down_mask); regmap_write(map, soc_data->sensor_ctrl + REG_SET,@@ -356,9 +353,6 @@ static int imx_set_mode(struct thermal_zone_device *tz,regmap_write (map, soc_data->sensor_ctrl +REG_SET , soc_data->power_down_mask); - tz->polling_delay =0 ; - tz->passive_delay =0 ; -if (data->irq_enabled) {disable_irq (data->irq); data->irq_enabled = false;drivers/thermal/intel/int340x_thermal/int3400_thermal.c +0
-4@@ -386,10 +386,6 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal,if (!priv)return -EINVAL ; -if (mode !=THERMAL_DEVICE_ENABLED && - mode !=THERMAL_DEVICE_DISABLED ) -return -EINVAL ; -if (mode != thermal->mode) result = int3400_thermal_run_osc(priv->adev->handle, priv->current_uuid_index,drivers/thermal/thermal_of.c +0
-18@@ -267,22 +267,6 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,return 0 ; } -static int of_thermal_set_mode (struct thermal_zone_device *tz, -enum thermal_device_mode mode) -{ -struct __thermal_zone *data = tz->devdata; - -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 ; - } - -return 0 ; -} -static int of_thermal_get_trip_type (struct thermal_zone_device *tz,int trip,enum thermal_trip_type *type) {@@ -374,8 +358,6 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz, }static struct thermal_zone_device_ops of_thermal_ops = { - .set_mode = of_thermal_set_mode, - .get_trip_type = of_thermal_get_trip_type, .get_trip_temp = of_thermal_get_trip_temp, .set_trip_temp = of_thermal_set_trip_temp,
PATCH v4 11/11 thermal: Rename set_mode() to change_mode()
In reply to Andrzej Pietrasiewiczset_mode() is 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 change.
To better reflect the purpose of the method rename it to change_mode()
--- drivers/platform/x86/acerhdf.c | 6 +++--- drivers/thermal/imx_thermal.c | 8 ++++---- drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 6 +++--- drivers/thermal/intel/intel_quark_dts_thermal.c | 6 +++--- drivers/thermal/thermal_core.c | 4 ++-- include/linux/thermal.h | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-)
drivers/platform/x86/acerhdf.c +3 -3
@@ -413,8 +413,8 @@ static inline void acerhdf_enable_kernelmode(void)* the temperature and the fan. * disabled: the BIOS takes control of the fan. */ -static int acerhdf_set_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode mode) +static int acerhdf_change_mode (struct thermal_zone_device *thermal, +enum thermal_device_mode mode) {if (mode ==THERMAL_DEVICE_DISABLED && kernelmode)acerhdf_revert_to_bios_mode ();
@@ -473,7 +473,7 @@ static struct thermal_zone_device_ops acerhdf_dev_ops = { .bind = acerhdf_bind, .unbind = acerhdf_unbind, .get_temp = acerhdf_get_ec_temp, - .set_mode = acerhdf_set_mode, + .change_mode = acerhdf_change_mode, .get_trip_type = acerhdf_get_trip_type, .get_trip_hyst = acerhdf_get_trip_hyst, .get_trip_temp = acerhdf_get_trip_temp,
drivers/thermal/imx_thermal.c +4 -4
@@ -330,8 +330,8 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)return 0 ; } -static int imx_set_mode (struct thermal_zone_device *tz, -enum thermal_device_mode mode) +static int imx_change_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) {struct imx_thermal_data *data = tz->devdata;struct regmap *map = data->tempmon;
@@ -447,7 +447,7 @@ static struct thermal_zone_device_ops imx_tz_ops = { .bind = imx_bind, .unbind = imx_unbind, .get_temp = imx_get_temp, - .set_mode = imx_set_mode, + .change_mode = imx_change_mode, .get_trip_type = imx_get_trip_type, .get_trip_temp = imx_get_trip_temp, .get_crit_temp = imx_get_crit_temp,
@@ -860,7 +860,7 @@ static int __maybe_unused imx_thermal_suspend(struct device *dev)* 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. This is done in set_mode() operation called from +* down. This is done in change_mode() operation called from * thermal_zone_device_disable() */ ret =thermal_zone_device_disable (data->tz);
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +3 -3
@@ -377,8 +377,8 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal,return 0 ; } -static int int3400_thermal_set_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode mode) +static int int3400_thermal_change_mode (struct thermal_zone_device *thermal, +enum thermal_device_mode mode) {struct int3400_thermal_priv *priv = thermal->devdata;int result =0 ;
@@ -399,7 +399,7 @@ 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, - .set_mode = int3400_thermal_set_mode, + .change_mode = int3400_thermal_change_mode, };static struct thermal_zone_params int3400_thermal_params = {
drivers/thermal/intel/intel_quark_dts_thermal.c +3 -3
@@ -298,8 +298,8 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,return 0 ; } -static int sys_set_mode (struct thermal_zone_device *tzd, -enum thermal_device_mode mode) +static int sys_change_mode (struct thermal_zone_device *tzd, +enum thermal_device_mode mode) {int ret;
@@ -319,7 +319,7 @@ 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, - .set_mode = sys_set_mode, + .change_mode = sys_change_mode, };static void free_soc_dts (struct soc_sensor_entry *aux_entry)
drivers/thermal/thermal_core.c +2 -2
@@ -482,8 +482,8 @@ int thermal_zone_device_set_mode(struct thermal_zone_device *tz,return ret; } -if (tz->ops->set_mode) - ret = tz->ops->set_mode (tz, mode); +if (tz->ops->change_mode) + ret = tz->ops->change_mode (tz, mode);if (!ret) tz->mode = mode;
include/linux/thermal.h +1 -1
@@ -76,7 +76,7 @@ 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 (*set_mode) (struct thermal_zone_device *, +int (*change_mode) (struct thermal_zone_device *,enum thermal_device_mode );int (*get_trip_type) (struct thermal_zone_device *,int ,enum thermal_trip_type *);
Signature · 1 line
2.17.1
Re: [PATCH v4 11/11] thermal: Rename set_mode() to change_mode()
Quoted 11 lines · Andrzej Pietrasiewicz
set_mode()is only called when tzd's mode is about to change. Actual setting is performed inthermal_core, inthermal_zone_device_set_mode(). The meaning ofset_mode()callback is actually to notify the driver about the mode being changed and giving the driver a chance to oppose such change.To better reflect the purpose of the method rename it to
change_mode()Signed-off-by Andrzej Pietrasiewicz <[email protected]>---
drivers/platform/x86/acerhdf.c| 6 +++---
Re: [PATCH v4 11/11] thermal: Rename set_mode() to change_mode()
In reply to Andrzej PietrasiewiczQuoted 9 lines · Andrzej Pietrasiewicz
set_mode()is only called when tzd's mode is about to change. Actual setting is performed inthermal_core, inthermal_zone_device_set_mode(). The meaning ofset_mode()callback is actually to notify the driver about the mode being changed and giving the driver a chance to oppose such change.To better reflect the purpose of the method rename it to
change_mode()Signed-off-by Andrzej Pietrasiewicz <[email protected]>
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Quoted 143 lines
--- drivers/platform/x86/acerhdf.c | 6 +++--- drivers/thermal/imx_thermal.c | 8 ++++---- drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 6 +++--- drivers/thermal/intel/intel_quark_dts_thermal.c | 6 +++--- drivers/thermal/thermal_core.c | 4 ++-- include/linux/thermal.h | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-)drivers/platform/x86/acerhdf.c +3
-3@@ -413,8 +413,8 @@ static inline void acerhdf_enable_kernelmode(void)* the temperature and the fan. * disabled: the BIOS takes control of the fan. */ -static int acerhdf_set_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode mode) +static int acerhdf_change_mode (struct thermal_zone_device *thermal, +enum thermal_device_mode mode) {if (mode ==THERMAL_DEVICE_DISABLED && kernelmode)acerhdf_revert_to_bios_mode ();@@ -473,7 +473,7 @@ static struct thermal_zone_device_ops acerhdf_dev_ops = { .bind = acerhdf_bind, .unbind = acerhdf_unbind, .get_temp = acerhdf_get_ec_temp, - .set_mode = acerhdf_set_mode, + .change_mode = acerhdf_change_mode, .get_trip_type = acerhdf_get_trip_type, .get_trip_hyst = acerhdf_get_trip_hyst, .get_trip_temp = acerhdf_get_trip_temp,drivers/thermal/imx_thermal.c +4
-4@@ -330,8 +330,8 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)return 0 ; } -static int imx_set_mode (struct thermal_zone_device *tz, -enum thermal_device_mode mode) +static int imx_change_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) {struct imx_thermal_data *data = tz->devdata;struct regmap *map = data->tempmon;@@ -447,7 +447,7 @@ static struct thermal_zone_device_ops imx_tz_ops = { .bind = imx_bind, .unbind = imx_unbind, .get_temp = imx_get_temp, - .set_mode = imx_set_mode, + .change_mode = imx_change_mode, .get_trip_type = imx_get_trip_type, .get_trip_temp = imx_get_trip_temp, .get_crit_temp = imx_get_crit_temp,@@ -860,7 +860,7 @@ static int __maybe_unused imx_thermal_suspend(struct device *dev)* 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. This is done in set_mode() operation called from +* down. This is done in change_mode() operation called from * thermal_zone_device_disable() */ ret =thermal_zone_device_disable (data->tz);drivers/thermal/intel/int340x_thermal/int3400_thermal.c +3
-3@@ -377,8 +377,8 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal,return 0 ; } -static int int3400_thermal_set_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode mode) +static int int3400_thermal_change_mode (struct thermal_zone_device *thermal, +enum thermal_device_mode mode) {struct int3400_thermal_priv *priv = thermal->devdata;int result =0 ;@@ -399,7 +399,7 @@ 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, - .set_mode = int3400_thermal_set_mode, + .change_mode = int3400_thermal_change_mode, };static struct thermal_zone_params int3400_thermal_params = {drivers/thermal/intel/intel_quark_dts_thermal.c +3
-3@@ -298,8 +298,8 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,return 0 ; } -static int sys_set_mode (struct thermal_zone_device *tzd, -enum thermal_device_mode mode) +static int sys_change_mode (struct thermal_zone_device *tzd, +enum thermal_device_mode mode) {int ret;@@ -319,7 +319,7 @@ 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, - .set_mode = sys_set_mode, + .change_mode = sys_change_mode, };static void free_soc_dts (struct soc_sensor_entry *aux_entry)drivers/thermal/thermal_core.c +2
-2@@ -482,8 +482,8 @@ int thermal_zone_device_set_mode(struct thermal_zone_device *tz,return ret; } -if (tz->ops->set_mode) - ret = tz->ops->set_mode (tz, mode); +if (tz->ops->change_mode) + ret = tz->ops->change_mode (tz, mode);if (!ret) tz->mode = mode;include/linux/thermal.h +1
-1@@ -76,7 +76,7 @@ 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 (*set_mode) (struct thermal_zone_device *, +int (*change_mode) (struct thermal_zone_device *,enum thermal_device_mode );int (*get_trip_type) (struct thermal_zone_device *,int ,enum thermal_trip_type *);
Peter Kästle
maintainerHi,
28. Mai 2020 21:21, "Andrzej Pietrasiewicz" <[email protected]> schrieb:
[...]
Quoted 4 lines
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.
I'd like to test it. Which git repo / branch do you base this series of patches on?
[...]
Quoted 1 line
base-commit:
351f4911a477ae01239c42f771f621d85b06ea10
Can't find this hashref anywhere.
Signature · 2 lines
thanks --peter;
W dniu 01.06.2020 o 12:02, Peter Kästle pisze:
Quoted 11 lines
Hi,
28. Mai 2020 21:21, "Andrzej Pietrasiewicz" <[email protected]> schrieb:
[...]
Quoted 4 lines
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.
Quoted 8 lines
I'd like to test it. Which git repo / branch do you base this series of patches on?
[...]
Quoted 1 line
base-commit:
351f4911a477ae01239c42f771f621d85b06ea10Can't find this hashref anywhere.
git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git, branch "testing".
base-commit: 351f4911a477ae01239c42f771f621d85b06ea10
Hi Andrzej,
Quoted 7 lines · Andrzej Pietrasiewicz
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:
Quoted 8 lines
"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(-)"
Thanks for this nice cleanup. Given the series was tested, reviewed and acked, I would like to merge it as soon as possible.
Can you send the V5 with the EXPORT_SYMBOL_GPL fixed ? So the series can enter the integration loop.
Thanks
-- Daniel
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
v5 cover Stop monitoring disabled devices
A respin of v4 with these changes:
v4..v5:
- EXPORT_SYMBOL -> EXPORT_SYMBOL_GPL (Daniel)
- dropped unnecessary thermal_zone_device_enable() in int3400_thermal.c and in thermal_of.c (Bartlomiej)
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 | 38 ++------ .../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 | 41 +-------- drivers/thermal/thermal_sysfs.c | 37 +------- include/linux/thermal.h | 19 +++- 28 files changed, 275 insertions(+), 351 deletions(-)
base-commit: 48778464bb7d346b47157d21ffde2af6b2d39110
Signature · 1 line
2.17.1
PATCH v5 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
Re: [PATCH v5 01/11] acpi: thermal: Fix error handling in the register function
Quoted 7 lines · Andrzej Pietrasiewicz
The
acpi_thermal_register_thermal_zone()is missing any error handling. This needs to be fixed.Signed-off-by Andrzej Pietrasiewicz <[email protected]>Reviewed-by Guenter Roeck <[email protected]>Reviewed-by Bartlomiej Zolnierkiewicz <[email protected]>
Quoted 51 lines
--- drivers/acpi/thermal.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)drivers/acpi/thermal.c +16
-5@@ -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) --2.17.1
PATCH v5 2/11 thermal: Store thermal mode in a dedicated enum
In reply to Andrzej PietrasiewiczPrepare for storing mode in struct thermal_zone_device.
--- drivers/acpi/thermal.c | 27 +++++++++---------- drivers/platform/x86/acerhdf.c | 8 ++++-- .../intel/int340x_thermal/int3400_thermal.c | 18 +++++-------- 3 files changed, 25 insertions(+), 28 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 ;
@@ -915,7 +912,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) goto remove_dev_link; } - 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 +6 -2
@@ -68,6 +68,7 @@ static int kernelmode = 1;#else static int kernelmode;#endif +static enum thermal_device_mode thermal_mode;static unsigned int interval =10 ;static unsigned int fanon =60000 ;
@@ -397,6 +398,7 @@ static inline void acerhdf_revert_to_bios_mode(void) {acerhdf_change_fanstate (ACERHDF_FAN_AUTO ); kernelmode =0 ; + thermal_mode =THERMAL_DEVICE_DISABLED ;if (thz_dev) thz_dev->polling_delay =0 ;pr_notice ("kernel mode fan control OFF\n" );
@@ -404,6 +406,7 @@ static inline void acerhdf_revert_to_bios_mode(void)static inline void acerhdf_enable_kernelmode (void ) { kernelmode =1 ; + thermal_mode =THERMAL_DEVICE_ENABLED ; thz_dev->polling_delay = interval*1000 ;thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );
@@ -416,8 +419,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 ; }
@@ -739,6 +741,8 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (cl_dev))return -EINVAL ; + thermal_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/intel/int340x_thermal/int3400_thermal.c +7 -11
@@ -48,7 +48,7 @@ struct int3400_thermal_priv {struct acpi_device *adev;struct platform_device *pdev;struct thermal_zone_device *thermal; -int mode; +enum thermal_device_mode mode;int art_count;struct art *arts;int trt_count;
@@ -395,24 +395,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 ); }evaluate_odvp (priv);
Signature · 1 line
2.17.1
Re: [PATCH v5 02/11] thermal: Store thermal mode in a dedicated enum
Quoted 8 lines · Andrzej Pietrasiewicz
Prepare for storing mode in struct
thermal_zone_device.Reviewed-by Guenter Roeck <[email protected]>[for acerhdf]Acked-by Peter Kaestle <[email protected]>Reviewed-by Bartlomiej Zolnierkiewicz <[email protected]>
Quoted 177 lines
--- drivers/acpi/thermal.c | 27 +++++++++---------- drivers/platform/x86/acerhdf.c | 8 ++++-- .../intel/int340x_thermal/int3400_thermal.c | 18 +++++-------- 3 files changed, 25 insertions(+), 28 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 ;@@ -915,7 +912,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) goto remove_dev_link; } - 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 +6
-2@@ -68,6 +68,7 @@ static int kernelmode = 1;#else static int kernelmode;#endif +static enum thermal_device_mode thermal_mode;static unsigned int interval =10 ;static unsigned int fanon =60000 ;@@ -397,6 +398,7 @@ static inline void acerhdf_revert_to_bios_mode(void) {acerhdf_change_fanstate (ACERHDF_FAN_AUTO ); kernelmode =0 ; + thermal_mode =THERMAL_DEVICE_DISABLED ;if (thz_dev) thz_dev->polling_delay =0 ;pr_notice ("kernel mode fan control OFF\n" );@@ -404,6 +406,7 @@ static inline void acerhdf_revert_to_bios_mode(void)static inline void acerhdf_enable_kernelmode (void ) { kernelmode =1 ; + thermal_mode =THERMAL_DEVICE_ENABLED ; thz_dev->polling_delay = interval*1000 ;thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );@@ -416,8 +419,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 ; }@@ -739,6 +741,8 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (cl_dev))return -EINVAL ; + thermal_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/intel/int340x_thermal/int3400_thermal.c +7
-12@@ -48,7 +48,7 @@ struct int3400_thermal_priv {struct acpi_device *adev;struct platform_device *pdev;struct thermal_zone_device *thermal; -int mode; +enum thermal_device_mode mode;int art_count;struct art *arts;int trt_count;@@ -395,24 +395,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 ); }evaluate_odvp (priv); --2.17.1
PATCH v5 3/11 thermal: Add current mode to thermal zone device
In reply to Andrzej PietrasiewiczPrepare for changing the place where the mode is stored: now it is in drivers, which might or might not implement get_mode()/set_mode() methods. A lot of cleanup can be done thanks to storing it in struct tzd. The get_mode() methods will become redundant.
--- include/linux/thermal.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/thermal.h +2 -0
@@ -128,6 +128,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 +171,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 */
Signature · 1 line
2.17.1
Re: [PATCH v5 03/11] thermal: Add current mode to thermal zone device
Quoted 9 lines · Andrzej Pietrasiewicz
Prepare for changing the place where the mode is stored: now it is in drivers, which might or might not implement get_mode()/set_mode() methods. A lot of cleanup can be done thanks to storing it in struct tzd. The
get_mode()methods will become redundant.Signed-off-by Andrzej Pietrasiewicz <[email protected]>Reviewed-by Guenter Roeck <[email protected]>Reviewed-by Bartlomiej Zolnierkiewicz <[email protected]>
Quoted 27 lines
--- include/linux/thermal.h | 2 ++ 1 file changed, 2 insertions(+)include/linux/thermal.h +2
-1@@ -128,6 +128,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 +171,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 */ --2.17.1
PATCH v5 4/11 thermal: Store device mode in struct thermal_zone_device
In reply to Andrzej PietrasiewiczPrepare for eliminating get_mode().
--- drivers/acpi/thermal.c | 18 ++++++---------- .../ethernet/mellanox/mlxsw/core_thermal.c | 21 +++++++------------ drivers/platform/x86/acerhdf.c | 15 ++++++------- drivers/thermal/da9062-thermal.c | 6 ++---- drivers/thermal/imx_thermal.c | 17 +++++++-------- .../intel/int340x_thermal/int3400_thermal.c | 12 +++-------- .../thermal/intel/intel_quark_dts_thermal.c | 16 +++++++------- drivers/thermal/thermal_of.c | 10 +++------ 8 files changed, 44 insertions(+), 71 deletions(-)
drivers/acpi/thermal.c +6 -12
@@ -172,7 +172,6 @@ struct acpi_thermal {struct acpi_thermal_trips trips;struct acpi_handle_list devices;struct thermal_zone_device *thermal_zone; -enum thermal_device_mode mode;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->mode !=THERMAL_DEVICE_ENABLED ) +if (tz->thermal_zone->mode !=THERMAL_DEVICE_ENABLED )return ; thermal_zone_device_update(tz->thermal_zone,
@@ -529,12 +528,7 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)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->mode; + *mode = thermal->mode;return 0 ; }
@@ -556,11 +550,11 @@ static int thermal_set_mode(struct thermal_zone_device *thermal,if (mode ==THERMAL_DEVICE_DISABLED )pr_warn ("thermal zone will be disabled\n" ); -if (mode != tz->mode) { - tz->mode = mode; +if (mode != tz->thermal_zone->mode) { + tz->thermal_zone->mode = mode;ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"%s kernel ACPI thermal control\n" , - tz->mode ==THERMAL_DEVICE_ENABLED ? + tz->thermal_zone->mode ==THERMAL_DEVICE_ENABLED ?"Enable" :"Disable" ));acpi_thermal_check (tz); }
@@ -912,7 +906,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) goto remove_dev_link; } - tz->mode =THERMAL_DEVICE_ENABLED ; + tz->thermal_zone->mode =THERMAL_DEVICE_ENABLED ;dev_info (&tz->device->dev,"registered as thermal_zone%d\n" , tz->thermal_zone->id);
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +8 -13
@@ -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;
@@ -280,9 +278,7 @@ static int mlxsw_thermal_unbind(struct thermal_zone_device *tzdev,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; + *mode = tzdev->mode;return 0 ; }
@@ -299,9 +295,9 @@ static int mlxsw_thermal_set_mode(struct thermal_zone_device *tzdev,else tzdev->polling_delay =0 ; + tzdev->mode = mode;mutex_unlock (&tzdev->lock); - thermal->mode = mode;thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED );return 0 ;
@@ -468,9 +464,7 @@ static int mlxsw_thermal_module_unbind(struct thermal_zone_device *tzdev,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; + *mode = tzdev->mode;return 0 ; }
@@ -488,9 +482,10 @@ static int mlxsw_thermal_module_mode_set(struct thermal_zone_device *tzdev,else tzdev->polling_delay =0 ; + tzdev->mode = mode; +mutex_unlock (&tzdev->lock); - tz->mode = mode;thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED );return 0 ;
@@ -780,7 +775,7 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz)return err; } - module_tz->mode =THERMAL_DEVICE_ENABLED ; + module_tz->tzdev->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }
@@ -896,7 +891,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 ; + gearbox_tz->tzdev->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }
@@ -1065,7 +1060,7 @@ int mlxsw_thermal_init(struct mlxsw_core *core,if (err) goto err_unreg_modules_tzdev; - thermal->mode =THERMAL_DEVICE_ENABLED ; + thermal->tzdev->mode =THERMAL_DEVICE_ENABLED ; *p_thermal = thermal;return 0 ;
drivers/platform/x86/acerhdf.c +8 -7
@@ -68,7 +68,6 @@ static int kernelmode = 1;#else static int kernelmode;#endif -static enum thermal_device_mode thermal_mode;static unsigned int interval =10 ;static unsigned int fanon =60000 ;
@@ -398,15 +397,16 @@ static inline void acerhdf_revert_to_bios_mode(void) {acerhdf_change_fanstate (ACERHDF_FAN_AUTO ); kernelmode =0 ; - thermal_mode =THERMAL_DEVICE_DISABLED ; -if (thz_dev) +if (thz_dev) { + thz_dev->mode =THERMAL_DEVICE_DISABLED ; thz_dev->polling_delay =0 ; + }pr_notice ("kernel mode fan control OFF\n" ); }static inline void acerhdf_enable_kernelmode (void ) { kernelmode =1 ; - thermal_mode =THERMAL_DEVICE_ENABLED ; + thz_dev->mode =THERMAL_DEVICE_ENABLED ; thz_dev->polling_delay = interval*1000 ;thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );
@@ -419,7 +419,7 @@ static int acerhdf_get_mode(struct thermal_zone_device *thermal,if (verbose)pr_notice ("kernel mode fan control %d\n" , kernelmode); - *mode = thermal_mode; + *mode = thermal->mode;return 0 ; }
@@ -741,8 +741,6 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (cl_dev))return -EINVAL ; - thermal_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,
@@ -750,6 +748,9 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (thz_dev))return -EINVAL ; + thz_dev->mode = kernelmode ? +THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ; +if (strcmp (thz_dev->governor->name, acerhdf_zone_params.governor_name)) { pr_err("Didn't get thermal governor %s, perhaps not compiled into thermal subsystem.\n",
drivers/thermal/da9062-thermal.c +2 -4
@@ -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;
@@ -124,8 +123,7 @@ static irqreturn_t da9062_thermal_irq_handler(int irq, void *data)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; + *mode = z->mode;return 0 ; }
@@ -233,7 +231,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 +245,7 @@ static int da9062_thermal_probe(struct platform_device *pdev) ret =PTR_ERR (thermal->zone); goto err; } + thermal->zone->mode =THERMAL_DEVICE_ENABLED ; dev_dbg(&pdev->dev, "TJUNC temperature polling period set at %d ms\n",
drivers/thermal/imx_thermal.c +7 -10
@@ -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,
@@ -334,9 +333,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)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; + *mode = tz->mode;return 0 ; }
@@ -376,7 +373,7 @@ static int imx_set_mode(struct thermal_zone_device *tz, } } - data->mode = mode; + tz->mode = mode;thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED );return 0 ;
@@ -831,7 +828,7 @@ static int imx_thermal_probe(struct platform_device *pdev) data->socdata->measure_temp_mask); data->irq_enabled = true; - data->mode =THERMAL_DEVICE_ENABLED ; + data->tz->mode =THERMAL_DEVICE_ENABLED ; ret = devm_request_threaded_irq(&pdev->dev, data->irq, imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,
@@ -885,7 +882,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 +902,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 +3 -9
@@ -48,7 +48,6 @@ struct int3400_thermal_priv {struct acpi_device *adev;struct platform_device *pdev;struct thermal_zone_device *thermal; -enum thermal_device_mode mode;int art_count;struct art *arts;int trt_count;
@@ -381,12 +380,7 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal,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; + *mode = thermal->mode;return 0 ; }
@@ -404,8 +398,8 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal, mode != THERMAL_DEVICE_DISABLED)return -EINVAL ; -if (mode != priv->mode) { - priv->mode = mode; +if (mode != thermal->mode) { + thermal->mode = mode; result =int3400_thermal_run_osc (priv->adev->handle, priv->current_uuid_index, mode ==THERMAL_DEVICE_ENABLED );
drivers/thermal/intel/intel_quark_dts_thermal.c +7 -9
@@ -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 ; }
@@ -312,8 +311,7 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,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; + *mode = tzd->mode;return 0 ; }
drivers/thermal/thermal_of.c +3 -7
@@ -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;
@@ -272,9 +270,7 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,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; + *mode = tz->mode;return 0 ; }
@@ -296,7 +292,7 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz,mutex_unlock (&tz->lock); - data->mode = mode; + tz->mode = mode;thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED );return 0 ;
@@ -979,7 +975,6 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) finish:of_node_put (child); - tz->mode =THERMAL_DEVICE_DISABLED ;return tz;
@@ -1134,6 +1129,7 @@ int __init of_parse_thermal_zones(void)of_thermal_free_zone (tz);/* attempting to build remaining zones still */ } + zone->mode =THERMAL_DEVICE_DISABLED ; }of_node_put (np);
Signature · 1 line
2.17.1
Re: [PATCH v5 04/11] thermal: Store device mode in struct thermal_zone_device
Quoted 7 lines · Andrzej Pietrasiewicz
Prepare for eliminating
get_mode().Signed-off-by Andrzej Pietrasiewicz <[email protected]>[for acerhdf]Acked-by Peter Kaestle <[email protected]>Reviewed-by Bartlomiej Zolnierkiewicz <[email protected]>
Quoted 497 lines
--- drivers/acpi/thermal.c | 18 ++++++---------- .../ethernet/mellanox/mlxsw/core_thermal.c | 21 +++++++------------ drivers/platform/x86/acerhdf.c | 15 ++++++------- drivers/thermal/da9062-thermal.c | 6 ++---- drivers/thermal/imx_thermal.c | 17 +++++++-------- .../intel/int340x_thermal/int3400_thermal.c | 12 +++-------- .../thermal/intel/intel_quark_dts_thermal.c | 16 +++++++------- drivers/thermal/thermal_of.c | 10 +++------ 8 files changed, 44 insertions(+), 71 deletions(-)drivers/acpi/thermal.c +6
-12@@ -172,7 +172,6 @@ struct acpi_thermal {struct acpi_thermal_trips trips;struct acpi_handle_list devices;struct thermal_zone_device *thermal_zone; -enum thermal_device_mode mode;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->mode !=THERMAL_DEVICE_ENABLED ) +if (tz->thermal_zone->mode !=THERMAL_DEVICE_ENABLED )return ; thermal_zone_device_update(tz->thermal_zone,@@ -529,12 +528,7 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)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->mode; + *mode = thermal->mode;return 0 ; }@@ -556,11 +550,11 @@ static int thermal_set_mode(struct thermal_zone_device *thermal,if (mode ==THERMAL_DEVICE_DISABLED )pr_warn ("thermal zone will be disabled\n" ); -if (mode != tz->mode) { - tz->mode = mode; +if (mode != tz->thermal_zone->mode) { + tz->thermal_zone->mode = mode;ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"%s kernel ACPI thermal control\n" , - tz->mode ==THERMAL_DEVICE_ENABLED ? + tz->thermal_zone->mode ==THERMAL_DEVICE_ENABLED ?"Enable" :"Disable" ));acpi_thermal_check (tz); }@@ -912,7 +906,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) goto remove_dev_link; } - tz->mode =THERMAL_DEVICE_ENABLED ; + tz->thermal_zone->mode =THERMAL_DEVICE_ENABLED ;dev_info (&tz->device->dev,"registered as thermal_zone%d\n" , tz->thermal_zone->id);drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +8
-13@@ -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;@@ -280,9 +278,7 @@ static int mlxsw_thermal_unbind(struct thermal_zone_device *tzdev,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; + *mode = tzdev->mode;return 0 ; }@@ -299,9 +295,9 @@ static int mlxsw_thermal_set_mode(struct thermal_zone_device *tzdev,else tzdev->polling_delay =0 ; + tzdev->mode = mode;mutex_unlock (&tzdev->lock); - thermal->mode = mode;thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED );return 0 ;@@ -468,9 +464,7 @@ static int mlxsw_thermal_module_unbind(struct thermal_zone_device *tzdev,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; + *mode = tzdev->mode;return 0 ; }@@ -488,9 +482,10 @@ static int mlxsw_thermal_module_mode_set(struct thermal_zone_device *tzdev,else tzdev->polling_delay =0 ; + tzdev->mode = mode; +mutex_unlock (&tzdev->lock); - tz->mode = mode;thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED );return 0 ;@@ -780,7 +775,7 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz)return err; } - module_tz->mode =THERMAL_DEVICE_ENABLED ; + module_tz->tzdev->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }@@ -896,7 +891,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 ; + gearbox_tz->tzdev->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }@@ -1065,7 +1060,7 @@ int mlxsw_thermal_init(struct mlxsw_core *core,if (err) goto err_unreg_modules_tzdev; - thermal->mode =THERMAL_DEVICE_ENABLED ; + thermal->tzdev->mode =THERMAL_DEVICE_ENABLED ; *p_thermal = thermal;return 0 ;drivers/platform/x86/acerhdf.c +8
-7@@ -68,7 +68,6 @@ static int kernelmode = 1;#else static int kernelmode;#endif -static enum thermal_device_mode thermal_mode;static unsigned int interval =10 ;static unsigned int fanon =60000 ;@@ -398,15 +397,16 @@ static inline void acerhdf_revert_to_bios_mode(void) {acerhdf_change_fanstate (ACERHDF_FAN_AUTO ); kernelmode =0 ; - thermal_mode =THERMAL_DEVICE_DISABLED ; -if (thz_dev) +if (thz_dev) { + thz_dev->mode =THERMAL_DEVICE_DISABLED ; thz_dev->polling_delay =0 ; + }pr_notice ("kernel mode fan control OFF\n" ); }static inline void acerhdf_enable_kernelmode (void ) { kernelmode =1 ; - thermal_mode =THERMAL_DEVICE_ENABLED ; + thz_dev->mode =THERMAL_DEVICE_ENABLED ; thz_dev->polling_delay = interval*1000 ;thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );@@ -419,7 +419,7 @@ static int acerhdf_get_mode(struct thermal_zone_device *thermal,if (verbose)pr_notice ("kernel mode fan control %d\n" , kernelmode); - *mode = thermal_mode; + *mode = thermal->mode;return 0 ; }@@ -741,8 +741,6 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (cl_dev))return -EINVAL ; - thermal_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,@@ -750,6 +748,9 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (thz_dev))return -EINVAL ; + thz_dev->mode = kernelmode ? +THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ; +if (strcmp (thz_dev->governor->name, acerhdf_zone_params.governor_name)) { pr_err("Didn't get thermal governor %s, perhaps not compiled into thermal subsystem.\n",drivers/thermal/da9062-thermal.c +2
-4@@ -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;@@ -124,8 +123,7 @@ static irqreturn_t da9062_thermal_irq_handler(int irq, void *data)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; + *mode = z->mode;return 0 ; }@@ -233,7 +231,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 +245,7 @@ static int da9062_thermal_probe(struct platform_device *pdev) ret =PTR_ERR (thermal->zone); goto err; } + thermal->zone->mode =THERMAL_DEVICE_ENABLED ; dev_dbg(&pdev->dev, "TJUNC temperature polling period set at %d ms\n",drivers/thermal/imx_thermal.c +7
-10@@ -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,@@ -334,9 +333,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)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; + *mode = tz->mode;return 0 ; }@@ -376,7 +373,7 @@ static int imx_set_mode(struct thermal_zone_device *tz, } } - data->mode = mode; + tz->mode = mode;thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED );return 0 ;@@ -831,7 +828,7 @@ static int imx_thermal_probe(struct platform_device *pdev) data->socdata->measure_temp_mask); data->irq_enabled = true; - data->mode =THERMAL_DEVICE_ENABLED ; + data->tz->mode =THERMAL_DEVICE_ENABLED ; ret = devm_request_threaded_irq(&pdev->dev, data->irq, imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,@@ -885,7 +882,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 +902,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 +3
-9@@ -48,7 +48,6 @@ struct int3400_thermal_priv {struct acpi_device *adev;struct platform_device *pdev;struct thermal_zone_device *thermal; -enum thermal_device_mode mode;int art_count;struct art *arts;int trt_count;@@ -381,12 +380,7 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal,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; + *mode = thermal->mode;return 0 ; }@@ -404,8 +398,8 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal, mode != THERMAL_DEVICE_DISABLED)return -EINVAL ; -if (mode != priv->mode) { - priv->mode = mode; +if (mode != thermal->mode) { + thermal->mode = mode; result =int3400_thermal_run_osc (priv->adev->handle, priv->current_uuid_index, mode ==THERMAL_DEVICE_ENABLED );drivers/thermal/intel/intel_quark_dts_thermal.c +7
-9@@ -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 ; }@@ -312,8 +311,7 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,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; + *mode = tzd->mode;return 0 ; }drivers/thermal/thermal_of.c +3
-8@@ -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;@@ -272,9 +270,7 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,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; + *mode = tz->mode;return 0 ; }@@ -296,7 +292,7 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz,mutex_unlock (&tz->lock); - data->mode = mode; + tz->mode = mode;thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED );return 0 ;@@ -979,7 +975,6 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) finish:of_node_put (child); - tz->mode =THERMAL_DEVICE_DISABLED ;return tz;@@ -1134,6 +1129,7 @@ int __init of_parse_thermal_zones(void)of_thermal_free_zone (tz);/* attempting to build remaining zones still */ } + zone->mode =THERMAL_DEVICE_DISABLED ; }of_node_put (np); --2.17.1
PATCH v5 5/11 thermal: remove get_mode() operation of drivers
In reply to Andrzej Pietrasiewiczget_mode() is now redundant, as the state is stored in struct thermal_zone_device.
Consequently the "mode" attribute in sysfs can always be visible, because it is always possible to get the mode from struct tzd.
--- drivers/acpi/thermal.c | 9 ------ .../ethernet/mellanox/mlxsw/core_thermal.c | 19 ------------ drivers/platform/x86/acerhdf.c | 12 -------- drivers/thermal/da9062-thermal.c | 8 ----- drivers/thermal/imx_thermal.c | 9 ------ .../intel/int340x_thermal/int3400_thermal.c | 9 ------ .../thermal/intel/intel_quark_dts_thermal.c | 8 ----- drivers/thermal/thermal_core.c | 7 +---- drivers/thermal/thermal_of.c | 9 ------ drivers/thermal/thermal_sysfs.c | 30 ++----------------- include/linux/thermal.h | 2 -- 11 files changed, 3 insertions(+), 119 deletions(-)
drivers/acpi/thermal.c +0 -9
@@ -525,14 +525,6 @@ 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) -{ - *mode = thermal->mode; - -return 0 ; -} -static int thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {
@@ -847,7 +839,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,
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +0 -19
@@ -275,14 +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) -{ - *mode = tzdev->mode; - -return 0 ; -} -static int mlxsw_thermal_set_mode (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {
@@ -402,7 +394,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,
@@ -461,14 +452,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) -{ - *mode = tzdev->mode; - -return 0 ; -} -static int mlxsw_thermal_module_mode_set (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {
@@ -606,7 +589,6 @@ static int mlxsw_thermal_module_trend_get(struct thermal_zone_device *tzdev,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,
@@ -645,7 +627,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,
drivers/platform/x86/acerhdf.c +0 -12
@@ -413,17 +413,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 = thermal->mode; - -return 0 ; -} -/* * set operation mode; * enabled: the thermal layer of the kernel takes care about
@@ -490,7 +479,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,
drivers/thermal/da9062-thermal.c +0 -8
@@ -120,13 +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) -{ - *mode = z->mode; -return 0 ; -} -static int da9062_thermal_get_trip_type (struct thermal_zone_device *z,int trip,enum thermal_trip_type *type)
@@ -179,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, };
drivers/thermal/imx_thermal.c +0 -9
@@ -330,14 +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) -{ - *mode = tz->mode; - -return 0 ; -} -static int imx_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {
@@ -464,7 +456,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,
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +0 -9
@@ -377,14 +377,6 @@ 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) -{ - *mode = thermal->mode; - -return 0 ; -} -static int int3400_thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {
@@ -412,7 +404,6 @@ 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, };
drivers/thermal/intel/intel_quark_dts_thermal.c +0 -8
@@ -308,13 +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) -{ - *mode = tzd->mode; -return 0 ; -} -static int sys_set_mode (struct thermal_zone_device *tzd,enum thermal_device_mode mode) {
@@ -336,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/thermal_core.c +1 -6
@@ -1456,7 +1456,6 @@ static int thermal_pm_notify(struct notifier_block *nb, unsigned long mode, void *_unused) { struct thermal_zone_device *tz; -enum thermal_device_mode tz_mode;switch (mode) {case PM_HIBERNATION_PREPARE :
@@ -1469,11 +1468,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); - -if (tz_mode ==THERMAL_DEVICE_DISABLED ) +if (tz->mode ==THERMAL_DEVICE_DISABLED )continue ;thermal_zone_device_init (tz);
drivers/thermal/thermal_of.c +0 -9
@@ -267,14 +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) -{ - *mode = tz->mode; - -return 0 ; -} -static int of_thermal_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {
@@ -389,7 +381,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,
drivers/thermal/thermal_sysfs.c +2 -28
@@ -49,18 +49,9 @@ static ssize_t 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; - -return sprintf (buf,"%s\n" , mode ==THERMAL_DEVICE_ENABLED ?"enabled" - :"disabled" ); +return sprintf (buf,"%s\n" , tz->mode ==THERMAL_DEVICE_ENABLED ? +"enabled" :"disabled" ); } static ssize_t
@@ -428,30 +419,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 +0 -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,
Signature · 1 line
2.17.1
Re: [PATCH v5 05/11] thermal: remove get_mode() operation of drivers
Quoted 11 lines · Andrzej Pietrasiewicz
get_mode()is now redundant, as the state is stored in structthermal_zone_device.Consequently the "mode" attribute in sysfs can always be visible, because it is always possible to get the mode from struct tzd.
Signed-off-by Andrzej Pietrasiewicz <[email protected]>[for acerhdf]Acked-by Peter Kaestle <[email protected]>Reviewed-by Bartlomiej Zolnierkiewicz <[email protected]>
Quoted 359 lines
--- drivers/acpi/thermal.c | 9 ------ .../ethernet/mellanox/mlxsw/core_thermal.c | 19 ------------ drivers/platform/x86/acerhdf.c | 12 -------- drivers/thermal/da9062-thermal.c | 8 ----- drivers/thermal/imx_thermal.c | 9 ------ .../intel/int340x_thermal/int3400_thermal.c | 9 ------ .../thermal/intel/intel_quark_dts_thermal.c | 8 ----- drivers/thermal/thermal_core.c | 7 +---- drivers/thermal/thermal_of.c | 9 ------ drivers/thermal/thermal_sysfs.c | 30 ++----------------- include/linux/thermal.h | 2 -- 11 files changed, 3 insertions(+), 119 deletions(-)drivers/acpi/thermal.c +0
-9@@ -525,14 +525,6 @@ 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) -{ - *mode = thermal->mode; - -return 0 ; -} -static int thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {@@ -847,7 +839,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,drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +0
-19@@ -275,14 +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) -{ - *mode = tzdev->mode; - -return 0 ; -} -static int mlxsw_thermal_set_mode (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {@@ -402,7 +394,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,@@ -461,14 +452,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) -{ - *mode = tzdev->mode; - -return 0 ; -} -static int mlxsw_thermal_module_mode_set (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {@@ -606,7 +589,6 @@ static int mlxsw_thermal_module_trend_get(struct thermal_zone_device *tzdev,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,@@ -645,7 +627,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,drivers/platform/x86/acerhdf.c +0
-12@@ -413,17 +413,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 = thermal->mode; - -return 0 ; -} -/* * set operation mode; * enabled: the thermal layer of the kernel takes care about @@ -490,7 +479,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,drivers/thermal/da9062-thermal.c +0
-8@@ -120,13 +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) -{ - *mode = z->mode; -return 0 ; -} -static int da9062_thermal_get_trip_type (struct thermal_zone_device *z,int trip,enum thermal_trip_type *type)@@ -179,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, };drivers/thermal/imx_thermal.c +0
-9@@ -330,14 +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) -{ - *mode = tz->mode; - -return 0 ; -} -static int imx_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {@@ -464,7 +456,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,drivers/thermal/intel/int340x_thermal/int3400_thermal.c +0
-9@@ -377,14 +377,6 @@ 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) -{ - *mode = thermal->mode; - -return 0 ; -} -static int int3400_thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {@@ -412,7 +404,6 @@ 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, };drivers/thermal/intel/intel_quark_dts_thermal.c +0
-8@@ -308,13 +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) -{ - *mode = tzd->mode; -return 0 ; -} -static int sys_set_mode (struct thermal_zone_device *tzd,enum thermal_device_mode mode) {@@ -336,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/thermal_core.c +1
-6@@ -1456,7 +1456,6 @@ static int thermal_pm_notify(struct notifier_block *nb, unsigned long mode, void *_unused) { struct thermal_zone_device *tz; -enum thermal_device_mode tz_mode;switch (mode) {case PM_HIBERNATION_PREPARE :@@ -1469,11 +1468,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); - -if (tz_mode ==THERMAL_DEVICE_DISABLED ) +if (tz->mode ==THERMAL_DEVICE_DISABLED )continue ;thermal_zone_device_init (tz);drivers/thermal/thermal_of.c +0
-9@@ -267,14 +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) -{ - *mode = tz->mode; - -return 0 ; -} -static int of_thermal_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {@@ -389,7 +381,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,drivers/thermal/thermal_sysfs.c +2
-28@@ -49,18 +49,9 @@ static ssize_t 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; - -return sprintf (buf,"%s\n" , mode ==THERMAL_DEVICE_ENABLED ?"enabled" - :"disabled" ); +return sprintf (buf,"%s\n" , tz->mode ==THERMAL_DEVICE_ENABLED ? +"enabled" :"disabled" ); } static ssize_t@@ -428,30 +419,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 +0
-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, --2.17.1
PATCH v5 6/11 thermal: Add mode helpers
In reply to Andrzej PietrasiewiczPrepare for making the drivers not access tzd's private members.
--- drivers/thermal/thermal_core.c | 53 ++++++++++++++++++++++++++++++++++ include/linux/thermal.h | 13 +++++++++ 2 files changed, 66 insertions(+)
drivers/thermal/thermal_core.c +53 -0
@@ -459,6 +459,59 @@ static void thermal_zone_device_reset(struct thermal_zone_device *tz)thermal_zone_device_init (tz); } +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) +{ +int ret =0 ; + +mutex_lock (&tz->lock); + +/* do nothing if mode isn't changing */ +if (mode == tz->mode) { +mutex_unlock (&tz->lock); + +return ret; + } + +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; +} + +int thermal_zone_device_enable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_ENABLED ); +} +EXPORT_SYMBOL_GPL (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_GPL (thermal_zone_device_disable); + +int thermal_zone_device_is_enabled (struct thermal_zone_device *tz) +{ +enum thermal_device_mode mode; + +mutex_lock (&tz->lock); + + mode = tz->mode; + +mutex_unlock (&tz->lock); + +return mode ==THERMAL_DEVICE_ENABLED ; +} +EXPORT_SYMBOL_GPL (thermal_zone_device_is_enabled); +void thermal_zone_device_update (struct thermal_zone_device *tz,enum thermal_notify_event event) {
include/linux/thermal.h +13 -0
@@ -416,6 +416,9 @@ int thermal_zone_get_offset(struct thermal_zone_device *tz);void thermal_cdev_update (struct thermal_cooling_device *);void thermal_notify_framework (struct thermal_zone_device *,int ); +int thermal_zone_device_enable (struct thermal_zone_device *tz); +int thermal_zone_device_disable (struct thermal_zone_device *tz); +int thermal_zone_device_is_enabled (struct thermal_zone_device *tz);#else static inline struct thermal_zone_device *thermal_zone_device_register( const char *type, int trips, int mask, void *devdata,
@@ -463,6 +466,16 @@ static inline void thermal_cdev_update(struct thermal_cooling_device *cdev)static inline void thermal_notify_framework (struct thermal_zone_device *tz,int trip) { } + +static inline int thermal_zone_device_enable (struct thermal_zone_device *tz) +{return -ENODEV ; } + +static inline int thermal_zone_device_disable (struct thermal_zone_device *tz) +{return -ENODEV ; } + +static inline int +thermal_zone_device_is_enabled (struct thermal_zone_device *tz) +{return -ENODEV ; }#endif /* CONFIG_THERMAL */ #endif /* __THERMAL_H__ */
Signature · 1 line
2.17.1
kernel test robot
build botRe: [PATCH v5 06/11] thermal: Add mode helpers
I love your patch! Perhaps something to improve:
Hi Andrzej,
I love your patch! Perhaps something to improve:
[auto build test WARNING on 48778464bb7d346b47157d21ffde2af6b2d39110]
url: https://github.com/0day-ci/linux/commits/Andrzej-Pietrasiewicz/Stop-monitoring-disabled-devices/20200627-013944 base: 48778464bb7d346b47157d21ffde2af6b2d39110 config: x86_64-randconfig-s022-20200624 (attached as .config) compiler: gcc-9 (Debian 9.3.0-13) 9.3.0 reproduce: # apt-get install sparse # sparse version: v0.6.2-dirty # save the attached .config to linux build tree make W=1 C=1 ARCH=x86_64 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__'
If you fix the issue, kindly add following tag as appropriate
sparse warnings: (new ones prefixed by >>)
>> drivers/thermal/thermal_core.c:462:5: sparse: sparse: symbol 'thermal_zone_device_set_mode' was not declared. Should it be static?
Please review and possibly fold the followup patch.
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]
kernel test robot
build bot[RFC PATCH] thermal: thermal_zone_device_set_mode() can be static
In reply to Andrzej PietrasiewiczSigned-off-by: kernel test robot <[email protected]>
--- thermal_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/thermal/thermal_core.c +2 -2
@@ -459,8 +459,8 @@ static void thermal_zone_device_reset(struct thermal_zone_device *tz)thermal_zone_device_init (tz); } -int thermal_zone_device_set_mode (struct thermal_zone_device *tz, -enum thermal_device_mode mode) +static int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) {int ret =0 ;
kernel test robot
build botRe: [PATCH v5 06/11] thermal: Add mode helpers
In reply to Andrzej PietrasiewiczI love your patch! Perhaps something to improve:
Hi Andrzej,
I love your patch! Perhaps something to improve:
[auto build test WARNING on 48778464bb7d346b47157d21ffde2af6b2d39110]
url: https://github.com/0day-ci/linux/commits/Andrzej-Pietrasiewicz/Stop-monitoring-disabled-devices/20200627-013944 base: 48778464bb7d346b47157d21ffde2af6b2d39110 config: arm-imx_v6_v7_defconfig (attached as .config) compiler: arm-linux-gnueabi-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
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 COMPILER=gcc-9.3.0 make.cross ARCH=arm
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/thermal/thermal_core.c:462:5: warning: no previous prototype for 'thermal_zone_device_set_mode' [-Wmissing-prototypes]
462 | int thermal_zone_device_set_mode(struct thermal_zone_device *tz,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
vim +/thermal_zone_device_set_mode +462 drivers/thermal/thermal_core.c
461
> 462 int thermal_zone_device_set_mode(struct thermal_zone_device *tz,
463 enum thermal_device_mode mode)
464 {
465 int ret = 0;
466
467 mutex_lock(&tz->lock);
468
469 /* do nothing if mode isn't changing */
470 if (mode == tz->mode) {
471 mutex_unlock(&tz->lock);
472
473 return ret;
474 }
475
476 if (tz->ops->set_mode)
477 ret = tz->ops->set_mode(tz, mode);
478
479 if (!ret)
480 tz->mode = mode;
481
482 mutex_unlock(&tz->lock);
483
484 thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);
485
486 return ret;
487 }
488
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]
kernel test robot
build botRe: [PATCH v5 06/11] thermal: Add mode helpers
In reply to Andrzej PietrasiewiczI love your patch! Perhaps something to improve:
Hi Andrzej,
I love your patch! Perhaps something to improve:
[auto build test WARNING on 48778464bb7d346b47157d21ffde2af6b2d39110]
url: https://github.com/0day-ci/linux/commits/Andrzej-Pietrasiewicz/Stop-monitoring-disabled-devices/20200627-013944 base: 48778464bb7d346b47157d21ffde2af6b2d39110 config: x86_64-allyesconfig (attached as .config) compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project 6e11ed52057ffc39941cb2de6d93cae522db4782)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/thermal/thermal_core.c:462:5: warning: no previous prototype for function 'thermal_zone_device_set_mode' [-Wmissing-prototypes]
int thermal_zone_device_set_mode(struct thermal_zone_device *tz,
^ drivers/thermal/thermal_core.c:462:1: note: declare 'static' if the function is not intended to be used outside of this translation unit int thermal_zone_device_set_mode(struct thermal_zone_device *tz,
^
static
1 warning generated.
vim +/thermal_zone_device_set_mode +462 drivers/thermal/thermal_core.c
461
> 462 int thermal_zone_device_set_mode(struct thermal_zone_device *tz,
463 enum thermal_device_mode mode)
464 {
465 int ret = 0;
466
467 mutex_lock(&tz->lock);
468
469 /* do nothing if mode isn't changing */
470 if (mode == tz->mode) {
471 mutex_unlock(&tz->lock);
472
473 return ret;
474 }
475
476 if (tz->ops->set_mode)
477 ret = tz->ops->set_mode(tz, mode);
478
479 if (!ret)
480 tz->mode = mode;
481
482 mutex_unlock(&tz->lock);
483
484 thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);
485
486 return ret;
487 }
488
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]
Re: [PATCH v5 06/11] thermal: Add mode helpers
In reply to Andrzej PietrasiewiczQuoted 17 lines · Andrzej Pietrasiewicz
Prepare for making the drivers not access tzd's private members.
Signed-off-by Andrzej Pietrasiewicz <[email protected]>Reviewed-by Bartlomiej Zolnierkiewicz <[email protected]>[EXPORT_SYMBOL -> EXPORT_SYMBOL_GPL]Signed-off-by Andrzej Pietrasiewicz <[email protected]>--- drivers/thermal/thermal_core.c | 53 ++++++++++++++++++++++++++++++++++ include/linux/thermal.h | 13 +++++++++ 2 files changed, 66 insertions(+)drivers/thermal/thermal_core.c +0
-0
drivers/thermal/thermal_core.c static void thermal_zone_device_reset(struct thermal_zone_device *tz) · line 463
Quoted 5 lines
drivers/thermal/thermal_core.c +2
-0@@ -459,6 +459,59 @@ static void thermal_zone_device_reset(struct thermal_zone_device *tz)thermal_zone_device_init (tz); } +int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode)
Should this be static?
Quoted 88 lines
drivers/thermal/thermal_core.c +51
-0+{ +int ret =0 ; + +mutex_lock (&tz->lock); + +/* do nothing if mode isn't changing */ +if (mode == tz->mode) { +mutex_unlock (&tz->lock); + +return ret; + } + +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; +} + +int thermal_zone_device_enable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_ENABLED ); +} +EXPORT_SYMBOL_GPL (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_GPL (thermal_zone_device_disable); + +int thermal_zone_device_is_enabled (struct thermal_zone_device *tz) +{ +enum thermal_device_mode mode; + +mutex_lock (&tz->lock); + + mode = tz->mode; + +mutex_unlock (&tz->lock); + +return mode ==THERMAL_DEVICE_ENABLED ; +} +EXPORT_SYMBOL_GPL (thermal_zone_device_is_enabled); +void thermal_zone_device_update (struct thermal_zone_device *tz,enum thermal_notify_event event) {include/linux/thermal.h +13
-1@@ -416,6 +416,9 @@ int thermal_zone_get_offset(struct thermal_zone_device *tz);void thermal_cdev_update (struct thermal_cooling_device *);void thermal_notify_framework (struct thermal_zone_device *,int ); +int thermal_zone_device_enable (struct thermal_zone_device *tz); +int thermal_zone_device_disable (struct thermal_zone_device *tz); +int thermal_zone_device_is_enabled (struct thermal_zone_device *tz);#else static inline struct thermal_zone_device *thermal_zone_device_register( const char *type, int trips, int mask, void *devdata,@@ -463,6 +466,16 @@ static inline void thermal_cdev_update(struct thermal_cooling_device *cdev)static inline void thermal_notify_framework (struct thermal_zone_device *tz,int trip) { } + +static inline int thermal_zone_device_enable (struct thermal_zone_device *tz) +{return -ENODEV ; } + +static inline int thermal_zone_device_disable (struct thermal_zone_device *tz) +{return -ENODEV ; } + +static inline int +thermal_zone_device_is_enabled (struct thermal_zone_device *tz) +{return -ENODEV ; }#endif /* CONFIG_THERMAL */ #endif /* __THERMAL_H__ */ --2.17.1
v6 cover Stop monitoring disabled devices
A respin of v5 with these changes:
v5..v6:
- staticized thermal_zone_device_set_mode() (kbuild test robot)
v4..v5:
- EXPORT_SYMBOL -> EXPORT_SYMBOL_GPL (Daniel)
- dropped unnecessary thermal_zone_device_enable() in int3400_thermal.c and in thermal_of.c (Bartlomiej)
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 | 38 ++------ .../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 | 41 +-------- drivers/thermal/thermal_sysfs.c | 37 +------- include/linux/thermal.h | 19 +++- 28 files changed, 275 insertions(+), 351 deletions(-)
base-commit: 9ebcfadb0610322ac537dd7aa5d9cbc2b2894c68
Signature · 1 line
2.17.1
PATCH v6 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
PATCH v6 2/11 thermal: Store thermal mode in a dedicated enum
In reply to Andrzej PietrasiewiczPrepare for storing mode in struct thermal_zone_device.
--- drivers/acpi/thermal.c | 27 +++++++++---------- drivers/platform/x86/acerhdf.c | 8 ++++-- .../intel/int340x_thermal/int3400_thermal.c | 18 +++++-------- 3 files changed, 25 insertions(+), 28 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 ;
@@ -915,7 +912,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) goto remove_dev_link; } - 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 +6 -2
@@ -68,6 +68,7 @@ static int kernelmode = 1;#else static int kernelmode;#endif +static enum thermal_device_mode thermal_mode;static unsigned int interval =10 ;static unsigned int fanon =60000 ;
@@ -397,6 +398,7 @@ static inline void acerhdf_revert_to_bios_mode(void) {acerhdf_change_fanstate (ACERHDF_FAN_AUTO ); kernelmode =0 ; + thermal_mode =THERMAL_DEVICE_DISABLED ;if (thz_dev) thz_dev->polling_delay =0 ;pr_notice ("kernel mode fan control OFF\n" );
@@ -404,6 +406,7 @@ static inline void acerhdf_revert_to_bios_mode(void)static inline void acerhdf_enable_kernelmode (void ) { kernelmode =1 ; + thermal_mode =THERMAL_DEVICE_ENABLED ; thz_dev->polling_delay = interval*1000 ;thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );
@@ -416,8 +419,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 ; }
@@ -739,6 +741,8 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (cl_dev))return -EINVAL ; + thermal_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/intel/int340x_thermal/int3400_thermal.c +7 -11
@@ -48,7 +48,7 @@ struct int3400_thermal_priv {struct acpi_device *adev;struct platform_device *pdev;struct thermal_zone_device *thermal; -int mode; +enum thermal_device_mode mode;int art_count;struct art *arts;int trt_count;
@@ -395,24 +395,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 ); }evaluate_odvp (priv);
Signature · 1 line
2.17.1
PATCH v6 3/11 thermal: Add current mode to thermal zone device
In reply to Andrzej PietrasiewiczPrepare for changing the place where the mode is stored: now it is in drivers, which might or might not implement get_mode()/set_mode() methods. A lot of cleanup can be done thanks to storing it in struct tzd. The get_mode() methods will become redundant.
--- include/linux/thermal.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/thermal.h +2 -0
@@ -128,6 +128,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 +171,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 */
Signature · 1 line
2.17.1
PATCH v6 4/11 thermal: Store device mode in struct thermal_zone_device
In reply to Andrzej PietrasiewiczPrepare for eliminating get_mode().
--- drivers/acpi/thermal.c | 18 ++++++---------- .../ethernet/mellanox/mlxsw/core_thermal.c | 21 +++++++------------ drivers/platform/x86/acerhdf.c | 15 ++++++------- drivers/thermal/da9062-thermal.c | 6 ++---- drivers/thermal/imx_thermal.c | 17 +++++++-------- .../intel/int340x_thermal/int3400_thermal.c | 12 +++-------- .../thermal/intel/intel_quark_dts_thermal.c | 16 +++++++------- drivers/thermal/thermal_of.c | 10 +++------ 8 files changed, 44 insertions(+), 71 deletions(-)
drivers/acpi/thermal.c +6 -12
@@ -172,7 +172,6 @@ struct acpi_thermal {struct acpi_thermal_trips trips;struct acpi_handle_list devices;struct thermal_zone_device *thermal_zone; -enum thermal_device_mode mode;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->mode !=THERMAL_DEVICE_ENABLED ) +if (tz->thermal_zone->mode !=THERMAL_DEVICE_ENABLED )return ; thermal_zone_device_update(tz->thermal_zone,
@@ -529,12 +528,7 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)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->mode; + *mode = thermal->mode;return 0 ; }
@@ -556,11 +550,11 @@ static int thermal_set_mode(struct thermal_zone_device *thermal,if (mode ==THERMAL_DEVICE_DISABLED )pr_warn ("thermal zone will be disabled\n" ); -if (mode != tz->mode) { - tz->mode = mode; +if (mode != tz->thermal_zone->mode) { + tz->thermal_zone->mode = mode;ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"%s kernel ACPI thermal control\n" , - tz->mode ==THERMAL_DEVICE_ENABLED ? + tz->thermal_zone->mode ==THERMAL_DEVICE_ENABLED ?"Enable" :"Disable" ));acpi_thermal_check (tz); }
@@ -912,7 +906,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) goto remove_dev_link; } - tz->mode =THERMAL_DEVICE_ENABLED ; + tz->thermal_zone->mode =THERMAL_DEVICE_ENABLED ;dev_info (&tz->device->dev,"registered as thermal_zone%d\n" , tz->thermal_zone->id);
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +8 -13
@@ -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;
@@ -280,9 +278,7 @@ static int mlxsw_thermal_unbind(struct thermal_zone_device *tzdev,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; + *mode = tzdev->mode;return 0 ; }
@@ -299,9 +295,9 @@ static int mlxsw_thermal_set_mode(struct thermal_zone_device *tzdev,else tzdev->polling_delay =0 ; + tzdev->mode = mode;mutex_unlock (&tzdev->lock); - thermal->mode = mode;thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED );return 0 ;
@@ -468,9 +464,7 @@ static int mlxsw_thermal_module_unbind(struct thermal_zone_device *tzdev,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; + *mode = tzdev->mode;return 0 ; }
@@ -488,9 +482,10 @@ static int mlxsw_thermal_module_mode_set(struct thermal_zone_device *tzdev,else tzdev->polling_delay =0 ; + tzdev->mode = mode; +mutex_unlock (&tzdev->lock); - tz->mode = mode;thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED );return 0 ;
@@ -780,7 +775,7 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz)return err; } - module_tz->mode =THERMAL_DEVICE_ENABLED ; + module_tz->tzdev->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }
@@ -896,7 +891,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 ; + gearbox_tz->tzdev->mode =THERMAL_DEVICE_ENABLED ;return 0 ; }
@@ -1065,7 +1060,7 @@ int mlxsw_thermal_init(struct mlxsw_core *core,if (err) goto err_unreg_modules_tzdev; - thermal->mode =THERMAL_DEVICE_ENABLED ; + thermal->tzdev->mode =THERMAL_DEVICE_ENABLED ; *p_thermal = thermal;return 0 ;
drivers/platform/x86/acerhdf.c +8 -7
@@ -68,7 +68,6 @@ static int kernelmode = 1;#else static int kernelmode;#endif -static enum thermal_device_mode thermal_mode;static unsigned int interval =10 ;static unsigned int fanon =60000 ;
@@ -398,15 +397,16 @@ static inline void acerhdf_revert_to_bios_mode(void) {acerhdf_change_fanstate (ACERHDF_FAN_AUTO ); kernelmode =0 ; - thermal_mode =THERMAL_DEVICE_DISABLED ; -if (thz_dev) +if (thz_dev) { + thz_dev->mode =THERMAL_DEVICE_DISABLED ; thz_dev->polling_delay =0 ; + }pr_notice ("kernel mode fan control OFF\n" ); }static inline void acerhdf_enable_kernelmode (void ) { kernelmode =1 ; - thermal_mode =THERMAL_DEVICE_ENABLED ; + thz_dev->mode =THERMAL_DEVICE_ENABLED ; thz_dev->polling_delay = interval*1000 ;thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );
@@ -419,7 +419,7 @@ static int acerhdf_get_mode(struct thermal_zone_device *thermal,if (verbose)pr_notice ("kernel mode fan control %d\n" , kernelmode); - *mode = thermal_mode; + *mode = thermal->mode;return 0 ; }
@@ -741,8 +741,6 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (cl_dev))return -EINVAL ; - thermal_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,
@@ -750,6 +748,9 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (thz_dev))return -EINVAL ; + thz_dev->mode = kernelmode ? +THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ; +if (strcmp (thz_dev->governor->name, acerhdf_zone_params.governor_name)) { pr_err("Didn't get thermal governor %s, perhaps not compiled into thermal subsystem.\n",
drivers/thermal/da9062-thermal.c +2 -4
@@ -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;
@@ -124,8 +123,7 @@ static irqreturn_t da9062_thermal_irq_handler(int irq, void *data)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; + *mode = z->mode;return 0 ; }
@@ -233,7 +231,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 +245,7 @@ static int da9062_thermal_probe(struct platform_device *pdev) ret =PTR_ERR (thermal->zone); goto err; } + thermal->zone->mode =THERMAL_DEVICE_ENABLED ; dev_dbg(&pdev->dev, "TJUNC temperature polling period set at %d ms\n",
drivers/thermal/imx_thermal.c +7 -10
@@ -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,
@@ -334,9 +333,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)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; + *mode = tz->mode;return 0 ; }
@@ -376,7 +373,7 @@ static int imx_set_mode(struct thermal_zone_device *tz, } } - data->mode = mode; + tz->mode = mode;thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED );return 0 ;
@@ -831,7 +828,7 @@ static int imx_thermal_probe(struct platform_device *pdev) data->socdata->measure_temp_mask); data->irq_enabled = true; - data->mode =THERMAL_DEVICE_ENABLED ; + data->tz->mode =THERMAL_DEVICE_ENABLED ; ret = devm_request_threaded_irq(&pdev->dev, data->irq, imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,
@@ -885,7 +882,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 +902,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 +3 -9
@@ -48,7 +48,6 @@ struct int3400_thermal_priv {struct acpi_device *adev;struct platform_device *pdev;struct thermal_zone_device *thermal; -enum thermal_device_mode mode;int art_count;struct art *arts;int trt_count;
@@ -381,12 +380,7 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal,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; + *mode = thermal->mode;return 0 ; }
@@ -404,8 +398,8 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal, mode != THERMAL_DEVICE_DISABLED)return -EINVAL ; -if (mode != priv->mode) { - priv->mode = mode; +if (mode != thermal->mode) { + thermal->mode = mode; result =int3400_thermal_run_osc (priv->adev->handle, priv->current_uuid_index, mode ==THERMAL_DEVICE_ENABLED );
drivers/thermal/intel/intel_quark_dts_thermal.c +7 -9
@@ -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 ; }
@@ -312,8 +311,7 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,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; + *mode = tzd->mode;return 0 ; }
drivers/thermal/thermal_of.c +3 -7
@@ -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;
@@ -272,9 +270,7 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,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; + *mode = tz->mode;return 0 ; }
@@ -296,7 +292,7 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz,mutex_unlock (&tz->lock); - data->mode = mode; + tz->mode = mode;thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED );return 0 ;
@@ -979,7 +975,6 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) finish:of_node_put (child); - tz->mode =THERMAL_DEVICE_DISABLED ;return tz;
@@ -1134,6 +1129,7 @@ int __init of_parse_thermal_zones(void)of_thermal_free_zone (tz);/* attempting to build remaining zones still */ } + zone->mode =THERMAL_DEVICE_DISABLED ; }of_node_put (np);
Signature · 1 line
2.17.1
PATCH v6 5/11 thermal: remove get_mode() operation of drivers
In reply to Andrzej Pietrasiewiczget_mode() is now redundant, as the state is stored in struct thermal_zone_device.
Consequently the "mode" attribute in sysfs can always be visible, because it is always possible to get the mode from struct tzd.
--- drivers/acpi/thermal.c | 9 ------ .../ethernet/mellanox/mlxsw/core_thermal.c | 19 ------------ drivers/platform/x86/acerhdf.c | 12 -------- drivers/thermal/da9062-thermal.c | 8 ----- drivers/thermal/imx_thermal.c | 9 ------ .../intel/int340x_thermal/int3400_thermal.c | 9 ------ .../thermal/intel/intel_quark_dts_thermal.c | 8 ----- drivers/thermal/thermal_core.c | 7 +---- drivers/thermal/thermal_of.c | 9 ------ drivers/thermal/thermal_sysfs.c | 30 ++----------------- include/linux/thermal.h | 2 -- 11 files changed, 3 insertions(+), 119 deletions(-)
drivers/acpi/thermal.c +0 -9
@@ -525,14 +525,6 @@ 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) -{ - *mode = thermal->mode; - -return 0 ; -} -static int thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {
@@ -847,7 +839,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,
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +0 -19
@@ -275,14 +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) -{ - *mode = tzdev->mode; - -return 0 ; -} -static int mlxsw_thermal_set_mode (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {
@@ -402,7 +394,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,
@@ -461,14 +452,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) -{ - *mode = tzdev->mode; - -return 0 ; -} -static int mlxsw_thermal_module_mode_set (struct thermal_zone_device *tzdev,enum thermal_device_mode mode) {
@@ -606,7 +589,6 @@ static int mlxsw_thermal_module_trend_get(struct thermal_zone_device *tzdev,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,
@@ -645,7 +627,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,
drivers/platform/x86/acerhdf.c +0 -12
@@ -413,17 +413,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 = thermal->mode; - -return 0 ; -} -/* * set operation mode; * enabled: the thermal layer of the kernel takes care about
@@ -490,7 +479,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,
drivers/thermal/da9062-thermal.c +0 -8
@@ -120,13 +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) -{ - *mode = z->mode; -return 0 ; -} -static int da9062_thermal_get_trip_type (struct thermal_zone_device *z,int trip,enum thermal_trip_type *type)
@@ -179,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, };
drivers/thermal/imx_thermal.c +0 -9
@@ -330,14 +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) -{ - *mode = tz->mode; - -return 0 ; -} -static int imx_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {
@@ -464,7 +456,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,
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +0 -9
@@ -377,14 +377,6 @@ 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) -{ - *mode = thermal->mode; - -return 0 ; -} -static int int3400_thermal_set_mode (struct thermal_zone_device *thermal,enum thermal_device_mode mode) {
@@ -412,7 +404,6 @@ 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, };
drivers/thermal/intel/intel_quark_dts_thermal.c +0 -8
@@ -308,13 +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) -{ - *mode = tzd->mode; -return 0 ; -} -static int sys_set_mode (struct thermal_zone_device *tzd,enum thermal_device_mode mode) {
@@ -336,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/thermal_core.c +1 -6
@@ -1456,7 +1456,6 @@ static int thermal_pm_notify(struct notifier_block *nb, unsigned long mode, void *_unused) { struct thermal_zone_device *tz; -enum thermal_device_mode tz_mode;switch (mode) {case PM_HIBERNATION_PREPARE :
@@ -1469,11 +1468,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); - -if (tz_mode ==THERMAL_DEVICE_DISABLED ) +if (tz->mode ==THERMAL_DEVICE_DISABLED )continue ;thermal_zone_device_init (tz);
drivers/thermal/thermal_of.c +0 -9
@@ -267,14 +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) -{ - *mode = tz->mode; - -return 0 ; -} -static int of_thermal_set_mode (struct thermal_zone_device *tz,enum thermal_device_mode mode) {
@@ -389,7 +381,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,
drivers/thermal/thermal_sysfs.c +2 -28
@@ -49,18 +49,9 @@ static ssize_t 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; - -return sprintf (buf,"%s\n" , mode ==THERMAL_DEVICE_ENABLED ?"enabled" - :"disabled" ); +return sprintf (buf,"%s\n" , tz->mode ==THERMAL_DEVICE_ENABLED ? +"enabled" :"disabled" ); } static ssize_t
@@ -428,30 +419,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 +0 -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,
Signature · 1 line
2.17.1
PATCH v6 6/11 thermal: Add mode helpers
In reply to Andrzej PietrasiewiczPrepare for making the drivers not access tzd's private members.
--- drivers/thermal/thermal_core.c | 53 ++++++++++++++++++++++++++++++++++ include/linux/thermal.h | 13 +++++++++ 2 files changed, 66 insertions(+)
drivers/thermal/thermal_core.c +53 -0
@@ -459,6 +459,59 @@ static void thermal_zone_device_reset(struct thermal_zone_device *tz)thermal_zone_device_init (tz); } +static int thermal_zone_device_set_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) +{ +int ret =0 ; + +mutex_lock (&tz->lock); + +/* do nothing if mode isn't changing */ +if (mode == tz->mode) { +mutex_unlock (&tz->lock); + +return ret; + } + +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; +} + +int thermal_zone_device_enable (struct thermal_zone_device *tz) +{ +return thermal_zone_device_set_mode (tz,THERMAL_DEVICE_ENABLED ); +} +EXPORT_SYMBOL_GPL (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_GPL (thermal_zone_device_disable); + +int thermal_zone_device_is_enabled (struct thermal_zone_device *tz) +{ +enum thermal_device_mode mode; + +mutex_lock (&tz->lock); + + mode = tz->mode; + +mutex_unlock (&tz->lock); + +return mode ==THERMAL_DEVICE_ENABLED ; +} +EXPORT_SYMBOL_GPL (thermal_zone_device_is_enabled); +void thermal_zone_device_update (struct thermal_zone_device *tz,enum thermal_notify_event event) {
include/linux/thermal.h +13 -0
@@ -416,6 +416,9 @@ int thermal_zone_get_offset(struct thermal_zone_device *tz);void thermal_cdev_update (struct thermal_cooling_device *);void thermal_notify_framework (struct thermal_zone_device *,int ); +int thermal_zone_device_enable (struct thermal_zone_device *tz); +int thermal_zone_device_disable (struct thermal_zone_device *tz); +int thermal_zone_device_is_enabled (struct thermal_zone_device *tz);#else static inline struct thermal_zone_device *thermal_zone_device_register( const char *type, int trips, int mask, void *devdata,
@@ -463,6 +466,16 @@ static inline void thermal_cdev_update(struct thermal_cooling_device *cdev)static inline void thermal_notify_framework (struct thermal_zone_device *tz,int trip) { } + +static inline int thermal_zone_device_enable (struct thermal_zone_device *tz) +{return -ENODEV ; } + +static inline int thermal_zone_device_disable (struct thermal_zone_device *tz) +{return -ENODEV ; } + +static inline int +thermal_zone_device_is_enabled (struct thermal_zone_device *tz) +{return -ENODEV ; }#endif /* CONFIG_THERMAL */ #endif /* __THERMAL_H__ */
Signature · 1 line
2.17.1
Re: [PATCH v6 06/11] thermal: Add mode helpers
Quoted 8 lines · Andrzej Pietrasiewicz
Prepare for making the drivers not access tzd's private members.
Signed-off-by Andrzej Pietrasiewicz <[email protected]>Reviewed-by Bartlomiej Zolnierkiewicz <[email protected]>[EXPORT_SYMBOL -> EXPORT_SYMBOL_GPL]Signed-off-by Andrzej Pietrasiewicz <[email protected]>[staticize thermal_zone_device_set_mode()]Signed-off-by kernel test robot <[email protected]>
Duplicate signed-off line.
Please resend a V7 without a reply-to, so the series will be correctly handled by patchwork and that will make my life easier.
Thanks
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
PATCH v6 7/11 thermal: Use mode helpers in drivers
In reply to Andrzej PietrasiewiczUse thermal_zone_device_{en|dis}able() and thermal_zone_device_is_enabled().
Consequently, all set_mode() implementations in drivers:
- can stop modifying tzd's "mode" member,
- shall stop taking tzd's lock, as it is taken in the helpers
- shall stop calling thermal_zone_device_update() as it is called in the helpers
- can assume they are called when the mode truly changes, so checks to verify that can be dropped
Not providing set_mode() by a driver no longer prevents the core from being able to set tzd's mode, so the relevant check in mode_store() is removed.
Other comments:
- acpi/thermal.c: tz->thermal_zone->mode will be updated only after we return from set_mode(), so use function parameter in thermal_set_mode() instead, no need to call acpi_thermal_check() in set_mode()
- thermal/imx_thermal.c: regmap writes and mode assignment are done in thermal_zone_device_{en|dis}able() and set_mode() callback
- thermal/intel/intel_quark_dts_thermal.c: soc_dts_{en|dis}able() are a part of set_mode() callback, so they don't need to modify tzd->mode, and don't need to fall back to the opposite mode if unsuccessful, as the return value will be propagated to thermal_zone_device_{en|dis}able() and ultimately tzd's member will not be changed in thermal_zone_device_set_mode().
- thermal/of-thermal.c: no need to set zone->mode to DISABLED in of_parse_thermal_zones() as a tzd is kzalloc'ed so mode is DISABLED anyway
--- drivers/acpi/thermal.c | 21 ++++++----- .../ethernet/mellanox/mlxsw/core_thermal.c | 37 +++++++++---------- drivers/platform/x86/acerhdf.c | 17 +++++---- drivers/thermal/da9062-thermal.c | 6 ++- drivers/thermal/hisi_thermal.c | 6 ++- drivers/thermal/imx_thermal.c | 33 +++++++---------- .../intel/int340x_thermal/int3400_thermal.c | 5 +-- .../thermal/intel/intel_quark_dts_thermal.c | 18 ++------- drivers/thermal/rockchip_thermal.c | 6 ++- drivers/thermal/sprd_thermal.c | 6 ++- drivers/thermal/thermal_core.c | 2 +- drivers/thermal/thermal_of.c | 10 +---- drivers/thermal/thermal_sysfs.c | 11 ++---- 13 files changed, 80 insertions(+), 98 deletions(-)
drivers/acpi/thermal.c +11 -10
@@ -499,7 +499,7 @@ static void acpi_thermal_check(void *data) {struct acpi_thermal *tz = data; -if (tz->thermal_zone->mode !=THERMAL_DEVICE_ENABLED ) +if (!thermal_zone_device_is_enabled (tz->thermal_zone))return ; thermal_zone_device_update(tz->thermal_zone,
@@ -542,14 +542,11 @@ static int thermal_set_mode(struct thermal_zone_device *thermal,if (mode ==THERMAL_DEVICE_DISABLED )pr_warn ("thermal zone will be disabled\n" ); -if (mode != tz->thermal_zone->mode) { - tz->thermal_zone->mode = mode; -ACPI_DEBUG_PRINT ((ACPI_DB_INFO , -"%s kernel ACPI thermal control\n" , - tz->thermal_zone->mode ==THERMAL_DEVICE_ENABLED ? -"Enable" :"Disable" )); -acpi_thermal_check (tz); - } +ACPI_DEBUG_PRINT ((ACPI_DB_INFO , +"%s kernel ACPI thermal control\n" , + mode ==THERMAL_DEVICE_ENABLED ? +"Enable" :"Disable" )); +return 0 ; }
@@ -897,13 +894,17 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) goto remove_dev_link; } - tz->thermal_zone->mode =THERMAL_DEVICE_ENABLED ; + result =thermal_zone_device_enable (tz->thermal_zone); +if (result) + goto acpi_bus_detach;dev_info (&tz->device->dev,"registered as thermal_zone%d\n" , tz->thermal_zone->id);return 0 ; +acpi_bus_detach: +acpi_bus_detach_private_data (tz->device->handle); remove_dev_link:sysfs_remove_link (&tz->thermal_zone->device.kobj,"device" ); remove_tz_link:
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +17 -20
@@ -280,18 +280,11 @@ static int mlxsw_thermal_set_mode(struct thermal_zone_device *tzdev, {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 ; - tzdev->mode = mode; -mutex_unlock (&tzdev->lock); - -thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }
@@ -458,19 +451,11 @@ static int mlxsw_thermal_module_mode_set(struct thermal_zone_device *tzdev,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 ; - tzdev->mode = mode; - -mutex_unlock (&tzdev->lock); - -thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }
@@ -756,8 +741,11 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz)return err; } - module_tz->tzdev->mode =THERMAL_DEVICE_ENABLED ; -return 0 ; + err =thermal_zone_device_enable (module_tz->tzdev); +if (err) +thermal_zone_device_unregister (module_tz->tzdev); + +return err; }static void mlxsw_thermal_module_tz_fini (struct thermal_zone_device *tzdev)
@@ -860,6 +848,7 @@ static int mlxsw_thermal_gearbox_tz_init(struct mlxsw_thermal_module *gearbox_tz) {char tz_name[MLXSW_THERMAL_ZONE_MAX_NAME ]; +int ret;snprintf (tz_name,sizeof (tz_name),"mlxsw-gearbox%d" , gearbox_tz->module +1 );
@@ -872,8 +861,11 @@ 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->tzdev->mode =THERMAL_DEVICE_ENABLED ; -return 0 ; + ret =thermal_zone_device_enable (gearbox_tz->tzdev); +if (ret) +thermal_zone_device_unregister (gearbox_tz->tzdev); + +return ret; } static void
@@ -1041,10 +1033,15 @@ int mlxsw_thermal_init(struct mlxsw_core *core,if (err) goto err_unreg_modules_tzdev; - thermal->tzdev->mode =THERMAL_DEVICE_ENABLED ; + err =thermal_zone_device_enable (thermal->tzdev); +if (err) + goto err_unreg_gearboxes; + *p_thermal = thermal;return 0 ; +err_unreg_gearboxes: +mlxsw_thermal_gearboxes_fini (thermal); err_unreg_modules_tzdev:mlxsw_thermal_modules_fini (thermal); err_unreg_tzdev:
drivers/platform/x86/acerhdf.c +10 -7
@@ -397,19 +397,16 @@ static inline void acerhdf_revert_to_bios_mode(void) {acerhdf_change_fanstate (ACERHDF_FAN_AUTO ); kernelmode =0 ; -if (thz_dev) { - thz_dev->mode =THERMAL_DEVICE_DISABLED ; +if (thz_dev) thz_dev->polling_delay =0 ; - } +pr_notice ("kernel mode fan control OFF\n" ); }static inline void acerhdf_enable_kernelmode (void ) { kernelmode =1 ; - thz_dev->mode =THERMAL_DEVICE_ENABLED ; thz_dev->polling_delay = interval*1000 ; -thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );pr_notice ("kernel mode fan control ON\n" ); }
@@ -723,6 +720,8 @@ static void acerhdf_unregister_platform(void)static int __init acerhdf_register_thermal (void ) { +int ret; + cl_dev =thermal_cooling_device_register ("acerhdf-fan" ,NULL , &acerhdf_cooling_ops);
@@ -736,8 +735,12 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (thz_dev))return -EINVAL ; - thz_dev->mode = kernelmode ? -THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ; +if (kernelmode) + ret =thermal_zone_device_enable (thz_dev); +else + ret =thermal_zone_device_disable (thz_dev); +if (ret) +return ret;if (strcmp (thz_dev->governor->name, acerhdf_zone_params.governor_name)) {
drivers/thermal/da9062-thermal.c +5 -1
@@ -237,7 +237,11 @@ static int da9062_thermal_probe(struct platform_device *pdev) ret =PTR_ERR (thermal->zone); goto err; } - thermal->zone->mode =THERMAL_DEVICE_ENABLED ; + ret =thermal_zone_device_enable (thermal->zone); +if (ret) { +dev_err (&pdev->dev,"Cannot enable thermal zone device\n" ); + goto err_zone; + } dev_dbg(&pdev->dev, "TJUNC temperature polling period set at %d ms\n",
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 +14 -19
@@ -255,7 +255,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)bool wait;u32 val; -if (tz->mode ==THERMAL_DEVICE_ENABLED ) { +if (thermal_zone_device_is_enabled (tz)) {/* Check if a measurement is currently in progress */ regmap_read (map, soc_data->temp_data, &val); wait = !(val & soc_data->temp_valid_mask);
@@ -282,7 +282,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)regmap_read (map, soc_data->temp_data, &val); -if (tz->mode !=THERMAL_DEVICE_ENABLED ) { +if (!thermal_zone_device_is_enabled (tz)) {regmap_write (map, soc_data->sensor_ctrl +REG_CLR , soc_data->measure_temp_mask); regmap_write(map, soc_data->sensor_ctrl + REG_SET,
@@ -365,9 +365,6 @@ static int imx_set_mode(struct thermal_zone_device *tz, } } - tz->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }
@@ -819,7 +816,9 @@ static int imx_thermal_probe(struct platform_device *pdev) data->socdata->measure_temp_mask); data->irq_enabled = true; - data->tz->mode =THERMAL_DEVICE_ENABLED ; + ret =thermal_zone_device_enable (data->tz); +if (ret) + goto thermal_zone_unregister; ret = devm_request_threaded_irq(&pdev->dev, data->irq, imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,
@@ -861,19 +860,18 @@ 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; +int ret;/* * 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 set_mode() operation called from +* 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->tz->mode =THERMAL_DEVICE_DISABLED ; + ret =thermal_zone_device_disable (data->tz); +if (ret) +return ret;clk_disable_unprepare (data->thermal_clk);return 0 ;
@@ -882,18 +880,15 @@ 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->tz->mode =THERMAL_DEVICE_ENABLED ; + ret =thermal_zone_device_enable (data->tz); +if (ret) +return ret;return 0 ; }
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +2 -3
@@ -390,12 +390,11 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal, mode != THERMAL_DEVICE_DISABLED)return -EINVAL ; -if (mode != thermal->mode) { - thermal->mode = mode; +if (mode != thermal->mode) result =int3400_thermal_run_osc (priv->adev->handle, priv->current_uuid_index, mode ==THERMAL_DEVICE_ENABLED ); - } +evaluate_odvp (priv);
drivers/thermal/intel/intel_quark_dts_thermal.c +3 -15
@@ -126,10 +126,8 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)if (ret)return ret; -if (out &QRK_DTS_ENABLE_BIT ) { - tzd->mode =THERMAL_DEVICE_ENABLED ; +if (out &QRK_DTS_ENABLE_BIT )return 0 ; - }if (!aux_entry->locked) { out |=QRK_DTS_ENABLE_BIT ;
@@ -137,10 +135,7 @@ static int soc_dts_enable(struct thermal_zone_device *tzd) QRK_DTS_REG_OFFSET_ENABLE, out);if (ret)return ret; - - tzd->mode =THERMAL_DEVICE_ENABLED ; }else { - tzd->mode =THERMAL_DEVICE_DISABLED ;pr_info ("DTS is locked. Cannot enable DTS\n" ); ret = -EPERM ; }
@@ -159,10 +154,8 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)if (ret)return ret; -if (!(out &QRK_DTS_ENABLE_BIT )) { - tzd->mode =THERMAL_DEVICE_DISABLED ; +if (!(out &QRK_DTS_ENABLE_BIT ))return 0 ; - }if (!aux_entry->locked) { out &= ~QRK_DTS_ENABLE_BIT ;
@@ -171,10 +164,7 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)if (ret)return ret; - - tzd->mode =THERMAL_DEVICE_DISABLED ; }else { - tzd->mode =THERMAL_DEVICE_ENABLED ;pr_info ("DTS is locked. Cannot disable DTS\n" ); ret = -EPERM ; }
@@ -404,9 +394,7 @@ 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); + err =thermal_zone_device_enable (aux_entry->tzone);if (err) goto err_aux_status;
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 +1 -1
@@ -1521,7 +1521,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) { -if (tz->mode ==THERMAL_DEVICE_DISABLED ) +if (!thermal_zone_device_is_enabled (tz))continue ;thermal_zone_device_init (tz);
drivers/thermal/thermal_of.c +1 -9
@@ -272,8 +272,6 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz, {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;
@@ -282,11 +280,6 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz, tz->passive_delay =0 ; } -mutex_unlock (&tz->lock); - - tz->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }
@@ -541,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;
@@ -1120,7 +1113,6 @@ int __init of_parse_thermal_zones(void)of_thermal_free_zone (tz);/* attempting to build remaining zones still */ } - zone->mode =THERMAL_DEVICE_DISABLED ; }of_node_put (np);
drivers/thermal/thermal_sysfs.c +4 -7
@@ -49,9 +49,9 @@ static ssize_t mode_show(struct device *dev, struct device_attribute *attr, char *buf) { struct thermal_zone_device *tz = to_thermal_zone(dev); +int enabled =thermal_zone_device_is_enabled (tz); -return sprintf (buf,"%s\n" , tz->mode ==THERMAL_DEVICE_ENABLED ? -"enabled" :"disabled" ); +return sprintf (buf,"%s\n" , enabled ?"enabled" :"disabled" ); } static ssize_t
@@ -61,13 +61,10 @@ mode_store(struct device *dev, struct device_attribute *attr,struct thermal_zone_device *tz =to_thermal_zone (dev);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 ); + 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 ;
Signature · 1 line
2.17.1
PATCH v6 8/11 thermal: Explicitly enable non-changing thermal zone devices
In reply to Andrzej PietrasiewiczSome thermal zone devices never change their state, so they should be always enabled.
--- drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c | 8 ++++++++ drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 9 ++++++++- drivers/platform/x86/intel_mid_thermal.c | 6 ++++++ drivers/power/supply/power_supply_core.c | 9 +++++++-- drivers/thermal/armada_thermal.c | 6 ++++++ drivers/thermal/dove_thermal.c | 6 ++++++ .../thermal/intel/int340x_thermal/int340x_thermal_zone.c | 5 +++++ drivers/thermal/intel/intel_pch_thermal.c | 5 +++++ 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/spear_thermal.c | 7 +++++++ drivers/thermal/st/st_thermal.c | 5 +++++ 14 files changed, 87 insertions(+), 4 deletions(-)
drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c +8 -0
@@ -92,6 +92,14 @@ int cxgb4_thermal_init(struct adapter *adap) ch_thermal->tzdev =NULL ;return ret; } + + ret =thermal_zone_device_enable (ch_thermal->tzdev); +if (ret) { +dev_err (adap->pdev_dev,"Failed to enable thermal zone\n" ); +thermal_zone_device_unregister (adap->ch_thermal.tzdev); +return ret; + } +return 0 ; }
drivers/net/wireless/intel/iwlwifi/mvm/tt.c +8 -1
@@ -733,7 +733,7 @@ static struct thermal_zone_device_ops tzone_ops = {static void iwl_mvm_thermal_zone_register (struct iwl_mvm *mvm) { -int i; +int i, ret;char name[16 ];static atomic_t counter =ATOMIC_INIT (0 );
@@ -759,6 +759,13 @@ static void iwl_mvm_thermal_zone_register(struct iwl_mvm *mvm)return ; } + ret =thermal_zone_device_enable (mvm->tz_device.tzone); +if (ret) { +IWL_DEBUG_TEMP (mvm,"Failed to enable thermal zone\n" ); +thermal_zone_device_unregister (mvm->tz_device.tzone); +return ; + } +/* 0 is a valid temperature, * so initialize the array with S16_MIN which invalid temperature */
drivers/platform/x86/intel_mid_thermal.c +6 -0
@@ -493,6 +493,12 @@ static int mid_thermal_probe(struct platform_device *pdev) ret =PTR_ERR (pinfo->tzd[i]); goto err; } + ret =thermal_zone_device_enable (pinfo->tzd[i]); +if (ret) { +kfree (td_info); +thermal_zone_device_unregister (pinfo->tzd[i]); + goto err; + } } pinfo->pdev = pdev;
drivers/power/supply/power_supply_core.c +7 -2
@@ -939,7 +939,7 @@ static struct thermal_zone_device_ops psy_tzd_ops = {static int psy_register_thermal (struct power_supply *psy) { -int i; +int i, ret;if (psy->desc->no_thermal)return 0 ;
@@ -949,7 +949,12 @@ static int psy_register_thermal(struct power_supply *psy)if (psy->desc->properties[i] ==POWER_SUPPLY_PROP_TEMP ) { psy->tzd =thermal_zone_device_register (psy->desc->name,0 ,0 , psy, &psy_tzd_ops,NULL ,0 ,0 ); -return PTR_ERR_OR_ZERO (psy->tzd); +if (IS_ERR (psy->tzd)) +return PTR_ERR (psy->tzd); + ret =thermal_zone_device_enable (psy->tzd); +if (ret) +thermal_zone_device_unregister (psy->tzd); +return ret; } }return 0 ;
drivers/thermal/armada_thermal.c +6 -0
@@ -874,6 +874,12 @@ static int armada_thermal_probe(struct platform_device *pdev)return PTR_ERR (tz); } + ret =thermal_zone_device_enable (tz); +if (ret) { +thermal_zone_device_unregister (tz); +return ret; + } + drvdata->type =LEGACY ; drvdata->data.tz = tz;platform_set_drvdata (pdev, drvdata);
drivers/thermal/dove_thermal.c +6 -0
@@ -153,6 +153,12 @@ static int dove_thermal_probe(struct platform_device *pdev)return PTR_ERR (thermal); } + ret =thermal_zone_device_enable (thermal); +if (ret) { +thermal_zone_device_unregister (thermal); +return ret; + } +platform_set_drvdata (pdev, thermal);return 0 ;
drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +5 -0
@@ -259,9 +259,14 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev, ret =PTR_ERR (int34x_thermal_zone->zone); goto err_thermal_zone; } + ret =thermal_zone_device_enable (int34x_thermal_zone->zone); +if (ret) + goto err_enable;return int34x_thermal_zone; +err_enable: +thermal_zone_device_unregister (int34x_thermal_zone->zone); err_thermal_zone:acpi_lpat_free_conversion_table (int34x_thermal_zone->lpat_table);kfree (int34x_thermal_zone->aux_trips);
drivers/thermal/intel/intel_pch_thermal.c +5 -0
@@ -352,9 +352,14 @@ static int intel_pch_thermal_probe(struct pci_dev *pdev, err =PTR_ERR (ptd->tzd); goto error_cleanup; } + err =thermal_zone_device_enable (ptd->tzd); +if (err) + goto err_unregister;return 0 ; +err_unregister: +thermal_zone_device_unregister (ptd->tzd); error_cleanup:iounmap (ptd->hw_base); error_release:
drivers/thermal/intel/intel_soc_dts_iosf.c +3 -0
@@ -329,6 +329,9 @@ static int add_dts_thermal_zone(int id, struct intel_soc_dts_sensor_entry *dts, ret =PTR_ERR (dts->tzone); goto err_ret; } + ret =thermal_zone_device_enable (dts->tzone); +if (ret) + goto err_enable; ret =soc_dts_enable (id);if (ret)
drivers/thermal/intel/x86_pkg_temp_thermal.c +6 -0
@@ -363,6 +363,12 @@ static int pkg_temp_thermal_device_add(unsigned int cpu)kfree (zonedev);return err; } + err =thermal_zone_device_enable (zonedev->tzone); +if (err) { +thermal_zone_device_unregister (zonedev->tzone); +kfree (zonedev); +return err; + }/* Store MSR value for package thermal interrupt, to restore at exit */ rdmsr (MSR_IA32_PACKAGE_THERM_INTERRUPT , zonedev->msr_pkg_therm_low, zonedev->msr_pkg_therm_high);
drivers/thermal/kirkwood_thermal.c +7 -0
@@ -65,6 +65,7 @@ static int kirkwood_thermal_probe(struct platform_device *pdev)struct thermal_zone_device *thermal =NULL ;struct kirkwood_thermal_priv *priv;struct resource *res; +int ret; priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_KERNEL );if (!priv)
@@ -82,6 +83,12 @@ static int kirkwood_thermal_probe(struct platform_device *pdev) "Failed to register thermal zone device\n");return PTR_ERR (thermal); } + ret =thermal_zone_device_enable (thermal); +if (ret) { +thermal_zone_device_unregister (thermal); +dev_err (&pdev->dev,"Failed to enable thermal zone device\n" ); +return ret; + }platform_set_drvdata (pdev, thermal);
drivers/thermal/rcar_thermal.c +8 -1
@@ -550,12 +550,19 @@ static int rcar_thermal_probe(struct platform_device *pdev) priv->zone =devm_thermal_zone_of_sensor_register ( dev, i, priv, &rcar_thermal_zone_of_ops); - else + else { priv->zone =thermal_zone_device_register ("rcar_thermal" ,1 ,0 , priv, &rcar_thermal_zone_ops,NULL ,0 , idle); + + ret =thermal_zone_device_enable (priv->zone); +if (ret) { +thermal_zone_device_unregister (priv->zone); + priv->zone =ERR_PTR (ret); + } + }if (IS_ERR (priv->zone)) {dev_err (dev,"can't register thermal zone\n" ); ret =PTR_ERR (priv->zone);
drivers/thermal/spear_thermal.c +7 -0
@@ -131,6 +131,11 @@ static int spear_thermal_probe(struct platform_device *pdev) ret =PTR_ERR (spear_thermal); goto disable_clk; } + ret =thermal_zone_device_enable (spear_thermal); +if (ret) { +dev_err (&pdev->dev,"Cannot enable thermal zone\n" ); + goto unregister_tzd; + }platform_set_drvdata (pdev, spear_thermal);
@@ -139,6 +144,8 @@ static int spear_thermal_probe(struct platform_device *pdev)return 0 ; +unregister_tzd: +thermal_zone_device_unregister (spear_thermal); disable_clk:clk_disable (stdev->clk);
drivers/thermal/st/st_thermal.c +5 -0
@@ -246,11 +246,16 @@ int st_thermal_register(struct platform_device *pdev, ret =PTR_ERR (sensor->thermal_dev); goto sensor_off; } + ret =thermal_zone_device_enable (sensor->thermal_dev); +if (ret) + goto tzd_unregister;platform_set_drvdata (pdev, sensor);return 0 ; +tzd_unregister: +thermal_zone_device_unregister (sensor->thermal_dev); sensor_off:st_thermal_sensor_off (sensor);
Signature · 1 line
2.17.1
PATCH v6 9/11 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
@@ -301,13 +301,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_is_enabled (tz); +} +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 );
@@ -517,6 +526,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
PATCH v6 10/11 thermal: Simplify or eliminate unnecessary set_mode() methods
In reply to Andrzej PietrasiewiczSetting polling_delay is now done at thermal_core level (by not polling DISABLED devices), so no need to repeat this code.
int340x: Checking for an impossible enum value is unnecessary. acpi/thermal: It only prints debug messages.
--- drivers/acpi/thermal.c | 26 ---------------- .../ethernet/mellanox/mlxsw/core_thermal.c | 30 ------------------- drivers/platform/x86/acerhdf.c | 3 -- drivers/thermal/imx_thermal.c | 6 ---- .../intel/int340x_thermal/int3400_thermal.c | 4 --- drivers/thermal/thermal_of.c | 18 ----------- 6 files changed, 87 deletions(-)
drivers/acpi/thermal.c +0 -26
@@ -525,31 +525,6 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)return 0 ; } -static int thermal_set_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode mode) -{ -struct acpi_thermal *tz = thermal->devdata; - -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_DISABLED ) -pr_warn ("thermal zone will be disabled\n" ); - -ACPI_DEBUG_PRINT ((ACPI_DB_INFO , -"%s kernel ACPI thermal control\n" , - mode ==THERMAL_DEVICE_ENABLED ? -"Enable" :"Disable" )); - -return 0 ; -} -static int thermal_get_trip_type (struct thermal_zone_device *thermal,int trip,enum thermal_trip_type *type) {
@@ -836,7 +811,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, - .set_mode = thermal_set_mode, .get_trip_type = thermal_get_trip_type, .get_trip_temp = thermal_get_trip_temp, .get_crit_temp = thermal_get_crit_temp,
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +0 -30
@@ -275,19 +275,6 @@ static int mlxsw_thermal_unbind(struct thermal_zone_device *tzdev,return 0 ; } -static int mlxsw_thermal_set_mode (struct thermal_zone_device *tzdev, -enum thermal_device_mode mode) -{ -struct mlxsw_thermal *thermal = tzdev->devdata; - -if (mode ==THERMAL_DEVICE_ENABLED ) - tzdev->polling_delay = thermal->polling_delay; -else - tzdev->polling_delay =0 ; - -return 0 ; -} -static int mlxsw_thermal_get_temp (struct thermal_zone_device *tzdev,int *p_temp) {
@@ -387,7 +374,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, - .set_mode = mlxsw_thermal_set_mode, .get_temp = mlxsw_thermal_get_temp, .get_trip_type = mlxsw_thermal_get_trip_type, .get_trip_temp = mlxsw_thermal_get_trip_temp,
@@ -445,20 +431,6 @@ static int mlxsw_thermal_module_unbind(struct thermal_zone_device *tzdev,return err; } -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; - -if (mode ==THERMAL_DEVICE_ENABLED ) - tzdev->polling_delay = thermal->polling_delay; -else - tzdev->polling_delay =0 ; - -return 0 ; -} -static int mlxsw_thermal_module_temp_get (struct thermal_zone_device *tzdev,int *p_temp) {
@@ -574,7 +546,6 @@ static int mlxsw_thermal_module_trend_get(struct thermal_zone_device *tzdev,static struct thermal_zone_device_ops mlxsw_thermal_module_ops = { .bind = mlxsw_thermal_module_bind, .unbind = mlxsw_thermal_module_unbind, - .set_mode = mlxsw_thermal_module_mode_set, .get_temp = mlxsw_thermal_module_temp_get, .get_trip_type = mlxsw_thermal_module_trip_type_get, .get_trip_temp = mlxsw_thermal_module_trip_temp_get,
@@ -612,7 +583,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, - .set_mode = mlxsw_thermal_module_mode_set, .get_temp = mlxsw_thermal_gearbox_temp_get, .get_trip_type = mlxsw_thermal_module_trip_type_get, .get_trip_temp = mlxsw_thermal_module_trip_temp_get,
drivers/platform/x86/acerhdf.c +0 -3
@@ -397,8 +397,6 @@ static inline void acerhdf_revert_to_bios_mode(void) {acerhdf_change_fanstate (ACERHDF_FAN_AUTO ); kernelmode =0 ; -if (thz_dev) - thz_dev->polling_delay =0 ;pr_notice ("kernel mode fan control OFF\n" ); }
@@ -406,7 +404,6 @@ static inline void acerhdf_enable_kernelmode(void) { kernelmode =1 ; - thz_dev->polling_delay = interval*1000 ;pr_notice ("kernel mode fan control ON\n" ); }
drivers/thermal/imx_thermal.c +0 -6
@@ -338,9 +338,6 @@ static int imx_set_mode(struct thermal_zone_device *tz,const struct thermal_soc_data *soc_data = data->socdata;if (mode ==THERMAL_DEVICE_ENABLED ) { - tz->polling_delay =IMX_POLLING_DELAY ; - tz->passive_delay =IMX_PASSIVE_DELAY ; -regmap_write (map, soc_data->sensor_ctrl +REG_CLR , soc_data->power_down_mask); regmap_write(map, soc_data->sensor_ctrl + REG_SET,
@@ -356,9 +353,6 @@ static int imx_set_mode(struct thermal_zone_device *tz,regmap_write (map, soc_data->sensor_ctrl +REG_SET , soc_data->power_down_mask); - tz->polling_delay =0 ; - tz->passive_delay =0 ; -if (data->irq_enabled) {disable_irq (data->irq); data->irq_enabled = false;
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +0 -4
@@ -386,10 +386,6 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal,if (!priv)return -EINVAL ; -if (mode !=THERMAL_DEVICE_ENABLED && - mode !=THERMAL_DEVICE_DISABLED ) -return -EINVAL ; -if (mode != thermal->mode) result = int3400_thermal_run_osc(priv->adev->handle, priv->current_uuid_index,
drivers/thermal/thermal_of.c +0 -18
@@ -267,22 +267,6 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,return 0 ; } -static int of_thermal_set_mode (struct thermal_zone_device *tz, -enum thermal_device_mode mode) -{ -struct __thermal_zone *data = tz->devdata; - -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 ; - } - -return 0 ; -} -static int of_thermal_get_trip_type (struct thermal_zone_device *tz,int trip,enum thermal_trip_type *type) {
@@ -374,8 +358,6 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz, }static struct thermal_zone_device_ops of_thermal_ops = { - .set_mode = of_thermal_set_mode, - .get_trip_type = of_thermal_get_trip_type, .get_trip_temp = of_thermal_get_trip_temp, .set_trip_temp = of_thermal_set_trip_temp,
Signature · 1 line
2.17.1
PATCH v6 11/11 thermal: Rename set_mode() to change_mode()
In reply to Andrzej Pietrasiewiczset_mode() is 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 change.
To better reflect the purpose of the method rename it to change_mode()
--- drivers/platform/x86/acerhdf.c | 6 +++--- drivers/thermal/imx_thermal.c | 8 ++++---- drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 6 +++--- drivers/thermal/intel/intel_quark_dts_thermal.c | 6 +++--- drivers/thermal/thermal_core.c | 4 ++-- include/linux/thermal.h | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-)
drivers/platform/x86/acerhdf.c +3 -3
@@ -413,8 +413,8 @@ static inline void acerhdf_enable_kernelmode(void)* the temperature and the fan. * disabled: the BIOS takes control of the fan. */ -static int acerhdf_set_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode mode) +static int acerhdf_change_mode (struct thermal_zone_device *thermal, +enum thermal_device_mode mode) {if (mode ==THERMAL_DEVICE_DISABLED && kernelmode)acerhdf_revert_to_bios_mode ();
@@ -473,7 +473,7 @@ static struct thermal_zone_device_ops acerhdf_dev_ops = { .bind = acerhdf_bind, .unbind = acerhdf_unbind, .get_temp = acerhdf_get_ec_temp, - .set_mode = acerhdf_set_mode, + .change_mode = acerhdf_change_mode, .get_trip_type = acerhdf_get_trip_type, .get_trip_hyst = acerhdf_get_trip_hyst, .get_trip_temp = acerhdf_get_trip_temp,
drivers/thermal/imx_thermal.c +4 -4
@@ -330,8 +330,8 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)return 0 ; } -static int imx_set_mode (struct thermal_zone_device *tz, -enum thermal_device_mode mode) +static int imx_change_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) {struct imx_thermal_data *data = tz->devdata;struct regmap *map = data->tempmon;
@@ -447,7 +447,7 @@ static struct thermal_zone_device_ops imx_tz_ops = { .bind = imx_bind, .unbind = imx_unbind, .get_temp = imx_get_temp, - .set_mode = imx_set_mode, + .change_mode = imx_change_mode, .get_trip_type = imx_get_trip_type, .get_trip_temp = imx_get_trip_temp, .get_crit_temp = imx_get_crit_temp,
@@ -860,7 +860,7 @@ static int __maybe_unused imx_thermal_suspend(struct device *dev)* 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. This is done in set_mode() operation called from +* down. This is done in change_mode() operation called from * thermal_zone_device_disable() */ ret =thermal_zone_device_disable (data->tz);
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +3 -3
@@ -377,8 +377,8 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal,return 0 ; } -static int int3400_thermal_set_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode mode) +static int int3400_thermal_change_mode (struct thermal_zone_device *thermal, +enum thermal_device_mode mode) {struct int3400_thermal_priv *priv = thermal->devdata;int result =0 ;
@@ -399,7 +399,7 @@ 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, - .set_mode = int3400_thermal_set_mode, + .change_mode = int3400_thermal_change_mode, };static struct thermal_zone_params int3400_thermal_params = {
drivers/thermal/intel/intel_quark_dts_thermal.c +3 -3
@@ -298,8 +298,8 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,return 0 ; } -static int sys_set_mode (struct thermal_zone_device *tzd, -enum thermal_device_mode mode) +static int sys_change_mode (struct thermal_zone_device *tzd, +enum thermal_device_mode mode) {int ret;
@@ -319,7 +319,7 @@ 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, - .set_mode = sys_set_mode, + .change_mode = sys_change_mode, };static void free_soc_dts (struct soc_sensor_entry *aux_entry)
drivers/thermal/thermal_core.c +2 -2
@@ -482,8 +482,8 @@ static int thermal_zone_device_set_mode(struct thermal_zone_device *tz,return ret; } -if (tz->ops->set_mode) - ret = tz->ops->set_mode (tz, mode); +if (tz->ops->change_mode) + ret = tz->ops->change_mode (tz, mode);if (!ret) tz->mode = mode;
include/linux/thermal.h +1 -1
@@ -76,7 +76,7 @@ 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 (*set_mode) (struct thermal_zone_device *, +int (*change_mode) (struct thermal_zone_device *,enum thermal_device_mode );int (*get_trip_type) (struct thermal_zone_device *,int ,enum thermal_trip_type *);
Signature · 1 line
2.17.1
PATCH v5 7/11 thermal: Use mode helpers in drivers
In reply to Andrzej PietrasiewiczUse thermal_zone_device_{en|dis}able() and thermal_zone_device_is_enabled().
Consequently, all set_mode() implementations in drivers:
- can stop modifying tzd's "mode" member,
- shall stop taking tzd's lock, as it is taken in the helpers
- shall stop calling thermal_zone_device_update() as it is called in the helpers
- can assume they are called when the mode truly changes, so checks to verify that can be dropped
Not providing set_mode() by a driver no longer prevents the core from being able to set tzd's mode, so the relevant check in mode_store() is removed.
Other comments:
- acpi/thermal.c: tz->thermal_zone->mode will be updated only after we return from set_mode(), so use function parameter in thermal_set_mode() instead, no need to call acpi_thermal_check() in set_mode()
- thermal/imx_thermal.c: regmap writes and mode assignment are done in thermal_zone_device_{en|dis}able() and set_mode() callback
- thermal/intel/intel_quark_dts_thermal.c: soc_dts_{en|dis}able() are a part of set_mode() callback, so they don't need to modify tzd->mode, and don't need to fall back to the opposite mode if unsuccessful, as the return value will be propagated to thermal_zone_device_{en|dis}able() and ultimately tzd's member will not be changed in thermal_zone_device_set_mode().
- thermal/of-thermal.c: no need to set zone->mode to DISABLED in of_parse_thermal_zones() as a tzd is kzalloc'ed so mode is DISABLED anyway
--- drivers/acpi/thermal.c | 21 ++++++----- .../ethernet/mellanox/mlxsw/core_thermal.c | 37 +++++++++---------- drivers/platform/x86/acerhdf.c | 17 +++++---- drivers/thermal/da9062-thermal.c | 6 ++- drivers/thermal/hisi_thermal.c | 6 ++- drivers/thermal/imx_thermal.c | 33 +++++++---------- .../intel/int340x_thermal/int3400_thermal.c | 5 +-- .../thermal/intel/intel_quark_dts_thermal.c | 18 ++------- drivers/thermal/rockchip_thermal.c | 6 ++- drivers/thermal/sprd_thermal.c | 6 ++- drivers/thermal/thermal_core.c | 2 +- drivers/thermal/thermal_of.c | 10 +---- drivers/thermal/thermal_sysfs.c | 11 ++---- 13 files changed, 80 insertions(+), 98 deletions(-)
drivers/acpi/thermal.c +11 -10
@@ -499,7 +499,7 @@ static void acpi_thermal_check(void *data) {struct acpi_thermal *tz = data; -if (tz->thermal_zone->mode !=THERMAL_DEVICE_ENABLED ) +if (!thermal_zone_device_is_enabled (tz->thermal_zone))return ; thermal_zone_device_update(tz->thermal_zone,
@@ -542,14 +542,11 @@ static int thermal_set_mode(struct thermal_zone_device *thermal,if (mode ==THERMAL_DEVICE_DISABLED )pr_warn ("thermal zone will be disabled\n" ); -if (mode != tz->thermal_zone->mode) { - tz->thermal_zone->mode = mode; -ACPI_DEBUG_PRINT ((ACPI_DB_INFO , -"%s kernel ACPI thermal control\n" , - tz->thermal_zone->mode ==THERMAL_DEVICE_ENABLED ? -"Enable" :"Disable" )); -acpi_thermal_check (tz); - } +ACPI_DEBUG_PRINT ((ACPI_DB_INFO , +"%s kernel ACPI thermal control\n" , + mode ==THERMAL_DEVICE_ENABLED ? +"Enable" :"Disable" )); +return 0 ; }
@@ -897,13 +894,17 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) goto remove_dev_link; } - tz->thermal_zone->mode =THERMAL_DEVICE_ENABLED ; + result =thermal_zone_device_enable (tz->thermal_zone); +if (result) + goto acpi_bus_detach;dev_info (&tz->device->dev,"registered as thermal_zone%d\n" , tz->thermal_zone->id);return 0 ; +acpi_bus_detach: +acpi_bus_detach_private_data (tz->device->handle); remove_dev_link:sysfs_remove_link (&tz->thermal_zone->device.kobj,"device" ); remove_tz_link:
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +17 -20
@@ -280,18 +280,11 @@ static int mlxsw_thermal_set_mode(struct thermal_zone_device *tzdev, {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 ; - tzdev->mode = mode; -mutex_unlock (&tzdev->lock); - -thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }
@@ -458,19 +451,11 @@ static int mlxsw_thermal_module_mode_set(struct thermal_zone_device *tzdev,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 ; - tzdev->mode = mode; - -mutex_unlock (&tzdev->lock); - -thermal_zone_device_update (tzdev,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }
@@ -756,8 +741,11 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz)return err; } - module_tz->tzdev->mode =THERMAL_DEVICE_ENABLED ; -return 0 ; + err =thermal_zone_device_enable (module_tz->tzdev); +if (err) +thermal_zone_device_unregister (module_tz->tzdev); + +return err; }static void mlxsw_thermal_module_tz_fini (struct thermal_zone_device *tzdev)
@@ -860,6 +848,7 @@ static int mlxsw_thermal_gearbox_tz_init(struct mlxsw_thermal_module *gearbox_tz) {char tz_name[MLXSW_THERMAL_ZONE_MAX_NAME ]; +int ret;snprintf (tz_name,sizeof (tz_name),"mlxsw-gearbox%d" , gearbox_tz->module +1 );
@@ -872,8 +861,11 @@ 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->tzdev->mode =THERMAL_DEVICE_ENABLED ; -return 0 ; + ret =thermal_zone_device_enable (gearbox_tz->tzdev); +if (ret) +thermal_zone_device_unregister (gearbox_tz->tzdev); + +return ret; } static void
@@ -1041,10 +1033,15 @@ int mlxsw_thermal_init(struct mlxsw_core *core,if (err) goto err_unreg_modules_tzdev; - thermal->tzdev->mode =THERMAL_DEVICE_ENABLED ; + err =thermal_zone_device_enable (thermal->tzdev); +if (err) + goto err_unreg_gearboxes; + *p_thermal = thermal;return 0 ; +err_unreg_gearboxes: +mlxsw_thermal_gearboxes_fini (thermal); err_unreg_modules_tzdev:mlxsw_thermal_modules_fini (thermal); err_unreg_tzdev:
drivers/platform/x86/acerhdf.c +10 -7
@@ -397,19 +397,16 @@ static inline void acerhdf_revert_to_bios_mode(void) {acerhdf_change_fanstate (ACERHDF_FAN_AUTO ); kernelmode =0 ; -if (thz_dev) { - thz_dev->mode =THERMAL_DEVICE_DISABLED ; +if (thz_dev) thz_dev->polling_delay =0 ; - } +pr_notice ("kernel mode fan control OFF\n" ); }static inline void acerhdf_enable_kernelmode (void ) { kernelmode =1 ; - thz_dev->mode =THERMAL_DEVICE_ENABLED ; thz_dev->polling_delay = interval*1000 ; -thermal_zone_device_update (thz_dev,THERMAL_EVENT_UNSPECIFIED );pr_notice ("kernel mode fan control ON\n" ); }
@@ -723,6 +720,8 @@ static void acerhdf_unregister_platform(void)static int __init acerhdf_register_thermal (void ) { +int ret; + cl_dev =thermal_cooling_device_register ("acerhdf-fan" ,NULL , &acerhdf_cooling_ops);
@@ -736,8 +735,12 @@ static int __init acerhdf_register_thermal(void)if (IS_ERR (thz_dev))return -EINVAL ; - thz_dev->mode = kernelmode ? -THERMAL_DEVICE_ENABLED :THERMAL_DEVICE_DISABLED ; +if (kernelmode) + ret =thermal_zone_device_enable (thz_dev); +else + ret =thermal_zone_device_disable (thz_dev); +if (ret) +return ret;if (strcmp (thz_dev->governor->name, acerhdf_zone_params.governor_name)) {
drivers/thermal/da9062-thermal.c +5 -1
@@ -237,7 +237,11 @@ static int da9062_thermal_probe(struct platform_device *pdev) ret =PTR_ERR (thermal->zone); goto err; } - thermal->zone->mode =THERMAL_DEVICE_ENABLED ; + ret =thermal_zone_device_enable (thermal->zone); +if (ret) { +dev_err (&pdev->dev,"Cannot enable thermal zone device\n" ); + goto err_zone; + } dev_dbg(&pdev->dev, "TJUNC temperature polling period set at %d ms\n",
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 +14 -19
@@ -255,7 +255,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)bool wait;u32 val; -if (tz->mode ==THERMAL_DEVICE_ENABLED ) { +if (thermal_zone_device_is_enabled (tz)) {/* Check if a measurement is currently in progress */ regmap_read (map, soc_data->temp_data, &val); wait = !(val & soc_data->temp_valid_mask);
@@ -282,7 +282,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)regmap_read (map, soc_data->temp_data, &val); -if (tz->mode !=THERMAL_DEVICE_ENABLED ) { +if (!thermal_zone_device_is_enabled (tz)) {regmap_write (map, soc_data->sensor_ctrl +REG_CLR , soc_data->measure_temp_mask); regmap_write(map, soc_data->sensor_ctrl + REG_SET,
@@ -365,9 +365,6 @@ static int imx_set_mode(struct thermal_zone_device *tz, } } - tz->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }
@@ -819,7 +816,9 @@ static int imx_thermal_probe(struct platform_device *pdev) data->socdata->measure_temp_mask); data->irq_enabled = true; - data->tz->mode =THERMAL_DEVICE_ENABLED ; + ret =thermal_zone_device_enable (data->tz); +if (ret) + goto thermal_zone_unregister; ret = devm_request_threaded_irq(&pdev->dev, data->irq, imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,
@@ -861,19 +860,18 @@ 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; +int ret;/* * 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 set_mode() operation called from +* 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->tz->mode =THERMAL_DEVICE_DISABLED ; + ret =thermal_zone_device_disable (data->tz); +if (ret) +return ret;clk_disable_unprepare (data->thermal_clk);return 0 ;
@@ -882,18 +880,15 @@ 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->tz->mode =THERMAL_DEVICE_ENABLED ; + ret =thermal_zone_device_enable (data->tz); +if (ret) +return ret;return 0 ; }
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +2 -3
@@ -390,12 +390,11 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal, mode != THERMAL_DEVICE_DISABLED)return -EINVAL ; -if (mode != thermal->mode) { - thermal->mode = mode; +if (mode != thermal->mode) result =int3400_thermal_run_osc (priv->adev->handle, priv->current_uuid_index, mode ==THERMAL_DEVICE_ENABLED ); - } +evaluate_odvp (priv);
drivers/thermal/intel/intel_quark_dts_thermal.c +3 -15
@@ -126,10 +126,8 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)if (ret)return ret; -if (out &QRK_DTS_ENABLE_BIT ) { - tzd->mode =THERMAL_DEVICE_ENABLED ; +if (out &QRK_DTS_ENABLE_BIT )return 0 ; - }if (!aux_entry->locked) { out |=QRK_DTS_ENABLE_BIT ;
@@ -137,10 +135,7 @@ static int soc_dts_enable(struct thermal_zone_device *tzd) QRK_DTS_REG_OFFSET_ENABLE, out);if (ret)return ret; - - tzd->mode =THERMAL_DEVICE_ENABLED ; }else { - tzd->mode =THERMAL_DEVICE_DISABLED ;pr_info ("DTS is locked. Cannot enable DTS\n" ); ret = -EPERM ; }
@@ -159,10 +154,8 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)if (ret)return ret; -if (!(out &QRK_DTS_ENABLE_BIT )) { - tzd->mode =THERMAL_DEVICE_DISABLED ; +if (!(out &QRK_DTS_ENABLE_BIT ))return 0 ; - }if (!aux_entry->locked) { out &= ~QRK_DTS_ENABLE_BIT ;
@@ -171,10 +164,7 @@ static int soc_dts_disable(struct thermal_zone_device *tzd)if (ret)return ret; - - tzd->mode =THERMAL_DEVICE_DISABLED ; }else { - tzd->mode =THERMAL_DEVICE_ENABLED ;pr_info ("DTS is locked. Cannot disable DTS\n" ); ret = -EPERM ; }
@@ -404,9 +394,7 @@ 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); + err =thermal_zone_device_enable (aux_entry->tzone);if (err) goto err_aux_status;
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 +1 -1
@@ -1521,7 +1521,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) { -if (tz->mode ==THERMAL_DEVICE_DISABLED ) +if (!thermal_zone_device_is_enabled (tz))continue ;thermal_zone_device_init (tz);
drivers/thermal/thermal_of.c +1 -9
@@ -272,8 +272,6 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz, {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;
@@ -282,11 +280,6 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz, tz->passive_delay =0 ; } -mutex_unlock (&tz->lock); - - tz->mode = mode; -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); -return 0 ; }
@@ -541,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;
@@ -1120,7 +1113,6 @@ int __init of_parse_thermal_zones(void)of_thermal_free_zone (tz);/* attempting to build remaining zones still */ } - zone->mode =THERMAL_DEVICE_DISABLED ; }of_node_put (np);
drivers/thermal/thermal_sysfs.c +4 -7
@@ -49,9 +49,9 @@ static ssize_t mode_show(struct device *dev, struct device_attribute *attr, char *buf) { struct thermal_zone_device *tz = to_thermal_zone(dev); +int enabled =thermal_zone_device_is_enabled (tz); -return sprintf (buf,"%s\n" , tz->mode ==THERMAL_DEVICE_ENABLED ? -"enabled" :"disabled" ); +return sprintf (buf,"%s\n" , enabled ?"enabled" :"disabled" ); } static ssize_t
@@ -61,13 +61,10 @@ mode_store(struct device *dev, struct device_attribute *attr,struct thermal_zone_device *tz =to_thermal_zone (dev);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 ); + 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 ;
Signature · 1 line
2.17.1
PATCH v5 8/11 thermal: Explicitly enable non-changing thermal zone devices
In reply to Andrzej PietrasiewiczSome thermal zone devices never change their state, so they should be always enabled.
--- drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c | 8 ++++++++ drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 9 ++++++++- drivers/platform/x86/intel_mid_thermal.c | 6 ++++++ drivers/power/supply/power_supply_core.c | 9 +++++++-- drivers/thermal/armada_thermal.c | 6 ++++++ drivers/thermal/dove_thermal.c | 6 ++++++ .../thermal/intel/int340x_thermal/int340x_thermal_zone.c | 5 +++++ drivers/thermal/intel/intel_pch_thermal.c | 5 +++++ 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/spear_thermal.c | 7 +++++++ drivers/thermal/st/st_thermal.c | 5 +++++ 14 files changed, 87 insertions(+), 4 deletions(-)
drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c +8 -0
@@ -92,6 +92,14 @@ int cxgb4_thermal_init(struct adapter *adap) ch_thermal->tzdev =NULL ;return ret; } + + ret =thermal_zone_device_enable (ch_thermal->tzdev); +if (ret) { +dev_err (adap->pdev_dev,"Failed to enable thermal zone\n" ); +thermal_zone_device_unregister (adap->ch_thermal.tzdev); +return ret; + } +return 0 ; }
drivers/net/wireless/intel/iwlwifi/mvm/tt.c +8 -1
@@ -733,7 +733,7 @@ static struct thermal_zone_device_ops tzone_ops = {static void iwl_mvm_thermal_zone_register (struct iwl_mvm *mvm) { -int i; +int i, ret;char name[16 ];static atomic_t counter =ATOMIC_INIT (0 );
@@ -759,6 +759,13 @@ static void iwl_mvm_thermal_zone_register(struct iwl_mvm *mvm)return ; } + ret =thermal_zone_device_enable (mvm->tz_device.tzone); +if (ret) { +IWL_DEBUG_TEMP (mvm,"Failed to enable thermal zone\n" ); +thermal_zone_device_unregister (mvm->tz_device.tzone); +return ; + } +/* 0 is a valid temperature, * so initialize the array with S16_MIN which invalid temperature */
drivers/platform/x86/intel_mid_thermal.c +6 -0
@@ -493,6 +493,12 @@ static int mid_thermal_probe(struct platform_device *pdev) ret =PTR_ERR (pinfo->tzd[i]); goto err; } + ret =thermal_zone_device_enable (pinfo->tzd[i]); +if (ret) { +kfree (td_info); +thermal_zone_device_unregister (pinfo->tzd[i]); + goto err; + } } pinfo->pdev = pdev;
drivers/power/supply/power_supply_core.c +7 -2
@@ -939,7 +939,7 @@ static struct thermal_zone_device_ops psy_tzd_ops = {static int psy_register_thermal (struct power_supply *psy) { -int i; +int i, ret;if (psy->desc->no_thermal)return 0 ;
@@ -949,7 +949,12 @@ static int psy_register_thermal(struct power_supply *psy)if (psy->desc->properties[i] ==POWER_SUPPLY_PROP_TEMP ) { psy->tzd =thermal_zone_device_register (psy->desc->name,0 ,0 , psy, &psy_tzd_ops,NULL ,0 ,0 ); -return PTR_ERR_OR_ZERO (psy->tzd); +if (IS_ERR (psy->tzd)) +return PTR_ERR (psy->tzd); + ret =thermal_zone_device_enable (psy->tzd); +if (ret) +thermal_zone_device_unregister (psy->tzd); +return ret; } }return 0 ;
drivers/thermal/armada_thermal.c +6 -0
@@ -874,6 +874,12 @@ static int armada_thermal_probe(struct platform_device *pdev)return PTR_ERR (tz); } + ret =thermal_zone_device_enable (tz); +if (ret) { +thermal_zone_device_unregister (tz); +return ret; + } + drvdata->type =LEGACY ; drvdata->data.tz = tz;platform_set_drvdata (pdev, drvdata);
drivers/thermal/dove_thermal.c +6 -0
@@ -153,6 +153,12 @@ static int dove_thermal_probe(struct platform_device *pdev)return PTR_ERR (thermal); } + ret =thermal_zone_device_enable (thermal); +if (ret) { +thermal_zone_device_unregister (thermal); +return ret; + } +platform_set_drvdata (pdev, thermal);return 0 ;
drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +5 -0
@@ -259,9 +259,14 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev, ret =PTR_ERR (int34x_thermal_zone->zone); goto err_thermal_zone; } + ret =thermal_zone_device_enable (int34x_thermal_zone->zone); +if (ret) + goto err_enable;return int34x_thermal_zone; +err_enable: +thermal_zone_device_unregister (int34x_thermal_zone->zone); err_thermal_zone:acpi_lpat_free_conversion_table (int34x_thermal_zone->lpat_table);kfree (int34x_thermal_zone->aux_trips);
drivers/thermal/intel/intel_pch_thermal.c +5 -0
@@ -352,9 +352,14 @@ static int intel_pch_thermal_probe(struct pci_dev *pdev, err =PTR_ERR (ptd->tzd); goto error_cleanup; } + err =thermal_zone_device_enable (ptd->tzd); +if (err) + goto err_unregister;return 0 ; +err_unregister: +thermal_zone_device_unregister (ptd->tzd); error_cleanup:iounmap (ptd->hw_base); error_release:
drivers/thermal/intel/intel_soc_dts_iosf.c +3 -0
@@ -329,6 +329,9 @@ static int add_dts_thermal_zone(int id, struct intel_soc_dts_sensor_entry *dts, ret =PTR_ERR (dts->tzone); goto err_ret; } + ret =thermal_zone_device_enable (dts->tzone); +if (ret) + goto err_enable; ret =soc_dts_enable (id);if (ret)
drivers/thermal/intel/x86_pkg_temp_thermal.c +6 -0
@@ -363,6 +363,12 @@ static int pkg_temp_thermal_device_add(unsigned int cpu)kfree (zonedev);return err; } + err =thermal_zone_device_enable (zonedev->tzone); +if (err) { +thermal_zone_device_unregister (zonedev->tzone); +kfree (zonedev); +return err; + }/* Store MSR value for package thermal interrupt, to restore at exit */ rdmsr (MSR_IA32_PACKAGE_THERM_INTERRUPT , zonedev->msr_pkg_therm_low, zonedev->msr_pkg_therm_high);
drivers/thermal/kirkwood_thermal.c +7 -0
@@ -65,6 +65,7 @@ static int kirkwood_thermal_probe(struct platform_device *pdev)struct thermal_zone_device *thermal =NULL ;struct kirkwood_thermal_priv *priv;struct resource *res; +int ret; priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_KERNEL );if (!priv)
@@ -82,6 +83,12 @@ static int kirkwood_thermal_probe(struct platform_device *pdev) "Failed to register thermal zone device\n");return PTR_ERR (thermal); } + ret =thermal_zone_device_enable (thermal); +if (ret) { +thermal_zone_device_unregister (thermal); +dev_err (&pdev->dev,"Failed to enable thermal zone device\n" ); +return ret; + }platform_set_drvdata (pdev, thermal);
drivers/thermal/rcar_thermal.c +8 -1
@@ -550,12 +550,19 @@ static int rcar_thermal_probe(struct platform_device *pdev) priv->zone =devm_thermal_zone_of_sensor_register ( dev, i, priv, &rcar_thermal_zone_of_ops); - else + else { priv->zone =thermal_zone_device_register ("rcar_thermal" ,1 ,0 , priv, &rcar_thermal_zone_ops,NULL ,0 , idle); + + ret =thermal_zone_device_enable (priv->zone); +if (ret) { +thermal_zone_device_unregister (priv->zone); + priv->zone =ERR_PTR (ret); + } + }if (IS_ERR (priv->zone)) {dev_err (dev,"can't register thermal zone\n" ); ret =PTR_ERR (priv->zone);
drivers/thermal/spear_thermal.c +7 -0
@@ -131,6 +131,11 @@ static int spear_thermal_probe(struct platform_device *pdev) ret =PTR_ERR (spear_thermal); goto disable_clk; } + ret =thermal_zone_device_enable (spear_thermal); +if (ret) { +dev_err (&pdev->dev,"Cannot enable thermal zone\n" ); + goto unregister_tzd; + }platform_set_drvdata (pdev, spear_thermal);
@@ -139,6 +144,8 @@ static int spear_thermal_probe(struct platform_device *pdev)return 0 ; +unregister_tzd: +thermal_zone_device_unregister (spear_thermal); disable_clk:clk_disable (stdev->clk);
drivers/thermal/st/st_thermal.c +5 -0
@@ -246,11 +246,16 @@ int st_thermal_register(struct platform_device *pdev, ret =PTR_ERR (sensor->thermal_dev); goto sensor_off; } + ret =thermal_zone_device_enable (sensor->thermal_dev); +if (ret) + goto tzd_unregister;platform_set_drvdata (pdev, sensor);return 0 ; +tzd_unregister: +thermal_zone_device_unregister (sensor->thermal_dev); sensor_off:st_thermal_sensor_off (sensor);
Signature · 1 line
2.17.1
PATCH v5 9/11 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
@@ -301,13 +301,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_is_enabled (tz); +} +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 );
@@ -517,6 +526,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
PATCH v5 10/11 thermal: Simplify or eliminate unnecessary set_mode() methods
In reply to Andrzej PietrasiewiczSetting polling_delay is now done at thermal_core level (by not polling DISABLED devices), so no need to repeat this code.
int340x: Checking for an impossible enum value is unnecessary. acpi/thermal: It only prints debug messages.
--- drivers/acpi/thermal.c | 26 ---------------- .../ethernet/mellanox/mlxsw/core_thermal.c | 30 ------------------- drivers/platform/x86/acerhdf.c | 3 -- drivers/thermal/imx_thermal.c | 6 ---- .../intel/int340x_thermal/int3400_thermal.c | 4 --- drivers/thermal/thermal_of.c | 18 ----------- 6 files changed, 87 deletions(-)
drivers/acpi/thermal.c +0 -26
@@ -525,31 +525,6 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)return 0 ; } -static int thermal_set_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode mode) -{ -struct acpi_thermal *tz = thermal->devdata; - -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_DISABLED ) -pr_warn ("thermal zone will be disabled\n" ); - -ACPI_DEBUG_PRINT ((ACPI_DB_INFO , -"%s kernel ACPI thermal control\n" , - mode ==THERMAL_DEVICE_ENABLED ? -"Enable" :"Disable" )); - -return 0 ; -} -static int thermal_get_trip_type (struct thermal_zone_device *thermal,int trip,enum thermal_trip_type *type) {
@@ -836,7 +811,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, - .set_mode = thermal_set_mode, .get_trip_type = thermal_get_trip_type, .get_trip_temp = thermal_get_trip_temp, .get_crit_temp = thermal_get_crit_temp,
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +0 -30
@@ -275,19 +275,6 @@ static int mlxsw_thermal_unbind(struct thermal_zone_device *tzdev,return 0 ; } -static int mlxsw_thermal_set_mode (struct thermal_zone_device *tzdev, -enum thermal_device_mode mode) -{ -struct mlxsw_thermal *thermal = tzdev->devdata; - -if (mode ==THERMAL_DEVICE_ENABLED ) - tzdev->polling_delay = thermal->polling_delay; -else - tzdev->polling_delay =0 ; - -return 0 ; -} -static int mlxsw_thermal_get_temp (struct thermal_zone_device *tzdev,int *p_temp) {
@@ -387,7 +374,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, - .set_mode = mlxsw_thermal_set_mode, .get_temp = mlxsw_thermal_get_temp, .get_trip_type = mlxsw_thermal_get_trip_type, .get_trip_temp = mlxsw_thermal_get_trip_temp,
@@ -445,20 +431,6 @@ static int mlxsw_thermal_module_unbind(struct thermal_zone_device *tzdev,return err; } -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; - -if (mode ==THERMAL_DEVICE_ENABLED ) - tzdev->polling_delay = thermal->polling_delay; -else - tzdev->polling_delay =0 ; - -return 0 ; -} -static int mlxsw_thermal_module_temp_get (struct thermal_zone_device *tzdev,int *p_temp) {
@@ -574,7 +546,6 @@ static int mlxsw_thermal_module_trend_get(struct thermal_zone_device *tzdev,static struct thermal_zone_device_ops mlxsw_thermal_module_ops = { .bind = mlxsw_thermal_module_bind, .unbind = mlxsw_thermal_module_unbind, - .set_mode = mlxsw_thermal_module_mode_set, .get_temp = mlxsw_thermal_module_temp_get, .get_trip_type = mlxsw_thermal_module_trip_type_get, .get_trip_temp = mlxsw_thermal_module_trip_temp_get,
@@ -612,7 +583,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, - .set_mode = mlxsw_thermal_module_mode_set, .get_temp = mlxsw_thermal_gearbox_temp_get, .get_trip_type = mlxsw_thermal_module_trip_type_get, .get_trip_temp = mlxsw_thermal_module_trip_temp_get,
drivers/platform/x86/acerhdf.c +0 -3
@@ -397,8 +397,6 @@ static inline void acerhdf_revert_to_bios_mode(void) {acerhdf_change_fanstate (ACERHDF_FAN_AUTO ); kernelmode =0 ; -if (thz_dev) - thz_dev->polling_delay =0 ;pr_notice ("kernel mode fan control OFF\n" ); }
@@ -406,7 +404,6 @@ static inline void acerhdf_enable_kernelmode(void) { kernelmode =1 ; - thz_dev->polling_delay = interval*1000 ;pr_notice ("kernel mode fan control ON\n" ); }
drivers/thermal/imx_thermal.c +0 -6
@@ -338,9 +338,6 @@ static int imx_set_mode(struct thermal_zone_device *tz,const struct thermal_soc_data *soc_data = data->socdata;if (mode ==THERMAL_DEVICE_ENABLED ) { - tz->polling_delay =IMX_POLLING_DELAY ; - tz->passive_delay =IMX_PASSIVE_DELAY ; -regmap_write (map, soc_data->sensor_ctrl +REG_CLR , soc_data->power_down_mask); regmap_write(map, soc_data->sensor_ctrl + REG_SET,
@@ -356,9 +353,6 @@ static int imx_set_mode(struct thermal_zone_device *tz,regmap_write (map, soc_data->sensor_ctrl +REG_SET , soc_data->power_down_mask); - tz->polling_delay =0 ; - tz->passive_delay =0 ; -if (data->irq_enabled) {disable_irq (data->irq); data->irq_enabled = false;
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +0 -4
@@ -386,10 +386,6 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal,if (!priv)return -EINVAL ; -if (mode !=THERMAL_DEVICE_ENABLED && - mode !=THERMAL_DEVICE_DISABLED ) -return -EINVAL ; -if (mode != thermal->mode) result = int3400_thermal_run_osc(priv->adev->handle, priv->current_uuid_index,
drivers/thermal/thermal_of.c +0 -18
@@ -267,22 +267,6 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,return 0 ; } -static int of_thermal_set_mode (struct thermal_zone_device *tz, -enum thermal_device_mode mode) -{ -struct __thermal_zone *data = tz->devdata; - -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 ; - } - -return 0 ; -} -static int of_thermal_get_trip_type (struct thermal_zone_device *tz,int trip,enum thermal_trip_type *type) {
@@ -374,8 +358,6 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz, }static struct thermal_zone_device_ops of_thermal_ops = { - .set_mode = of_thermal_set_mode, - .get_trip_type = of_thermal_get_trip_type, .get_trip_temp = of_thermal_get_trip_temp, .set_trip_temp = of_thermal_set_trip_temp,
Signature · 1 line
2.17.1
PATCH v5 11/11 thermal: Rename set_mode() to change_mode()
In reply to Andrzej Pietrasiewiczset_mode() is 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 change.
To better reflect the purpose of the method rename it to change_mode()
--- drivers/platform/x86/acerhdf.c | 6 +++--- drivers/thermal/imx_thermal.c | 8 ++++---- drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 6 +++--- drivers/thermal/intel/intel_quark_dts_thermal.c | 6 +++--- drivers/thermal/thermal_core.c | 4 ++-- include/linux/thermal.h | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-)
drivers/platform/x86/acerhdf.c +3 -3
@@ -413,8 +413,8 @@ static inline void acerhdf_enable_kernelmode(void)* the temperature and the fan. * disabled: the BIOS takes control of the fan. */ -static int acerhdf_set_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode mode) +static int acerhdf_change_mode (struct thermal_zone_device *thermal, +enum thermal_device_mode mode) {if (mode ==THERMAL_DEVICE_DISABLED && kernelmode)acerhdf_revert_to_bios_mode ();
@@ -473,7 +473,7 @@ static struct thermal_zone_device_ops acerhdf_dev_ops = { .bind = acerhdf_bind, .unbind = acerhdf_unbind, .get_temp = acerhdf_get_ec_temp, - .set_mode = acerhdf_set_mode, + .change_mode = acerhdf_change_mode, .get_trip_type = acerhdf_get_trip_type, .get_trip_hyst = acerhdf_get_trip_hyst, .get_trip_temp = acerhdf_get_trip_temp,
drivers/thermal/imx_thermal.c +4 -4
@@ -330,8 +330,8 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)return 0 ; } -static int imx_set_mode (struct thermal_zone_device *tz, -enum thermal_device_mode mode) +static int imx_change_mode (struct thermal_zone_device *tz, +enum thermal_device_mode mode) {struct imx_thermal_data *data = tz->devdata;struct regmap *map = data->tempmon;
@@ -447,7 +447,7 @@ static struct thermal_zone_device_ops imx_tz_ops = { .bind = imx_bind, .unbind = imx_unbind, .get_temp = imx_get_temp, - .set_mode = imx_set_mode, + .change_mode = imx_change_mode, .get_trip_type = imx_get_trip_type, .get_trip_temp = imx_get_trip_temp, .get_crit_temp = imx_get_crit_temp,
@@ -860,7 +860,7 @@ static int __maybe_unused imx_thermal_suspend(struct device *dev)* 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. This is done in set_mode() operation called from +* down. This is done in change_mode() operation called from * thermal_zone_device_disable() */ ret =thermal_zone_device_disable (data->tz);
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +3 -3
@@ -377,8 +377,8 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal,return 0 ; } -static int int3400_thermal_set_mode (struct thermal_zone_device *thermal, -enum thermal_device_mode mode) +static int int3400_thermal_change_mode (struct thermal_zone_device *thermal, +enum thermal_device_mode mode) {struct int3400_thermal_priv *priv = thermal->devdata;int result =0 ;
@@ -399,7 +399,7 @@ 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, - .set_mode = int3400_thermal_set_mode, + .change_mode = int3400_thermal_change_mode, };static struct thermal_zone_params int3400_thermal_params = {
drivers/thermal/intel/intel_quark_dts_thermal.c +3 -3
@@ -298,8 +298,8 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,return 0 ; } -static int sys_set_mode (struct thermal_zone_device *tzd, -enum thermal_device_mode mode) +static int sys_change_mode (struct thermal_zone_device *tzd, +enum thermal_device_mode mode) {int ret;
@@ -319,7 +319,7 @@ 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, - .set_mode = sys_set_mode, + .change_mode = sys_change_mode, };static void free_soc_dts (struct soc_sensor_entry *aux_entry)
drivers/thermal/thermal_core.c +2 -2
@@ -482,8 +482,8 @@ int thermal_zone_device_set_mode(struct thermal_zone_device *tz,return ret; } -if (tz->ops->set_mode) - ret = tz->ops->set_mode (tz, mode); +if (tz->ops->change_mode) + ret = tz->ops->change_mode (tz, mode);if (!ret) tz->mode = mode;
include/linux/thermal.h +1 -1
@@ -76,7 +76,7 @@ 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 (*set_mode) (struct thermal_zone_device *, +int (*change_mode) (struct thermal_zone_device *,enum thermal_device_mode );int (*get_trip_type) (struct thermal_zone_device *,int ,enum thermal_trip_type *);
Signature · 1 line
2.17.1