thermal/core: Remove the 'forced_passive' option
Subsystems (4)
PATCH 1/6 thermal/core: Remove the 'forced_passive' option
The code was reorganized in 2012 with the commit 0c01ebbfd3caf1.
The main change is a loop on the trip points array and a unconditional call to the throttle() ops of the governors for each of them even if the trip temperature is not reached yet.
With this change, the 'forced_passive' is no longer checked in the thermal_zone_device_update() function but in the step wise governor's throttle() callback.
As the force_passive does no belong to the trip point array, the thermal_zone_device_update() can not compare with the specified passive temperature, thus does not detect the passive limit has been crossed. Consequently, throttle() is never called and the 'forced_passive' branch is unreached.
In addition, the default processor cooling device is not automatically bound to the thermal zone if there is not passive trip point, thus the 'forced_passive' can not operate.
If there is an active trip point, then the throttle function will be called to mitigate at this temperature and the 'forced_passive' will override the mitigation of the active trip point in this case but with the default cooling device bound to the thermal zone, so usually a fan, and that is not a passive cooling effect.
Given the regression exists since more than 8 years, nobody complained and at the best of my knowledge there is no bug open in
https://bugzilla.kernel.org, it is reasonable to say it is unused.
Remove the 'forced_passive' related code.
--- .../driver-api/thermal/sysfs-api.rst | 13 --- drivers/thermal/gov_step_wise.c | 14 +--- drivers/thermal/thermal_sysfs.c | 80 ------------------- include/linux/thermal.h | 4 - 4 files changed, 3 insertions(+), 108 deletions(-)
Documentation/driver-api/thermal/sysfs-api.rst +0 -13
@@ -520,19 +520,6 @@ available_policies RW, Optional -passive - Attribute is only present for zones in which the passive cooling - policy is not supported by native thermal driver. Default is zero - and can be set to a temperature (in millidegrees) to enable a - passive trip point for the zone. Activation is done by polling with - an interval of 1 second. - - Unit: millidegrees Celsius - - Valid values: 0 (disabled) or greater than 1000 - - RW, Optional - emul_temp Interface to set the emulated temperature method in thermal zone (sensor). After setting this temperature, the thermal zone may pass
drivers/thermal/gov_step_wise.c +3 -11
@@ -109,7 +109,7 @@ static void update_passive_instance(struct thermal_zone_device *tz,* If value is +1, activate a passive instance. * If value is -1, deactivate a passive instance. */ -if (type ==THERMAL_TRIP_PASSIVE || type ==THERMAL_TRIPS_NONE ) +if (type ==THERMAL_TRIP_PASSIVE ) tz->passive += value; }
@@ -122,13 +122,8 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip)bool throttle = false;int old_target; -if (trip ==THERMAL_TRIPS_NONE ) { - trip_temp = tz->forced_passive; - trip_type =THERMAL_TRIPS_NONE ; - }else { - tz->ops->get_trip_temp (tz, trip, &trip_temp); - tz->ops->get_trip_type (tz, trip, &trip_type); - } + tz->ops->get_trip_temp (tz, trip, &trip_temp); + tz->ops->get_trip_type (tz, trip, &trip_type); trend =get_tz_trend (tz, trip);
@@ -189,9 +184,6 @@ static int step_wise_throttle(struct thermal_zone_device *tz, int trip)thermal_zone_trip_update (tz, trip); -if (tz->forced_passive) -thermal_zone_trip_update (tz,THERMAL_TRIPS_NONE ); -mutex_lock (&tz->lock);list_for_each_entry (instance, &tz->thermal_instances, tz_node)
drivers/thermal/thermal_sysfs.c +0 -80
101 lines not on this page · raw message
include/linux/thermal.h +0 -4
@@ -131,9 +131,6 @@ struct thermal_cooling_device { trip point. * @prev_high_trip: the above current temperature if you've crossed a passive trip point. - * @forced_passive: If > 0, temperature at which to switch on all ACPI - * processor cooling devices. Currently only used by the - * step-wise governor. * @need_update: if equals 1, thermal_zone_device_update needs to be invoked. * @ops: operations this &thermal_zone_device supports * @tzp: thermal zone parameters
@@ -167,7 +164,6 @@ struct thermal_zone_device {int passive;int prev_low_trip;int prev_high_trip; -unsigned int forced_passive;atomic_t need_update;struct thermal_zone_device_ops *ops;struct thermal_zone_params *tzp;
Signature · 1 line
2.25.1
PATCH 2/6 thermal/core: Remove unused functions rebind/unbind exception
The functions thermal_zone_device_rebind_exception and thermal_zone_device_unbind_exception are not used from anywhere.
Remove that code.
--- drivers/thermal/thermal_core.c | 37 ---------------------------------- drivers/thermal/thermal_core.h | 4 ---- 2 files changed, 41 deletions(-)
drivers/thermal/thermal_core.c +0 -37
@@ -598,26 +598,6 @@ static void thermal_zone_device_check(struct work_struct *work)thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); } -void thermal_zone_device_rebind_exception (struct thermal_zone_device *tz, -const char *cdev_type,size_t size) -{ -struct thermal_cooling_device *cdev =NULL ; - -mutex_lock (&thermal_list_lock); -list_for_each_entry (cdev, &thermal_cdev_list, node) { -/* skip non matching cdevs */ -if (strncmp (cdev_type, cdev->type, size)) -continue ; - -/* re binding the exception matching the type pattern */ -thermal_zone_bind_cooling_device (tz,THERMAL_TRIPS_NONE , cdev, -THERMAL_NO_LIMIT , -THERMAL_NO_LIMIT , -THERMAL_WEIGHT_DEFAULT ); - } -mutex_unlock (&thermal_list_lock); -} -int for_each_thermal_governor (int (*cb)(struct thermal_governor *,void *),void *data) {
@@ -685,23 +665,6 @@ struct thermal_zone_device *thermal_zone_get_by_id(int id)return match; } -void thermal_zone_device_unbind_exception (struct thermal_zone_device *tz, -const char *cdev_type,size_t size) -{ -struct thermal_cooling_device *cdev =NULL ; - -mutex_lock (&thermal_list_lock); -list_for_each_entry (cdev, &thermal_cdev_list, node) { -/* skip non matching cdevs */ -if (strncmp (cdev_type, cdev->type, size)) -continue ; -/* unbinding the exception matching the type pattern */ -thermal_zone_unbind_cooling_device (tz,THERMAL_TRIPS_NONE , - cdev); - } -mutex_unlock (&thermal_list_lock); -} -/* * Device management section: cooling devices, zones devices, and binding *
drivers/thermal/thermal_core.h +0 -4
@@ -118,10 +118,6 @@ struct thermal_instance {int thermal_register_governor (struct thermal_governor *);void thermal_unregister_governor (struct thermal_governor *); -void thermal_zone_device_rebind_exception (struct thermal_zone_device *, -const char *,size_t ); -void thermal_zone_device_unbind_exception (struct thermal_zone_device *, -const char *,size_t );int thermal_zone_device_set_policy (struct thermal_zone_device *,char *);int thermal_build_list_of_policies (char *buf);
Signature · 1 line
2.25.1
Re: [PATCH 2/6] thermal/core: Remove unused functions rebind/unbind exception
Quoted 6 lines · Daniel Lezcano
The functions
thermal_zone_device_rebind_exceptionandthermal_zone_device_unbind_exceptionare not used from anywhere.Remove that code.
Signed-off-by Daniel Lezcano <[email protected]>
Quoted 76 lines
--- drivers/thermal/thermal_core.c | 37 ---------------------------------- drivers/thermal/thermal_core.h | 4 ---- 2 files changed, 41 deletions(-)drivers/thermal/thermal_core.c +0
-37@@ -598,26 +598,6 @@ static void thermal_zone_device_check(struct work_struct *work)thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); } -void thermal_zone_device_rebind_exception (struct thermal_zone_device *tz, -const char *cdev_type,size_t size) -{ -struct thermal_cooling_device *cdev =NULL ; - -mutex_lock (&thermal_list_lock); -list_for_each_entry (cdev, &thermal_cdev_list, node) { -/* skip non matching cdevs */ -if (strncmp (cdev_type, cdev->type, size)) -continue ; - -/* re binding the exception matching the type pattern */ -thermal_zone_bind_cooling_device (tz,THERMAL_TRIPS_NONE , cdev, -THERMAL_NO_LIMIT , -THERMAL_NO_LIMIT , -THERMAL_WEIGHT_DEFAULT ); - } -mutex_unlock (&thermal_list_lock); -} -int for_each_thermal_governor (int (*cb)(struct thermal_governor *,void *),void *data) {@@ -685,23 +665,6 @@ struct thermal_zone_device *thermal_zone_get_by_id(int id)return match; } -void thermal_zone_device_unbind_exception (struct thermal_zone_device *tz, -const char *cdev_type,size_t size) -{ -struct thermal_cooling_device *cdev =NULL ; - -mutex_lock (&thermal_list_lock); -list_for_each_entry (cdev, &thermal_cdev_list, node) { -/* skip non matching cdevs */ -if (strncmp (cdev_type, cdev->type, size)) -continue ; -/* unbinding the exception matching the type pattern */ -thermal_zone_unbind_cooling_device (tz,THERMAL_TRIPS_NONE , - cdev); - } -mutex_unlock (&thermal_list_lock); -} -/* * Device management section: cooling devices, zones devices, and binding * drivers/thermal/thermal_core.h +0
-4@@ -118,10 +118,6 @@ struct thermal_instance {int thermal_register_governor (struct thermal_governor *);void thermal_unregister_governor (struct thermal_governor *); -void thermal_zone_device_rebind_exception (struct thermal_zone_device *, -const char *,size_t ); -void thermal_zone_device_unbind_exception (struct thermal_zone_device *, -const char *,size_t );int thermal_zone_device_set_policy (struct thermal_zone_device *,char *);int thermal_build_list_of_policies (char *buf);
Signature · 2 lines
Warm Regards Thara
[thermal: thermal/next] thermal/core: Remove unused functions rebind/unbind exception
In reply to Daniel LezcanoThe following commit has been merged into the thermal/next branch of thermal:
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: a20b995b23e41190fb088e7dab4a2b956bf343ae Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//a20b995b23e41190fb088e7dab4a2b956bf343ae Author: Daniel Lezcano <[email protected]> AuthorDate: Tue, 15 Dec 2020 00:38:05 +01:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Tue, 19 Jan 2021 22:23:04 +01:00
thermal/core: Remove unused functions rebind/unbind exception
The functions thermal_zone_device_rebind_exception and thermal_zone_device_unbind_exception are not used from anywhere.
Remove that code.
--- drivers/thermal/thermal_core.c | 37 +--------------------------------- drivers/thermal/thermal_core.h | 4 +---- 2 files changed, 41 deletions(-)
drivers/thermal/thermal_core.c +0 -37
@@ -598,26 +598,6 @@ static void thermal_zone_device_check(struct work_struct *work)thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); } -void thermal_zone_device_rebind_exception (struct thermal_zone_device *tz, -const char *cdev_type,size_t size) -{ -struct thermal_cooling_device *cdev =NULL ; - -mutex_lock (&thermal_list_lock); -list_for_each_entry (cdev, &thermal_cdev_list, node) { -/* skip non matching cdevs */ -if (strncmp (cdev_type, cdev->type, size)) -continue ; - -/* re binding the exception matching the type pattern */ -thermal_zone_bind_cooling_device (tz,THERMAL_TRIPS_NONE , cdev, -THERMAL_NO_LIMIT , -THERMAL_NO_LIMIT , -THERMAL_WEIGHT_DEFAULT ); - } -mutex_unlock (&thermal_list_lock); -} -int for_each_thermal_governor (int (*cb)(struct thermal_governor *,void *),void *data) {
@@ -685,23 +665,6 @@ struct thermal_zone_device *thermal_zone_get_by_id(int id)return match; } -void thermal_zone_device_unbind_exception (struct thermal_zone_device *tz, -const char *cdev_type,size_t size) -{ -struct thermal_cooling_device *cdev =NULL ; - -mutex_lock (&thermal_list_lock); -list_for_each_entry (cdev, &thermal_cdev_list, node) { -/* skip non matching cdevs */ -if (strncmp (cdev_type, cdev->type, size)) -continue ; -/* unbinding the exception matching the type pattern */ -thermal_zone_unbind_cooling_device (tz,THERMAL_TRIPS_NONE , - cdev); - } -mutex_unlock (&thermal_list_lock); -} -/* * Device management section: cooling devices, zones devices, and binding *
drivers/thermal/thermal_core.h +0 -4
@@ -118,10 +118,6 @@ struct thermal_instance {int thermal_register_governor (struct thermal_governor *);void thermal_unregister_governor (struct thermal_governor *); -void thermal_zone_device_rebind_exception (struct thermal_zone_device *, -const char *,size_t ); -void thermal_zone_device_unbind_exception (struct thermal_zone_device *, -const char *,size_t );int thermal_zone_device_set_policy (struct thermal_zone_device *,char *);int thermal_build_list_of_policies (char *buf);
PATCH 3/6 thermal/core: Remove pointless test with the THERMAL_TRIPS_NONE macro
In reply to Daniel LezcanoThe THERMAL_TRIPS_NONE is equal to -1, it is pointless to do a conversion in this function.
--- drivers/thermal/thermal_sysfs.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/thermal/thermal_sysfs.c +1 -4
@@ -875,10 +875,7 @@ trip_point_show(struct device *dev, struct device_attribute *attr, char *buf) instance = container_of(attr, struct thermal_instance, attr); -if (instance->trip ==THERMAL_TRIPS_NONE ) -return sprintf (buf,"-1\n" ); -else -return sprintf (buf,"%d\n" , instance->trip); +return sprintf (buf,"%d\n" , instance->trip); }ssize_t
Signature · 1 line
2.25.1
Re: [PATCH 3/6] thermal/core: Remove pointless test with the THERMAL_TRIPS_NONE macro
Quoted 2 lines · Daniel Lezcano
The
THERMAL_TRIPS_NONEis equal to -1, it is pointless to do a conversion in this function.
It is pointless because you have removed force_passive and will be removing THERMAL_TRIPS_NONE in the following patches. Maybe that should be mentioned in the commit message. Otherwise,
Quoted 23 lines
Signed-off-by Daniel Lezcano <[email protected]>--- drivers/thermal/thermal_sysfs.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)drivers/thermal/thermal_sysfs.c +1
-4@@ -875,10 +875,7 @@ trip_point_show(struct device *dev, struct device_attribute *attr, char *buf) instance = container_of(attr, struct thermal_instance, attr); -if (instance->trip ==THERMAL_TRIPS_NONE ) -return sprintf (buf,"-1\n" ); -else -return sprintf (buf,"%d\n" , instance->trip); +return sprintf (buf,"%d\n" , instance->trip); }ssize_t
Signature · 2 lines
Warm Regards Thara
[thermal: thermal/next] thermal/core: Remove pointless test with the THERMAL_TRIPS_NONE macro
In reply to Daniel LezcanoThe following commit has been merged into the thermal/next branch of thermal:
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: 53f04ca8153cc043cd2fa968ed451a85e8f70bd8 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//53f04ca8153cc043cd2fa968ed451a85e8f70bd8 Author: Daniel Lezcano <[email protected]> AuthorDate: Tue, 15 Dec 2020 00:38:06 +01:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Tue, 19 Jan 2021 22:23:11 +01:00
thermal/core: Remove pointless test with the THERMAL_TRIPS_NONE macro
The THERMAL_TRIPS_NONE is equal to -1, it is pointless to do a conversion in this function.
--- drivers/thermal/thermal_sysfs.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/thermal/thermal_sysfs.c +1 -4
@@ -875,10 +875,7 @@ trip_point_show(struct device *dev, struct device_attribute *attr, char *buf) instance = container_of(attr, struct thermal_instance, attr); -if (instance->trip ==THERMAL_TRIPS_NONE ) -return sprintf (buf,"-1\n" ); -else -return sprintf (buf,"%d\n" , instance->trip); +return sprintf (buf,"%d\n" , instance->trip); }ssize_t
PATCH 4/6 acpi/drivers/thermal: Remove TRIPS_NONE cooling device binding
In reply to Daniel LezcanoThe loop is here to create default cooling device binding on the THERMAL_TRIPS_NONE number which is used to be the 'forced_passive' feature. However, we removed all code dealing with that in the thermal core, thus this binding does no longer make sense.
Remove it.
--- drivers/acpi/thermal.c | 19 ------------------- 1 file changed, 19 deletions(-)
drivers/acpi/thermal.c +0 -19
@@ -764,25 +764,6 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal, } } -for (i =0 ; i < tz->devices.count; i++) { - handle = tz->devices.handles[i]; - status =acpi_bus_get_device (handle, &dev); -if (ACPI_SUCCESS (status) && (dev == device)) { -if (bind) - result =thermal_zone_bind_cooling_device - (thermal,THERMAL_TRIPS_NONE , - cdev,THERMAL_NO_LIMIT , -THERMAL_NO_LIMIT , -THERMAL_WEIGHT_DEFAULT ); -else - result =thermal_zone_unbind_cooling_device - (thermal,THERMAL_TRIPS_NONE , - cdev); -if (result) - goto failed; - } - } - failed:return result; }
Signature · 1 line
2.25.1
Re: [PATCH 4/6] acpi/drivers/thermal: Remove TRIPS_NONE cooling device binding
Hi Rui,
Quoted 8 lines · Daniel Lezcano
The loop is here to create default cooling device binding on the
THERMAL_TRIPS_NONEnumber which is used to be the 'forced_passive' feature. However, we removed all code dealing with that in the thermal core, thus this binding does no longer make sense.Remove it.
Signed-off-by Daniel Lezcano <[email protected]>
Are you fine with this change?
Thanks
-- Daniel
Quoted 35 lines
--- drivers/acpi/thermal.c | 19 ------------------- 1 file changed, 19 deletions(-)drivers/acpi/thermal.c +0
-19@@ -764,25 +764,6 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal, } } -for (i =0 ; i < tz->devices.count; i++) { - handle = tz->devices.handles[i]; - status =acpi_bus_get_device (handle, &dev); -if (ACPI_SUCCESS (status) && (dev == device)) { -if (bind) - result =thermal_zone_bind_cooling_device - (thermal,THERMAL_TRIPS_NONE , - cdev,THERMAL_NO_LIMIT , -THERMAL_NO_LIMIT , -THERMAL_WEIGHT_DEFAULT ); -else - result =thermal_zone_unbind_cooling_device - (thermal,THERMAL_TRIPS_NONE , - cdev); -if (result) - goto failed; - } - } - failed:return result; }
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
RE: [PATCH 4/6] acpi/drivers/thermal: Remove TRIPS_NONE cooling device binding
ACPI thermal driver binds the devices listed in _TZD method with THERMAL_TRIPS_NONE.
Now given that
1. THERMAL_TRIPS_NONE is removed from thermal framework
2. _TZP is rarely supported. I searched ~500 acpidumps from different platforms reported by end users in kernel Bugzilla, there is only one platform with _TZP implemented, and it was almost 10 years ago.
So, I think it is safe to remove this piece of code.
Quoted 12 lines
-----Original Message-----
From: Daniel Lezcano <[email protected]>
Sent: Tuesday, January 05, 2021 11:44 PM
To: Zhang, Rui <[email protected]>
Cc: [email protected]; [email protected]; linux- [email protected]; [email protected]; [email protected]; Rafael J. Wysocki <[email protected]>; Len Brown <[email protected]>; open list:ACPI THERMAL DRIVER <[email protected]>
Subject: Re: [PATCH 4/6] acpi/drivers/thermal: RemoveTRIPS_NONEcooling device binding
Importance: High
Quoted 12 lines
Hi Rui,
Quoted 8 lines · Daniel Lezcano
The loop is here to create default cooling device binding on the
THERMAL_TRIPS_NONEnumber which is used to be the 'forced_passive' feature. However, we removed all code dealing with that in the thermal core, thus this binding does no longer make sense.Remove it.
Signed-off-by Daniel Lezcano <[email protected]>
Thanks,
rui
Quoted 55 lines
Are you fine with this change?
Thanks
-- Daniel
drivers/acpi/thermal.c static int acpi_thermal_cooling_device_cb(struct
Quoted 9 lines
--- drivers/acpi/thermal.c | 19 ------------------- 1 file changed, 19 deletions(-)drivers/acpi/thermal.c index renamed from drivers/acpi/thermal.c +0
-0
b5e4bc9e3282..26a89ff80a0e100644drivers/acpi/thermal.c +0
-0@@ -764,25 +764,6 @@ static int acpi_thermal_cooling_device_cb(struct
thermal_zone_device*thermal,drivers/acpi/thermal.c static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal,
Quoted 10 lines
drivers/acpi/thermal.c +0
-7} } -for (i =0 ; i < tz->devices.count; i++) { - handle = tz->devices.handles[i]; - status =acpi_bus_get_device (handle, &dev); -if (ACPI_SUCCESS (status) && (dev == device)) { -if (bind) - result = thermal_zone_bind_cooling_device - (thermal,
THERMAL_TRIPS_NONE,drivers/acpi/thermal.c static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal, · line 785
Quoted 3 lines
drivers/acpi/thermal.c +0
-3- cdev,THERMAL_NO_LIMIT , - THERMAL_NO_LIMIT, -
THERMAL_WEIGHT_DEFAULT);drivers/acpi/thermal.c static int acpi_thermal_cooling_device_cb(struct · line 778
Quoted 2 lines
drivers/acpi/thermal.c +0
-2-else - result =
thermal_zone_unbind_cooling_devicedrivers/acpi/thermal.c static int acpi_thermal_cooling_device_cb(struct · line 779
Quoted 1 line
drivers/acpi/thermal.c +0
-1- (thermal,
THERMAL_TRIPS_NONE,drivers/acpi/thermal.c static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal, · line 769
Quoted 10 lines
drivers/acpi/thermal.c +0
-6- cdev); -if (result) - goto failed; - } - } - failed:return result; }--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCsFollow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-
blog/> Blog
Re: [PATCH 4/6] acpi/drivers/thermal: Remove TRIPS_NONE cooling device binding
Quoted 6 lines · Rui
ACPI thermal driver binds the devices listed in
_TZDmethod withTHERMAL_TRIPS_NONE.
Now given that
1.THERMAL_TRIPS_NONEis removed from thermal framework
2._TZPis rarely supported. I searched ~500 acpidumps from different platforms reported by end users in kernel Bugzilla, there is only one platform with_TZPimplemented, and it was almost 10 years ago.So, I think it is safe to remove this piece of code.
Thanks Rui for digging into
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
[thermal: thermal/next] acpi/drivers/thermal: Remove TRIPS_NONE cooling device binding
In reply to Daniel LezcanoThe following commit has been merged into the thermal/next branch of thermal:
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: 43bb4a9d658398151ad1b77340003ff81f4b8650 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//43bb4a9d658398151ad1b77340003ff81f4b8650 Author: Daniel Lezcano <[email protected]> AuthorDate: Tue, 15 Dec 2020 00:38:07 +01:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Tue, 19 Jan 2021 22:23:18 +01:00
acpi/drivers/thermal: Remove TRIPS_NONE cooling device binding
The loop is here to create default cooling device binding on the THERMAL_TRIPS_NONE number which is used to be the 'forced_passive' feature. However, we removed all code dealing with that in the thermal core, thus this binding does no longer make sense.
Remove it.
--- drivers/acpi/thermal.c | 19 ------------------- 1 file changed, 19 deletions(-)
drivers/acpi/thermal.c +0 -19
@@ -764,25 +764,6 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal, } } -for (i =0 ; i < tz->devices.count; i++) { - handle = tz->devices.handles[i]; - status =acpi_bus_get_device (handle, &dev); -if (ACPI_SUCCESS (status) && (dev == device)) { -if (bind) - result =thermal_zone_bind_cooling_device - (thermal,THERMAL_TRIPS_NONE , - cdev,THERMAL_NO_LIMIT , -THERMAL_NO_LIMIT , -THERMAL_WEIGHT_DEFAULT ); -else - result =thermal_zone_unbind_cooling_device - (thermal,THERMAL_TRIPS_NONE , - cdev); -if (result) - goto failed; - } - } - failed:return result; }
PATCH 5/6 thermal/core: Remove THERMAL_TRIPS_NONE test
In reply to Daniel LezcanoThe last site calling the thermal_zone_bind_cooling_device() function with the THERMAL_TRIPS_NONE parameter was removed.
We can get rid of this test as no user of this function is calling this function with this parameter.
--- drivers/thermal/thermal_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/thermal_core.c +1 -1
@@ -710,7 +710,7 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,unsigned long max_state;int result, ret; -if (trip >= tz->trips || (trip <0 && trip !=THERMAL_TRIPS_NONE )) +if (trip >= tz->trips || trip <0 )return -EINVAL ;list_for_each_entry (pos1, &thermal_tz_list, node) {
Signature · 1 line
2.25.1
Re: [PATCH 5/6] thermal/core: Remove THERMAL_TRIPS_NONE test
Quoted 8 lines · Daniel Lezcano
The last site calling the
thermal_zone_bind_cooling_device()function with theTHERMAL_TRIPS_NONEparameter was removed.We can get rid of this test as no user of this function is calling this function with this parameter.
Signed-off-by Daniel Lezcano <[email protected]>---
Quoted 17 lines
drivers/thermal/thermal_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/thermal/thermal_core.c +1
-1@@ -710,7 +710,7 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,unsigned long max_state;int result, ret; -if (trip >= tz->trips || (trip <0 && trip !=THERMAL_TRIPS_NONE )) +if (trip >= tz->trips || trip <0 )return -EINVAL ;list_for_each_entry (pos1, &thermal_tz_list, node) {
Signature · 2 lines
Warm Regards Thara
[thermal: thermal/next] thermal/core: Remove THERMAL_TRIPS_NONE test
In reply to Daniel LezcanoThe following commit has been merged into the thermal/next branch of thermal:
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: 716072d065b62f5a63d81bee978fd234dc47a83b Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//716072d065b62f5a63d81bee978fd234dc47a83b Author: Daniel Lezcano <[email protected]> AuthorDate: Tue, 15 Dec 2020 00:38:08 +01:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Tue, 19 Jan 2021 22:23:25 +01:00
thermal/core: Remove THERMAL_TRIPS_NONE test
The last site calling the thermal_zone_bind_cooling_device() function with the THERMAL_TRIPS_NONE parameter was removed.
We can get rid of this test as no user of this function is calling this function with this parameter.
--- drivers/thermal/thermal_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/thermal_core.c +1 -1
@@ -710,7 +710,7 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,unsigned long max_state;int result, ret; -if (trip >= tz->trips || (trip <0 && trip !=THERMAL_TRIPS_NONE )) +if (trip >= tz->trips || trip <0 )return -EINVAL ;list_for_each_entry (pos1, &thermal_tz_list, node) {
PATCH 6/6 thermal/core: Remove unused macro THERMAL_TRIPS_NONE
In reply to Daniel LezcanoThe macro THERMAL_TRIPS_NONE is no longer used, remove it.
--- include/linux/thermal.h | 1 - 1 file changed, 1 deletion(-)
include/linux/thermal.h +0 -1
@@ -17,7 +17,6 @@#include <linux/workqueue.h> #include <uapi/linux/thermal.h> -#define THERMAL_TRIPS_NONE -1#define THERMAL_MAX_TRIPS 12/* invalid cooling state */
Signature · 1 line
2.25.1
Re: [PATCH 6/6] thermal/core: Remove unused macro THERMAL_TRIPS_NONE
Quoted 4 lines · Daniel Lezcano
The macro
THERMAL_TRIPS_NONEis no longer used, remove it.Signed-off-by Daniel Lezcano <[email protected]>---
Quoted 16 lines
include/linux/thermal.h | 1 - 1 file changed, 1 deletion(-)include/linux/thermal.h +0
-1@@ -17,7 +17,6 @@#include <linux/workqueue.h> #include <uapi/linux/thermal.h> -#define THERMAL_TRIPS_NONE -1#define THERMAL_MAX_TRIPS 12/* invalid cooling state */
Signature · 2 lines
Warm Regards Thara
[thermal: thermal/next] thermal/core: Remove unused macro THERMAL_TRIPS_NONE
In reply to Daniel LezcanoThe following commit has been merged into the thermal/next branch of thermal:
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: 2121496fdc5f2d93eda9743c4b487469f0042e3c Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//2121496fdc5f2d93eda9743c4b487469f0042e3c Author: Daniel Lezcano <[email protected]> AuthorDate: Tue, 15 Dec 2020 00:38:09 +01:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Tue, 19 Jan 2021 22:23:32 +01:00
thermal/core: Remove unused macro THERMAL_TRIPS_NONE
The macro THERMAL_TRIPS_NONE is no longer used, remove it.
--- include/linux/thermal.h | 1 - 1 file changed, 1 deletion(-)
include/linux/thermal.h +0 -1
@@ -17,7 +17,6 @@#include <linux/workqueue.h> #include <uapi/linux/thermal.h> -#define THERMAL_TRIPS_NONE -1#define THERMAL_MAX_TRIPS 12/* invalid cooling state */
Quoted 26 lines · Daniel Lezcano
The code was reorganized in 2012 with the commit
0c01ebbfd3caf1.The main change is a loop on the trip points array and a unconditional call to the
throttle()ops of the governors for each of them even if the trip temperature is not reached yet.With this change, the '
forced_passive' is no longer checked in thethermal_zone_device_update()function but in the step wise governor'sthrottle()callback.As the
force_passivedoes no belong to the trip point array, thethermal_zone_device_update()can not compare with the specified passive temperature, thus does not detect the passive limit has been crossed. Consequently,throttle()is never called and the 'forced_passive' branch is unreached.In addition, the default processor cooling device is not automatically bound to the thermal zone if there is not passive trip point, thus the '
forced_passive' can not operate.If there is an active trip point, then the throttle function will be called to mitigate at this temperature and the '
forced_passive' will override the mitigation of the active trip point in this case but with the default cooling device bound to the thermal zone, so usually a fan, and that is not a passive cooling effect.
Quoted 7 lines
Given the regression exists since more than 8 years, nobody complained and at the best of my knowledge there is no bug open in
https://bugzilla.kernel.org, it is reasonable to say it is unused.Remove the '
forced_passive' related code.Signed-off-by Daniel Lezcano <[email protected]>
Is there any concern with this series ?
Quoted 201 lines
--- .../driver-api/thermal/sysfs-api.rst | 13 --- drivers/thermal/gov_step_wise.c | 14 +--- drivers/thermal/thermal_sysfs.c | 80 ------------------- include/linux/thermal.h | 4 - 4 files changed, 3 insertions(+), 108 deletions(-)Documentation/driver-api/thermal/sysfs-api.rst +0
-13@@ -520,19 +520,6 @@ available_policies RW, Optional -passive - Attribute is only present for zones in which the passive cooling - policy is not supported by native thermal driver. Default is zero - and can be set to a temperature (in millidegrees) to enable a - passive trip point for the zone. Activation is done by polling with - an interval of 1 second. - - Unit: millidegrees Celsius - - Valid values: 0 (disabled) or greater than 1000 - - RW, Optional - emul_temp Interface to set the emulated temperature method in thermal zone (sensor). After setting this temperature, the thermal zone may passdrivers/thermal/gov_step_wise.c +3
-11@@ -109,7 +109,7 @@ static void update_passive_instance(struct thermal_zone_device *tz,* If value is +1, activate a passive instance. * If value is -1, deactivate a passive instance. */ -if (type ==THERMAL_TRIP_PASSIVE || type ==THERMAL_TRIPS_NONE ) +if (type ==THERMAL_TRIP_PASSIVE ) tz->passive += value; }@@ -122,13 +122,8 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip)bool throttle = false;int old_target; -if (trip ==THERMAL_TRIPS_NONE ) { - trip_temp = tz->forced_passive; - trip_type =THERMAL_TRIPS_NONE ; - }else { - tz->ops->get_trip_temp (tz, trip, &trip_temp); - tz->ops->get_trip_type (tz, trip, &trip_type); - } + tz->ops->get_trip_temp (tz, trip, &trip_temp); + tz->ops->get_trip_type (tz, trip, &trip_type); trend =get_tz_trend (tz, trip);@@ -189,9 +184,6 @@ static int step_wise_throttle(struct thermal_zone_device *tz, int trip)thermal_zone_trip_update (tz, trip); -if (tz->forced_passive) -thermal_zone_trip_update (tz,THERMAL_TRIPS_NONE ); -mutex_lock (&tz->lock);list_for_each_entry (instance, &tz->thermal_instances, tz_node)drivers/thermal/thermal_sysfs.c +0
-80@@ -216,49 +216,6 @@ trip_point_hyst_show(struct device *dev, struct device_attribute *attr,return ret ? ret :sprintf (buf,"%d\n" , temperature); } -static ssize_t -passive_store (struct device *dev,struct device_attribute *attr, -const char *buf,size_t count) -{ -struct thermal_zone_device *tz =to_thermal_zone (dev); -int state; - -if (sscanf (buf,"%d\n" , &state) !=1 ) -return -EINVAL ; - -/* sanity check: values below 1000 millicelcius don't make sense -* and can cause the system to go into a thermal heart attack -*/ -if (state && state <1000 ) -return -EINVAL ; - -if (state && !tz->forced_passive) { -if (!tz->passive_delay) - tz->passive_delay =1000 ; -thermal_zone_device_rebind_exception (tz,"Processor" , -sizeof ("Processor" )); - }else if (!state && tz->forced_passive) { - tz->passive_delay =0 ; -thermal_zone_device_unbind_exception (tz,"Processor" , -sizeof ("Processor" )); - } - - tz->forced_passive = state; - -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); - -return count; -} - -static ssize_t -passive_show (struct device *dev,struct device_attribute *attr, -char *buf) -{ -struct thermal_zone_device *tz =to_thermal_zone (dev); - -return sprintf (buf,"%d\n" , tz->forced_passive); -} -static ssize_t policy_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count)@@ -403,7 +360,6 @@ static DEVICE_ATTR_RW(sustainable_power);/* These thermal zone device attributes are created based on conditions */ static DEVICE_ATTR_RW (mode); -static DEVICE_ATTR_RW (passive);/* These attributes are unconditionally added to a thermal zone */ static struct attribute *thermal_zone_dev_attrs[] = {@@ -438,45 +394,9 @@ static const struct attribute_group thermal_zone_mode_attribute_group = { .attrs = thermal_zone_mode_attrs, }; -/* We expose passive only if passive trips are present */ -static struct attribute *thermal_zone_passive_attrs[] = { - &dev_attr_passive.attr, -NULL , -}; - -static umode_t thermal_zone_passive_is_visible (struct kobject *kobj, -struct attribute *attr, -int attrno) -{ -struct device *dev =kobj_to_dev (kobj); -struct thermal_zone_device *tz; -enum thermal_trip_type trip_type; -int count, passive =0 ; - - tz = container_of(dev, struct thermal_zone_device, device); - -for (count =0 ; count < tz->trips && !passive; count++) { - tz->ops->get_trip_type (tz, count, &trip_type); - -if (trip_type ==THERMAL_TRIP_PASSIVE ) - passive =1 ; - } - -if (!passive) -return attr->mode; - -return 0 ; -} - -static const struct attribute_group thermal_zone_passive_attribute_group = { - .attrs = thermal_zone_passive_attrs, - .is_visible = thermal_zone_passive_is_visible, -}; -static const struct attribute_group *thermal_zone_attribute_groups[] = { &thermal_zone_attribute_group, &thermal_zone_mode_attribute_group, - &thermal_zone_passive_attribute_group,/* This is not NULL terminated as we create the group dynamically */ };include/linux/thermal.h +0
-4@@ -131,9 +131,6 @@ struct thermal_cooling_device { trip point. * @prev_high_trip: the above current temperature if you've crossed a passive trip point. - * @forced_passive: If > 0, temperature at which to switch on all ACPI - * processor cooling devices. Currently only used by the - * step-wise governor. * @need_update: if equals 1, thermal_zone_device_update needs to be invoked. * @ops: operations this &thermal_zone_device supports * @tzp: thermal zone parameters@@ -167,7 +164,6 @@ struct thermal_zone_device {int passive;int prev_low_trip;int prev_high_trip; -unsigned int forced_passive;atomic_t need_update;struct thermal_zone_device_ops *ops;struct thermal_zone_params *tzp;
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
Quoted 26 lines · Daniel Lezcano
The code was reorganized in 2012 with the commit
0c01ebbfd3caf1.The main change is a loop on the trip points array and a unconditional call to the
throttle()ops of the governors for each of them even if the trip temperature is not reached yet.With this change, the '
forced_passive' is no longer checked in thethermal_zone_device_update()function but in the step wise governor'sthrottle()callback.As the
force_passivedoes no belong to the trip point array, thethermal_zone_device_update()can not compare with the specified passive temperature, thus does not detect the passive limit has been crossed. Consequently,throttle()is never called and the 'forced_passive' branch is unreached.In addition, the default processor cooling device is not automatically bound to the thermal zone if there is not passive trip point, thus the '
forced_passive' can not operate.If there is an active trip point, then the throttle function will be called to mitigate at this temperature and the '
forced_passive' will override the mitigation of the active trip point in this case but with the default cooling device bound to the thermal zone, so usually a fan, and that is not a passive cooling effect.
Quoted 7 lines
Given the regression exists since more than 8 years, nobody complained and at the best of my knowledge there is no bug open in
https://bugzilla.kernel.org, it is reasonable to say it is unused.Remove the '
forced_passive' related code.Signed-off-by Daniel Lezcano <[email protected]>
Quoted 201 lines
--- .../driver-api/thermal/sysfs-api.rst | 13 --- drivers/thermal/gov_step_wise.c | 14 +--- drivers/thermal/thermal_sysfs.c | 80 ------------------- include/linux/thermal.h | 4 - 4 files changed, 3 insertions(+), 108 deletions(-)Documentation/driver-api/thermal/sysfs-api.rst +0
-13@@ -520,19 +520,6 @@ available_policies RW, Optional -passive - Attribute is only present for zones in which the passive cooling - policy is not supported by native thermal driver. Default is zero - and can be set to a temperature (in millidegrees) to enable a - passive trip point for the zone. Activation is done by polling with - an interval of 1 second. - - Unit: millidegrees Celsius - - Valid values: 0 (disabled) or greater than 1000 - - RW, Optional - emul_temp Interface to set the emulated temperature method in thermal zone (sensor). After setting this temperature, the thermal zone may passdrivers/thermal/gov_step_wise.c +3
-11@@ -109,7 +109,7 @@ static void update_passive_instance(struct thermal_zone_device *tz,* If value is +1, activate a passive instance. * If value is -1, deactivate a passive instance. */ -if (type ==THERMAL_TRIP_PASSIVE || type ==THERMAL_TRIPS_NONE ) +if (type ==THERMAL_TRIP_PASSIVE ) tz->passive += value; }@@ -122,13 +122,8 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip)bool throttle = false;int old_target; -if (trip ==THERMAL_TRIPS_NONE ) { - trip_temp = tz->forced_passive; - trip_type =THERMAL_TRIPS_NONE ; - }else { - tz->ops->get_trip_temp (tz, trip, &trip_temp); - tz->ops->get_trip_type (tz, trip, &trip_type); - } + tz->ops->get_trip_temp (tz, trip, &trip_temp); + tz->ops->get_trip_type (tz, trip, &trip_type); trend =get_tz_trend (tz, trip);@@ -189,9 +184,6 @@ static int step_wise_throttle(struct thermal_zone_device *tz, int trip)thermal_zone_trip_update (tz, trip); -if (tz->forced_passive) -thermal_zone_trip_update (tz,THERMAL_TRIPS_NONE ); -mutex_lock (&tz->lock);list_for_each_entry (instance, &tz->thermal_instances, tz_node)drivers/thermal/thermal_sysfs.c +0
-80@@ -216,49 +216,6 @@ trip_point_hyst_show(struct device *dev, struct device_attribute *attr,return ret ? ret :sprintf (buf,"%d\n" , temperature); } -static ssize_t -passive_store (struct device *dev,struct device_attribute *attr, -const char *buf,size_t count) -{ -struct thermal_zone_device *tz =to_thermal_zone (dev); -int state; - -if (sscanf (buf,"%d\n" , &state) !=1 ) -return -EINVAL ; - -/* sanity check: values below 1000 millicelcius don't make sense -* and can cause the system to go into a thermal heart attack -*/ -if (state && state <1000 ) -return -EINVAL ; - -if (state && !tz->forced_passive) { -if (!tz->passive_delay) - tz->passive_delay =1000 ; -thermal_zone_device_rebind_exception (tz,"Processor" , -sizeof ("Processor" )); - }else if (!state && tz->forced_passive) { - tz->passive_delay =0 ; -thermal_zone_device_unbind_exception (tz,"Processor" , -sizeof ("Processor" )); - } - - tz->forced_passive = state; - -thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); - -return count; -} - -static ssize_t -passive_show (struct device *dev,struct device_attribute *attr, -char *buf) -{ -struct thermal_zone_device *tz =to_thermal_zone (dev); - -return sprintf (buf,"%d\n" , tz->forced_passive); -} -static ssize_t policy_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count)@@ -403,7 +360,6 @@ static DEVICE_ATTR_RW(sustainable_power);/* These thermal zone device attributes are created based on conditions */ static DEVICE_ATTR_RW (mode); -static DEVICE_ATTR_RW (passive);/* These attributes are unconditionally added to a thermal zone */ static struct attribute *thermal_zone_dev_attrs[] = {@@ -438,45 +394,9 @@ static const struct attribute_group thermal_zone_mode_attribute_group = { .attrs = thermal_zone_mode_attrs, }; -/* We expose passive only if passive trips are present */ -static struct attribute *thermal_zone_passive_attrs[] = { - &dev_attr_passive.attr, -NULL , -}; - -static umode_t thermal_zone_passive_is_visible (struct kobject *kobj, -struct attribute *attr, -int attrno) -{ -struct device *dev =kobj_to_dev (kobj); -struct thermal_zone_device *tz; -enum thermal_trip_type trip_type; -int count, passive =0 ; - - tz = container_of(dev, struct thermal_zone_device, device); - -for (count =0 ; count < tz->trips && !passive; count++) { - tz->ops->get_trip_type (tz, count, &trip_type); - -if (trip_type ==THERMAL_TRIP_PASSIVE ) - passive =1 ; - } - -if (!passive) -return attr->mode; - -return 0 ; -} - -static const struct attribute_group thermal_zone_passive_attribute_group = { - .attrs = thermal_zone_passive_attrs, - .is_visible = thermal_zone_passive_is_visible, -}; -static const struct attribute_group *thermal_zone_attribute_groups[] = { &thermal_zone_attribute_group, &thermal_zone_mode_attribute_group, - &thermal_zone_passive_attribute_group,/* This is not NULL terminated as we create the group dynamically */ };include/linux/thermal.h +0
-4@@ -131,9 +131,6 @@ struct thermal_cooling_device { trip point. * @prev_high_trip: the above current temperature if you've crossed a passive trip point. - * @forced_passive: If > 0, temperature at which to switch on all ACPI - * processor cooling devices. Currently only used by the - * step-wise governor. * @need_update: if equals 1, thermal_zone_device_update needs to be invoked. * @ops: operations this &thermal_zone_device supports * @tzp: thermal zone parameters@@ -167,7 +164,6 @@ struct thermal_zone_device {int passive;int prev_low_trip;int prev_high_trip; -unsigned int forced_passive;atomic_t need_update;struct thermal_zone_device_ops *ops;struct thermal_zone_params *tzp;
Signature · 2 lines
Warm Regards Thara
The following commit has been merged into the thermal/next branch of thermal:
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: a7d6ba14efb778fc8c65c627a057d5dd29debd04 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//a7d6ba14efb778fc8c65c627a057d5dd29debd04 Author: Daniel Lezcano <[email protected]> AuthorDate: Tue, 15 Dec 2020 00:38:04 +01:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Tue, 19 Jan 2021 22:22:45 +01:00
thermal/core: Remove the 'forced_passive' option
The code was reorganized in 2012 with the commit 0c01ebbfd3caf1.
The main change is a loop on the trip points array and a unconditional call to the throttle() ops of the governors for each of them even if the trip temperature is not reached yet.
With this change, the 'forced_passive' is no longer checked in the thermal_zone_device_update() function but in the step wise governor's throttle() callback.
As the force_passive does no belong to the trip point array, the thermal_zone_device_update() can not compare with the specified passive temperature, thus does not detect the passive limit has been crossed. Consequently, throttle() is never called and the 'forced_passive' branch is unreached.
In addition, the default processor cooling device is not automatically bound to the thermal zone if there is not passive trip point, thus the 'forced_passive' can not operate.
If there is an active trip point, then the throttle function will be called to mitigate at this temperature and the 'forced_passive' will override the mitigation of the active trip point in this case but with the default cooling device bound to the thermal zone, so usually a fan, and that is not a passive cooling effect.
Given the regression exists since more than 8 years, nobody complained and at the best of my knowledge there is no bug open in
https://bugzilla.kernel.org, it is reasonable to say it is unused.
Remove the 'forced_passive' related code.
--- Documentation/driver-api/thermal/sysfs-api.rst | 13 +--- drivers/thermal/gov_step_wise.c | 14 +--- drivers/thermal/thermal_sysfs.c | 80 +----------------- include/linux/thermal.h | 4 +- 4 files changed, 3 insertions(+), 108 deletions(-)
Documentation/driver-api/thermal/sysfs-api.rst +0 -13
@@ -520,19 +520,6 @@ available_policies RW, Optional -passive - Attribute is only present for zones in which the passive cooling - policy is not supported by native thermal driver. Default is zero - and can be set to a temperature (in millidegrees) to enable a - passive trip point for the zone. Activation is done by polling with - an interval of 1 second. - - Unit: millidegrees Celsius - - Valid values: 0 (disabled) or greater than 1000 - - RW, Optional - emul_temp Interface to set the emulated temperature method in thermal zone (sensor). After setting this temperature, the thermal zone may pass
drivers/thermal/gov_step_wise.c +3 -11
@@ -109,7 +109,7 @@ static void update_passive_instance(struct thermal_zone_device *tz,* If value is +1, activate a passive instance. * If value is -1, deactivate a passive instance. */ -if (type ==THERMAL_TRIP_PASSIVE || type ==THERMAL_TRIPS_NONE ) +if (type ==THERMAL_TRIP_PASSIVE ) tz->passive += value; }
@@ -122,13 +122,8 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip)bool throttle = false;int old_target; -if (trip ==THERMAL_TRIPS_NONE ) { - trip_temp = tz->forced_passive; - trip_type =THERMAL_TRIPS_NONE ; - }else { - tz->ops->get_trip_temp (tz, trip, &trip_temp); - tz->ops->get_trip_type (tz, trip, &trip_type); - } + tz->ops->get_trip_temp (tz, trip, &trip_temp); + tz->ops->get_trip_type (tz, trip, &trip_type); trend =get_tz_trend (tz, trip);
@@ -189,9 +184,6 @@ static int step_wise_throttle(struct thermal_zone_device *tz, int trip)thermal_zone_trip_update (tz, trip); -if (tz->forced_passive) -thermal_zone_trip_update (tz,THERMAL_TRIPS_NONE ); -mutex_lock (&tz->lock);list_for_each_entry (instance, &tz->thermal_instances, tz_node)
drivers/thermal/thermal_sysfs.c +0 -80
101 lines not on this page · raw message
include/linux/thermal.h +0 -4
@@ -131,9 +131,6 @@ struct thermal_cooling_device { trip point. * @prev_high_trip: the above current temperature if you've crossed a passive trip point. - * @forced_passive: If > 0, temperature at which to switch on all ACPI - * processor cooling devices. Currently only used by the - * step-wise governor. * @need_update: if equals 1, thermal_zone_device_update needs to be invoked. * @ops: operations this &thermal_zone_device supports * @tzp: thermal zone parameters
@@ -167,7 +164,6 @@ struct thermal_zone_device {int passive;int prev_low_trip;int prev_high_trip; -unsigned int forced_passive;atomic_t need_update;struct thermal_zone_device_ops *ops;struct thermal_zone_params *tzp;