Skip to contentSkip to conversation

thermal/core: Precompute the delays from msecs to jiffies

PATCH Applied Daniel Lezcano 7 participants 16 messages Dec 16, 2020 – Jan 19, 2021

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 thermal/core: Precompute the delays from msecs to jiffies

The delays are stored in ms units and when the polling function is called this delay is converted into jiffies at each call.

Instead of doing the conversion again and again, compute the jiffies at init time and use the value directly when setting the polling.

---
 drivers/thermal/thermal_core.c    | 3 +++
 drivers/thermal/thermal_core.h    | 1 +
 drivers/thermal/thermal_helpers.c | 7 +++++++
 include/linux/thermal.h           | 7 +++++++
 4 files changed, 18 insertions(+)
drivers/thermal/thermal_core.c +3 -0
index bcc2ea4f5482..2c41d4a0923f 100644
@@ -1315,6 +1315,9 @@ thermal_zone_device_register(const char *type, int trips, int mask,
 	tz->passive_delay = passive_delay;
 	tz->polling_delay = polling_delay;
 
+	thermal_set_delay_jiffies(&tz->passive_delay_jiffies, passive_delay);
+	thermal_set_delay_jiffies(&tz->polling_delay_jiffies, polling_delay);
+
 	/* sys I/F */
 	/* Add nodes that are always present via .groups */
 	result = thermal_zone_create_device_groups(tz, mask);
drivers/thermal/thermal_core.h +1 -0
index e50c6b2909fe..90f9a80c8b23 100644
@@ -123,6 +123,7 @@ int thermal_build_list_of_policies(char *buf);
 
 /* Helpers */
 void thermal_zone_set_trips(struct thermal_zone_device *tz);
+void thermal_set_delay_jiffies(unsigned long *delay_jiffies, int delay_ms);
 
 /* sysfs I/F */
 int thermal_zone_create_device_groups(struct thermal_zone_device *, int);
drivers/thermal/thermal_helpers.c +7 -0
index c94bc824e5d3..7f50f412e02a 100644
@@ -175,6 +175,13 @@ void thermal_zone_set_trips(struct thermal_zone_device *tz)
 	mutex_unlock(&tz->lock);
 }
 
+void thermal_set_delay_jiffies(unsigned long *delay_jiffies, int delay_ms)
+{
+	*delay_jiffies = msecs_to_jiffies(delay_ms);
+	if (delay_ms > 1000)
+		*delay_jiffies = round_jiffies(*delay_jiffies);
+}
+
 static void thermal_cdev_set_cur_state(struct thermal_cooling_device *cdev,
 				       int target)
 {
include/linux/thermal.h +7 -0
index 060a2160add4..d1b82c70de69 100644
@@ -117,9 +117,14 @@ struct thermal_cooling_device {
  * @trips_disabled;	bitmap for disabled trips
  * @passive_delay:	number of milliseconds to wait between polls when
  *			performing passive cooling.
+ * @passive_delay_jiffies: number of jiffies to wait between polls when
+ *			performing passive cooling.
  * @polling_delay:	number of milliseconds to wait between polls when
  *			checking whether trip points have been crossed (0 for
  *			interrupt driven systems)
+ * @polling_delay_jiffies: number of jiffies to wait between polls when
+ *			checking whether trip points have been crossed (0 for
+ *			interrupt driven systems)
  * @temperature:	current temperature.  This is only for core code,
  *			drivers should use thermal_zone_get_temp() to get the
  *			current temperature
@@ -155,6 +160,8 @@ struct thermal_zone_device {
 	void *devdata;
 	int trips;
 	unsigned long trips_disabled;	/* bitmap for disabled trips */
+	unsigned long passive_delay_jiffies;
+	unsigned long polling_delay_jiffies;
 	int passive_delay;
 	int polling_delay;
 	int temperature;
Signature · 1 line
2.25.1
#1 lore raw

PATCH v2 2/3 thermal/core: Use precomputed jiffies for the polling

The delays are also stored in jiffies based unit. Use them instead of the ms.

---
 drivers/thermal/thermal_core.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/thermal/thermal_core.c +5 -10
index 2c41d4a0923f..d96c515af3cb 100644
@@ -289,16 +289,11 @@ static int __init thermal_register_governors(void)
  * - Critical trip point will cause a system shutdown.
  */
 static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,
-					    int delay)
+					    unsigned long delay)
 {
-	if (delay > 1000)
+	if (delay)
 		mod_delayed_work(system_freezable_power_efficient_wq,
-				 &tz->poll_queue,
-				 round_jiffies(msecs_to_jiffies(delay)));
-	else if (delay)
-		mod_delayed_work(system_freezable_power_efficient_wq,
-				 &tz->poll_queue,
-				 msecs_to_jiffies(delay));
+				 &tz->poll_queue, delay);
 	else
 		cancel_delayed_work(&tz->poll_queue);
 }
@@ -317,9 +312,9 @@ static void monitor_thermal_zone(struct thermal_zone_device *tz)
 	mutex_lock(&tz->lock);
 
 	if (!stop && tz->passive)
-		thermal_zone_device_set_polling(tz, tz->passive_delay);
+		thermal_zone_device_set_polling(tz, tz->passive_delay_jiffies);
 	else if (!stop && tz->polling_delay)
-		thermal_zone_device_set_polling(tz, tz->polling_delay);
+		thermal_zone_device_set_polling(tz, tz->polling_delay_jiffies);
 	else
 		thermal_zone_device_set_polling(tz, 0);
 
Signature · 1 line
2.25.1
Reviewed-by on v2 2/3
#2 lore raw

Re: [PATCH v2 2/3] thermal/core: Use precomputed jiffies for the polling

Quoted 9 lines · Daniel Lezcano

The delays are also stored in jiffies based unit. Use them instead of the ms.

---
  drivers/thermal/thermal_core.c | 15 +++++----------
  1 file changed, 5 insertions(+), 10 deletions(-)
Quoted 38 lines
drivers/thermal/thermal_core.c +5 -10
index 2c41d4a0923f..d96c515af3cb 100644
@@ -289,16 +289,11 @@ static int __init thermal_register_governors(void)
   * - Critical trip point will cause a system shutdown.
   */
  static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,
-					    int delay)
+					    unsigned long delay)
  {
-	if (delay > 1000)
+	if (delay)
  		mod_delayed_work(system_freezable_power_efficient_wq,
-				 &tz->poll_queue,
-				 round_jiffies(msecs_to_jiffies(delay)));
-	else if (delay)
-		mod_delayed_work(system_freezable_power_efficient_wq,
-				 &tz->poll_queue,
-				 msecs_to_jiffies(delay));
+				 &tz->poll_queue, delay);
  	else
  		cancel_delayed_work(&tz->poll_queue);
  }
@@ -317,9 +312,9 @@ static void monitor_thermal_zone(struct thermal_zone_device *tz)
  	mutex_lock(&tz->lock);
 
  	if (!stop && tz->passive)
-		thermal_zone_device_set_polling(tz, tz->passive_delay);
+		thermal_zone_device_set_polling(tz, tz->passive_delay_jiffies);
  	else if (!stop && tz->polling_delay)
-		thermal_zone_device_set_polling(tz, tz->polling_delay);
+		thermal_zone_device_set_polling(tz, tz->polling_delay_jiffies);
  	else
  		thermal_zone_device_set_polling(tz, 0);
 
Signature · 2 lines
Warm Regards
Thara
#3 lore raw

[thermal: thermal/next] thermal/core: Use precomputed jiffies for the polling

In reply to Daniel Lezcano
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:     39a38808d082fc0fbf45cfefda17252ed8c6b31f
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//39a38808d082fc0fbf45cfefda17252ed8c6b31f
Author:        Daniel Lezcano <[email protected]>
AuthorDate:    Wed, 16 Dec 2020 23:03:36 +01:00
Committer:     Daniel Lezcano <[email protected]>
CommitterDate: Tue, 19 Jan 2021 22:23:43 +01:00

thermal/core: Use precomputed jiffies for the polling

The delays are also stored in jiffies based unit. Use them instead of the ms.

---
 drivers/thermal/thermal_core.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/thermal/thermal_core.c +5 -10
index 2c41d4a..d96c515 100644
@@ -289,16 +289,11 @@ static int __init thermal_register_governors(void)
  * - Critical trip point will cause a system shutdown.
  */
 static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,
-					    int delay)
+					    unsigned long delay)
 {
-	if (delay > 1000)
+	if (delay)
 		mod_delayed_work(system_freezable_power_efficient_wq,
-				 &tz->poll_queue,
-				 round_jiffies(msecs_to_jiffies(delay)));
-	else if (delay)
-		mod_delayed_work(system_freezable_power_efficient_wq,
-				 &tz->poll_queue,
-				 msecs_to_jiffies(delay));
+				 &tz->poll_queue, delay);
 	else
 		cancel_delayed_work(&tz->poll_queue);
 }
@@ -317,9 +312,9 @@ static void monitor_thermal_zone(struct thermal_zone_device *tz)
 	mutex_lock(&tz->lock);
 
 	if (!stop && tz->passive)
-		thermal_zone_device_set_polling(tz, tz->passive_delay);
+		thermal_zone_device_set_polling(tz, tz->passive_delay_jiffies);
 	else if (!stop && tz->polling_delay)
-		thermal_zone_device_set_polling(tz, tz->polling_delay);
+		thermal_zone_device_set_polling(tz, tz->polling_delay_jiffies);
 	else
 		thermal_zone_device_set_polling(tz, 0);
 
#4 lore raw

PATCH v2 3/3 thermal/core: Remove ms based delay fields

In reply to Daniel Lezcano

The code does no longer use the ms unit based fields to set the delays as they are replaced by the jiffies.

Remove them and replace their user to use the jiffies version instead.

---
 drivers/platform/x86/acerhdf.c                     | 3 ++-
 drivers/thermal/da9062-thermal.c                   | 4 ++--
 drivers/thermal/gov_power_allocator.c              | 2 +-
 drivers/thermal/thermal_core.c                     | 4 +---
 drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 6 ++++--
 include/linux/thermal.h                            | 7 -------
 6 files changed, 10 insertions(+), 16 deletions(-)
drivers/platform/x86/acerhdf.c +2 -1
index b6aa6e5514f4..6b8b3ab8db48 100644
@@ -336,7 +336,8 @@ static void acerhdf_check_param(struct thermal_zone_device *thermal)
 			pr_notice("interval changed to: %d\n", interval);
 
 		if (thermal)
-			thermal->polling_delay = interval*1000;
+			thermal->polling_delay_jiffies =
+				round_jiffies(msecs_to_jiffies(interval * 1000));
 
 		prev_interval = interval;
 	}
drivers/thermal/da9062-thermal.c +2 -2
index 4d74994f160a..180edec34e07 100644
@@ -95,7 +95,7 @@ static void da9062_thermal_poll_on(struct work_struct *work)
 		thermal_zone_device_update(thermal->zone,
 					   THERMAL_EVENT_UNSPECIFIED);
 
-		delay = msecs_to_jiffies(thermal->zone->passive_delay);
+		delay = thermal->zone->passive_delay_jiffies;
 		queue_delayed_work(system_freezable_wq, &thermal->work, delay);
 		return;
 	}
@@ -245,7 +245,7 @@ static int da9062_thermal_probe(struct platform_device *pdev)
 
 	dev_dbg(&pdev->dev,
 		"TJUNC temperature polling period set at %d ms\n",
-		thermal->zone->passive_delay);
+		jiffies_to_msecs(thermal->zone->passive_delay_jiffies));
 
 	ret = platform_get_irq_byname(pdev, "THERMAL");
 	if (ret < 0) {
drivers/thermal/gov_power_allocator.c +1 -1
index 7a4170a0b51f..f8c3d1e40b86 100644
@@ -258,7 +258,7 @@ static u32 pid_controller(struct thermal_zone_device *tz,
 	 * power being applied, slowing down the controller)
 	 */
 	d = mul_frac(tz->tzp->k_d, err - params->prev_err);
-	d = div_frac(d, tz->passive_delay);
+	d = div_frac(d, jiffies_to_msecs(tz->passive_delay_jiffies));
 	params->prev_err = err;
 
 	power_range = p + i + d;
drivers/thermal/thermal_core.c +1 -3
index d96c515af3cb..b2615449b18f 100644
@@ -313,7 +313,7 @@ static void monitor_thermal_zone(struct thermal_zone_device *tz)
 
 	if (!stop && tz->passive)
 		thermal_zone_device_set_polling(tz, tz->passive_delay_jiffies);
-	else if (!stop && tz->polling_delay)
+	else if (!stop && tz->polling_delay_jiffies)
 		thermal_zone_device_set_polling(tz, tz->polling_delay_jiffies);
 	else
 		thermal_zone_device_set_polling(tz, 0);
@@ -1307,8 +1307,6 @@ thermal_zone_device_register(const char *type, int trips, int mask,
 	tz->device.class = &thermal_class;
 	tz->devdata = devdata;
 	tz->trips = trips;
-	tz->passive_delay = passive_delay;
-	tz->polling_delay = polling_delay;
 
 	thermal_set_delay_jiffies(&tz->passive_delay_jiffies, passive_delay);
 	thermal_set_delay_jiffies(&tz->polling_delay_jiffies, polling_delay);
drivers/thermal/ti-soc-thermal/ti-thermal-common.c +4 -2
index 2ce4b19f312a..f84375865c97 100644
@@ -166,6 +166,7 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id,
 			     char *domain)
 {
 	struct ti_thermal_data *data;
+	int interval;
 
 	data = ti_bandgap_get_sensor_data(bgp, id);
 
@@ -183,9 +184,10 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id,
 		return PTR_ERR(data->ti_thermal);
 	}
 
+	interval = jiffies_to_msecs(data->ti_thermal->polling_delay_jiffies);
+
 	ti_bandgap_set_sensor_data(bgp, id, data);
-	ti_bandgap_write_update_interval(bgp, data->sensor_id,
-					data->ti_thermal->polling_delay);
+	ti_bandgap_write_update_interval(bgp, data->sensor_id, interval);
 
 	return 0;
 }
include/linux/thermal.h +0 -7
index d1b82c70de69..1e686404951b 100644
@@ -115,13 +115,8 @@ struct thermal_cooling_device {
  * @devdata:	private pointer for device private data
  * @trips:	number of trip points the thermal zone supports
  * @trips_disabled;	bitmap for disabled trips
- * @passive_delay:	number of milliseconds to wait between polls when
- *			performing passive cooling.
  * @passive_delay_jiffies: number of jiffies to wait between polls when
  *			performing passive cooling.
- * @polling_delay:	number of milliseconds to wait between polls when
- *			checking whether trip points have been crossed (0 for
- *			interrupt driven systems)
  * @polling_delay_jiffies: number of jiffies to wait between polls when
  *			checking whether trip points have been crossed (0 for
  *			interrupt driven systems)
@@ -162,8 +157,6 @@ struct thermal_zone_device {
 	unsigned long trips_disabled;	/* bitmap for disabled trips */
 	unsigned long passive_delay_jiffies;
 	unsigned long polling_delay_jiffies;
-	int passive_delay;
-	int polling_delay;
 	int temperature;
 	int last_temperature;
 	int emul_temperature;
Signature · 1 line
2.25.1
maintainer Reviewed-by on v2 3/3
#5 lore raw

Re: [PATCH v2 3/3] thermal/core: Remove ms based delay fields

Quoted 10 lines · Daniel Lezcano

The code does no longer use the ms unit based fields to set the delays as they are replaced by the jiffies.

Remove them and replace their user to use the jiffies version instead.

---
drivers/platform/x86/acerhdf.c | 3 ++-

Quoted 133 lines

drivers/thermal/da9062-thermal.c | 4 ++-- drivers/thermal/gov_power_allocator.c | 2 +- drivers/thermal/thermal_core.c | 4 +--- drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 6 ++++-- include/linux/thermal.h | 7 -------

6 files changed, 10 insertions(+), 16 deletions(-)
drivers/platform/x86/acerhdf.c +2 -1
index b6aa6e5514f4..6b8b3ab8db48 100644
@@ -336,7 +336,8 @@ static void acerhdf_check_param(struct thermal_zone_device *thermal)
 pr_notice("interval changed to: %d\n", interval);
 
 if (thermal)
- thermal->polling_delay = interval*1000;
+ thermal->polling_delay_jiffies =
+ round_jiffies(msecs_to_jiffies(interval * 1000));
 
 prev_interval = interval;
 }
drivers/thermal/da9062-thermal.c +2 -2
index 4d74994f160a..180edec34e07 100644
@@ -95,7 +95,7 @@ static void da9062_thermal_poll_on(struct work_struct *work)
 thermal_zone_device_update(thermal->zone,
 THERMAL_EVENT_UNSPECIFIED);
 
- delay = msecs_to_jiffies(thermal->zone->passive_delay);
+ delay = thermal->zone->passive_delay_jiffies;
 queue_delayed_work(system_freezable_wq, &thermal->work, delay);
 return;
 }
@@ -245,7 +245,7 @@ static int da9062_thermal_probe(struct platform_device *pdev)
 
 dev_dbg(&pdev->dev,
 "TJUNC temperature polling period set at %d ms\n",
- thermal->zone->passive_delay);
+ jiffies_to_msecs(thermal->zone->passive_delay_jiffies));
 
 ret = platform_get_irq_byname(pdev, "THERMAL");
 if (ret < 0) {
drivers/thermal/gov_power_allocator.c +1 -1
index 7a4170a0b51f..f8c3d1e40b86 100644
@@ -258,7 +258,7 @@ static u32 pid_controller(struct thermal_zone_device *tz,
 * power being applied, slowing down the controller)
 */
 d = mul_frac(tz->tzp->k_d, err - params->prev_err);
- d = div_frac(d, tz->passive_delay);
+ d = div_frac(d, jiffies_to_msecs(tz->passive_delay_jiffies));
 params->prev_err = err;
 
 power_range = p + i + d;
drivers/thermal/thermal_core.c +1 -1
index d96c515af3cb..b2615449b18f 100644
@@ -313,7 +313,7 @@ static void monitor_thermal_zone(struct thermal_zone_device *tz)
 
 if (!stop && tz->passive)
 thermal_zone_device_set_polling(tz, tz->passive_delay_jiffies);
- else if (!stop && tz->polling_delay)
+ else if (!stop && tz->polling_delay_jiffies)
 thermal_zone_device_set_polling(tz, tz->polling_delay_jiffies);

else
thermal_zone_device_set_polling(tz, 0);

drivers/thermal/thermal_core.c +0 -2
@@ -1307,8 +1307,6 @@ thermal_zone_device_register(const char *type, int trips, int mask,
 tz->device.class = &thermal_class;
 tz->devdata = devdata;
 tz->trips = trips;
- tz->passive_delay = passive_delay;
- tz->polling_delay = polling_delay;
 
 thermal_set_delay_jiffies(&tz->passive_delay_jiffies, passive_delay);
 thermal_set_delay_jiffies(&tz->polling_delay_jiffies, polling_delay);
drivers/thermal/ti-soc-thermal/ti-thermal-common.c +4 -2
index 2ce4b19f312a..f84375865c97 100644
@@ -166,6 +166,7 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id,
 char *domain)
 {
 struct ti_thermal_data *data;
+ int interval;
 
 data = ti_bandgap_get_sensor_data(bgp, id);
 
@@ -183,9 +184,10 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id,
 return PTR_ERR(data->ti_thermal);
 }
 
+ interval = jiffies_to_msecs(data->ti_thermal->polling_delay_jiffies);
+
 ti_bandgap_set_sensor_data(bgp, id, data);
- ti_bandgap_write_update_interval(bgp, data->sensor_id,
- data->ti_thermal->polling_delay);
+ ti_bandgap_write_update_interval(bgp, data->sensor_id, interval);
 
 return 0;
 }
include/linux/thermal.h +0 -5
index d1b82c70de69..1e686404951b 100644
@@ -115,13 +115,8 @@ struct thermal_cooling_device {
 * @devdata: private pointer for device private data
 * @trips: number of trip points the thermal zone supports
 * @trips_disabled; bitmap for disabled trips
- * @passive_delay: number of milliseconds to wait between polls when
- * performing passive cooling.
 * @passive_delay_jiffies: number of jiffies to wait between polls when
 * performing passive cooling.
- * @polling_delay: number of milliseconds to wait between polls when
- * checking whether trip points have been crossed (0 for
- * interrupt driven systems)
 * @polling_delay_jiffies: number of jiffies to wait between polls when
 * checking whether trip points have been crossed (0 for
 * interrupt driven systems)
@@ -162,8 +157,6 @@ struct thermal_zone_device {

unsigned long trips_disabled; /* bitmap for disabled trips */ unsigned long passive_delay_jiffies;
unsigned long polling_delay_jiffies;
- int passive_delay;
- int polling_delay;
int temperature;
int last_temperature;
int emul_temperature;

Signature · 1 line
2.25.1
#6 lore raw

Re: [PATCH v2 3/3] thermal/core: Remove ms based delay fields

Quoted 7 lines · Peter Kästle
Quoted 5 lines · Daniel Lezcano

The code does no longer use the ms unit based fields to set the delays as they are replaced by the jiffies.

Remove them and replace their user to use the jiffies version instead.

Quoted 7 lines
Quoted 5 lines

---
drivers/platform/x86/acerhdf.c | 3 ++-

Thanks for reviewing

-- 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
#7 lore raw

Re: [PATCH v2 3/3] thermal/core: Remove ms based delay fields

In reply to Daniel Lezcano
I love your patch! Yet something to improve:

Hi Daniel,

I love your patch! Yet something to improve:

[auto build test ERROR on linus/master]
[also build test ERROR on next-20201215]
[cannot apply to linux/master thermal/next v5.10]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Daniel-Lezcano/thermal-core-Precompute-the-delays-from-msecs-to-jiffies/20201217-060807
base:   https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git d01e7f10dae29eba0f9ada82b65d24e035d5b2f9
config: powerpc-randconfig-r025-20201217 (attached as .config)
compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 71601d2ac9954cb59c443cb3ae442cb106df35d4)

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 powerpc cross compiling tool for clang build
# apt-get install binutils-powerpc-linux-gnu
# https://github.com/0day-ci/linux/commit/269c49cd4aa4fe5b05d789faa6b974f4a4c85185
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Daniel-Lezcano/thermal-core-Precompute-the-delays-from-msecs-to-jiffies/20201217-060807 git checkout 269c49cd4aa4fe5b05d789faa6b974f4a4c85185
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=powerpc

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

>> drivers/thermal/thermal_sysfs.c:236:12: error: no member named 'passive_delay' in 'struct thermal_zone_device'
                   if (!tz->passive_delay)
                        ~~  ^
   drivers/thermal/thermal_sysfs.c:237:8: error: no member named 'passive_delay' in 'struct thermal_zone_device'
                           tz->passive_delay = 1000;
                           ~~  ^
   drivers/thermal/thermal_sysfs.c:241:7: error: no member named 'passive_delay' in 'struct thermal_zone_device'
                   tz->passive_delay = 0;
                   ~~  ^

3 errors generated.

vim +236 drivers/thermal/thermal_sysfs.c

a369ee88f7f6059 Eduardo Valentin 2016-11-07  218  
a369ee88f7f6059 Eduardo Valentin 2016-11-07  219  static ssize_t
a369ee88f7f6059 Eduardo Valentin 2016-11-07  220  passive_store(struct device *dev, struct device_attribute *attr,
a369ee88f7f6059 Eduardo Valentin 2016-11-07  221  	      const char *buf, size_t count)
a369ee88f7f6059 Eduardo Valentin 2016-11-07  222  {
a369ee88f7f6059 Eduardo Valentin 2016-11-07  223  	struct thermal_zone_device *tz = to_thermal_zone(dev);
a369ee88f7f6059 Eduardo Valentin 2016-11-07  224  	int state;
a369ee88f7f6059 Eduardo Valentin 2016-11-07  225  
a369ee88f7f6059 Eduardo Valentin 2016-11-07  226  	if (sscanf(buf, "%d\n", &state) != 1)
a369ee88f7f6059 Eduardo Valentin 2016-11-07  227  		return -EINVAL;
a369ee88f7f6059 Eduardo Valentin 2016-11-07  228  
a369ee88f7f6059 Eduardo Valentin 2016-11-07  229  	/* sanity check: values below 1000 millicelcius don't make sense
a369ee88f7f6059 Eduardo Valentin 2016-11-07  230  	 * and can cause the system to go into a thermal heart attack
a369ee88f7f6059 Eduardo Valentin 2016-11-07  231  	 */
a369ee88f7f6059 Eduardo Valentin 2016-11-07  232  	if (state && state < 1000)
a369ee88f7f6059 Eduardo Valentin 2016-11-07  233  		return -EINVAL;
a369ee88f7f6059 Eduardo Valentin 2016-11-07  234  
a369ee88f7f6059 Eduardo Valentin 2016-11-07  235  	if (state && !tz->forced_passive) {
a369ee88f7f6059 Eduardo Valentin 2016-11-07 @236  		if (!tz->passive_delay)
a369ee88f7f6059 Eduardo Valentin 2016-11-07  237  			tz->passive_delay = 1000;
a369ee88f7f6059 Eduardo Valentin 2016-11-07  238  		thermal_zone_device_rebind_exception(tz, "Processor",
a369ee88f7f6059 Eduardo Valentin 2016-11-07  239  						     sizeof("Processor"));
a369ee88f7f6059 Eduardo Valentin 2016-11-07  240  	} else if (!state && tz->forced_passive) {
a369ee88f7f6059 Eduardo Valentin 2016-11-07  241  		tz->passive_delay = 0;
a369ee88f7f6059 Eduardo Valentin 2016-11-07  242  		thermal_zone_device_unbind_exception(tz, "Processor",
a369ee88f7f6059 Eduardo Valentin 2016-11-07  243  						     sizeof("Processor"));
a369ee88f7f6059 Eduardo Valentin 2016-11-07  244  	}
a369ee88f7f6059 Eduardo Valentin 2016-11-07  245  
a369ee88f7f6059 Eduardo Valentin 2016-11-07  246  	tz->forced_passive = state;
a369ee88f7f6059 Eduardo Valentin 2016-11-07  247  
a369ee88f7f6059 Eduardo Valentin 2016-11-07  248  	thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);
a369ee88f7f6059 Eduardo Valentin 2016-11-07  249  
a369ee88f7f6059 Eduardo Valentin 2016-11-07  250  	return count;
a369ee88f7f6059 Eduardo Valentin 2016-11-07  251  }
a369ee88f7f6059 Eduardo Valentin 2016-11-07  252  

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

#8 lore raw

Re: [PATCH v2 3/3] thermal/core: Remove ms based delay fields

In reply to Daniel Lezcano
I love your patch! Yet something to improve:

Hi Daniel,

I love your patch! Yet something to improve:

[auto build test ERROR on linus/master]
[also build test ERROR on next-20201215]
[cannot apply to linux/master thermal/next v5.10]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Daniel-Lezcano/thermal-core-Precompute-the-delays-from-msecs-to-jiffies/20201217-060807
base:   https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git d01e7f10dae29eba0f9ada82b65d24e035d5b2f9
config: arc-randconfig-r024-20201217 (attached as .config)
compiler: arc-elf-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
# https://github.com/0day-ci/linux/commit/269c49cd4aa4fe5b05d789faa6b974f4a4c85185
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Daniel-Lezcano/thermal-core-Precompute-the-delays-from-msecs-to-jiffies/20201217-060807 git checkout 269c49cd4aa4fe5b05d789faa6b974f4a4c85185
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arc

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

drivers/thermal/thermal_sysfs.c: In function 'passive_store':

>> drivers/thermal/thermal_sysfs.c:236:10: error: 'struct thermal_zone_device' has no member named 'passive_delay'
     236 |   if (!tz->passive_delay)
         |          ^~
   drivers/thermal/thermal_sysfs.c:237:6: error: 'struct thermal_zone_device' has no member named 'passive_delay'
     237 |    tz->passive_delay = 1000;
         |      ^~
   drivers/thermal/thermal_sysfs.c:241:5: error: 'struct thermal_zone_device' has no member named 'passive_delay'
     241 |   tz->passive_delay = 0;
         |     ^~

vim +236 drivers/thermal/thermal_sysfs.c

a369ee88f7f6059 Eduardo Valentin 2016-11-07  218  
a369ee88f7f6059 Eduardo Valentin 2016-11-07  219  static ssize_t
a369ee88f7f6059 Eduardo Valentin 2016-11-07  220  passive_store(struct device *dev, struct device_attribute *attr,
a369ee88f7f6059 Eduardo Valentin 2016-11-07  221  	      const char *buf, size_t count)
a369ee88f7f6059 Eduardo Valentin 2016-11-07  222  {
a369ee88f7f6059 Eduardo Valentin 2016-11-07  223  	struct thermal_zone_device *tz = to_thermal_zone(dev);
a369ee88f7f6059 Eduardo Valentin 2016-11-07  224  	int state;
a369ee88f7f6059 Eduardo Valentin 2016-11-07  225  
a369ee88f7f6059 Eduardo Valentin 2016-11-07  226  	if (sscanf(buf, "%d\n", &state) != 1)
a369ee88f7f6059 Eduardo Valentin 2016-11-07  227  		return -EINVAL;
a369ee88f7f6059 Eduardo Valentin 2016-11-07  228  
a369ee88f7f6059 Eduardo Valentin 2016-11-07  229  	/* sanity check: values below 1000 millicelcius don't make sense
a369ee88f7f6059 Eduardo Valentin 2016-11-07  230  	 * and can cause the system to go into a thermal heart attack
a369ee88f7f6059 Eduardo Valentin 2016-11-07  231  	 */
a369ee88f7f6059 Eduardo Valentin 2016-11-07  232  	if (state && state < 1000)
a369ee88f7f6059 Eduardo Valentin 2016-11-07  233  		return -EINVAL;
a369ee88f7f6059 Eduardo Valentin 2016-11-07  234  
a369ee88f7f6059 Eduardo Valentin 2016-11-07  235  	if (state && !tz->forced_passive) {
a369ee88f7f6059 Eduardo Valentin 2016-11-07 @236  		if (!tz->passive_delay)
a369ee88f7f6059 Eduardo Valentin 2016-11-07  237  			tz->passive_delay = 1000;
a369ee88f7f6059 Eduardo Valentin 2016-11-07  238  		thermal_zone_device_rebind_exception(tz, "Processor",
a369ee88f7f6059 Eduardo Valentin 2016-11-07  239  						     sizeof("Processor"));
a369ee88f7f6059 Eduardo Valentin 2016-11-07  240  	} else if (!state && tz->forced_passive) {
a369ee88f7f6059 Eduardo Valentin 2016-11-07  241  		tz->passive_delay = 0;
a369ee88f7f6059 Eduardo Valentin 2016-11-07  242  		thermal_zone_device_unbind_exception(tz, "Processor",
a369ee88f7f6059 Eduardo Valentin 2016-11-07  243  						     sizeof("Processor"));
a369ee88f7f6059 Eduardo Valentin 2016-11-07  244  	}
a369ee88f7f6059 Eduardo Valentin 2016-11-07  245  
a369ee88f7f6059 Eduardo Valentin 2016-11-07  246  	tz->forced_passive = state;
a369ee88f7f6059 Eduardo Valentin 2016-11-07  247  
a369ee88f7f6059 Eduardo Valentin 2016-11-07  248  	thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);
a369ee88f7f6059 Eduardo Valentin 2016-11-07  249  
a369ee88f7f6059 Eduardo Valentin 2016-11-07  250  	return count;
a369ee88f7f6059 Eduardo Valentin 2016-11-07  251  }
a369ee88f7f6059 Eduardo Valentin 2016-11-07  252  

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

Acked-by on v2 3/3
#9 lore raw

Re: [PATCH v2 3/3] thermal/core: Remove ms based delay fields

In reply to Daniel Lezcano

Hi Daniel,

Quoted 8 lines · Daniel Lezcano

The code does no longer use the ms unit based fields to set the delays as they are replaced by the jiffies.

Remove them and replace their user to use the jiffies version instead.

I assume that you will merge this through the thermal tree, here is my ack for doing so for the pdx86 bits:

Regards,

Hans

Quoted 133 lines
---
 drivers/platform/x86/acerhdf.c                     | 3 ++-
 drivers/thermal/da9062-thermal.c                   | 4 ++--
 drivers/thermal/gov_power_allocator.c              | 2 +-
 drivers/thermal/thermal_core.c                     | 4 +---
 drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 6 ++++--
 include/linux/thermal.h                            | 7 -------
 6 files changed, 10 insertions(+), 16 deletions(-)
drivers/platform/x86/acerhdf.c +2 -1
index b6aa6e5514f4..6b8b3ab8db48 100644
@@ -336,7 +336,8 @@ static void acerhdf_check_param(struct thermal_zone_device *thermal)
 			pr_notice("interval changed to: %d\n", interval);
 
 		if (thermal)
-			thermal->polling_delay = interval*1000;
+			thermal->polling_delay_jiffies =
+				round_jiffies(msecs_to_jiffies(interval * 1000));
 
 		prev_interval = interval;
 	}
drivers/thermal/da9062-thermal.c +2 -2
index 4d74994f160a..180edec34e07 100644
@@ -95,7 +95,7 @@ static void da9062_thermal_poll_on(struct work_struct *work)
 		thermal_zone_device_update(thermal->zone,
 					   THERMAL_EVENT_UNSPECIFIED);
 
-		delay = msecs_to_jiffies(thermal->zone->passive_delay);
+		delay = thermal->zone->passive_delay_jiffies;
 		queue_delayed_work(system_freezable_wq, &thermal->work, delay);
 		return;
 	}
@@ -245,7 +245,7 @@ static int da9062_thermal_probe(struct platform_device *pdev)
 
 	dev_dbg(&pdev->dev,
 		"TJUNC temperature polling period set at %d ms\n",
-		thermal->zone->passive_delay);
+		jiffies_to_msecs(thermal->zone->passive_delay_jiffies));
 
 	ret = platform_get_irq_byname(pdev, "THERMAL");
 	if (ret < 0) {
drivers/thermal/gov_power_allocator.c +1 -1
index 7a4170a0b51f..f8c3d1e40b86 100644
@@ -258,7 +258,7 @@ static u32 pid_controller(struct thermal_zone_device *tz,
 	 * power being applied, slowing down the controller)
 	 */
 	d = mul_frac(tz->tzp->k_d, err - params->prev_err);
-	d = div_frac(d, tz->passive_delay);
+	d = div_frac(d, jiffies_to_msecs(tz->passive_delay_jiffies));
 	params->prev_err = err;
 
 	power_range = p + i + d;
drivers/thermal/thermal_core.c +1 -3
index d96c515af3cb..b2615449b18f 100644
@@ -313,7 +313,7 @@ static void monitor_thermal_zone(struct thermal_zone_device *tz)
 
 	if (!stop && tz->passive)
 		thermal_zone_device_set_polling(tz, tz->passive_delay_jiffies);
-	else if (!stop && tz->polling_delay)
+	else if (!stop && tz->polling_delay_jiffies)
 		thermal_zone_device_set_polling(tz, tz->polling_delay_jiffies);
 	else
 		thermal_zone_device_set_polling(tz, 0);
@@ -1307,8 +1307,6 @@ thermal_zone_device_register(const char *type, int trips, int mask,
 	tz->device.class = &thermal_class;
 	tz->devdata = devdata;
 	tz->trips = trips;
-	tz->passive_delay = passive_delay;
-	tz->polling_delay = polling_delay;
 
 	thermal_set_delay_jiffies(&tz->passive_delay_jiffies, passive_delay);
 	thermal_set_delay_jiffies(&tz->polling_delay_jiffies, polling_delay);
drivers/thermal/ti-soc-thermal/ti-thermal-common.c +4 -2
index 2ce4b19f312a..f84375865c97 100644
@@ -166,6 +166,7 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id,
 			     char *domain)
 {
 	struct ti_thermal_data *data;
+	int interval;
 
 	data = ti_bandgap_get_sensor_data(bgp, id);
 
@@ -183,9 +184,10 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id,
 		return PTR_ERR(data->ti_thermal);
 	}
 
+	interval = jiffies_to_msecs(data->ti_thermal->polling_delay_jiffies);
+
 	ti_bandgap_set_sensor_data(bgp, id, data);
-	ti_bandgap_write_update_interval(bgp, data->sensor_id,
-					data->ti_thermal->polling_delay);
+	ti_bandgap_write_update_interval(bgp, data->sensor_id, interval);
 
 	return 0;
 }
include/linux/thermal.h +0 -7
index d1b82c70de69..1e686404951b 100644
@@ -115,13 +115,8 @@ struct thermal_cooling_device {
  * @devdata:	private pointer for device private data
  * @trips:	number of trip points the thermal zone supports
  * @trips_disabled;	bitmap for disabled trips
- * @passive_delay:	number of milliseconds to wait between polls when
- *			performing passive cooling.
  * @passive_delay_jiffies: number of jiffies to wait between polls when
  *			performing passive cooling.
- * @polling_delay:	number of milliseconds to wait between polls when
- *			checking whether trip points have been crossed (0 for
- *			interrupt driven systems)
  * @polling_delay_jiffies: number of jiffies to wait between polls when
  *			checking whether trip points have been crossed (0 for
  *			interrupt driven systems)
@@ -162,8 +157,6 @@ struct thermal_zone_device {
 	unsigned long trips_disabled;	/* bitmap for disabled trips */
 	unsigned long passive_delay_jiffies;
 	unsigned long polling_delay_jiffies;
-	int passive_delay;
-	int polling_delay;
 	int temperature;
 	int last_temperature;
 	int emul_temperature;
#10 lore raw

Re: [PATCH v2 3/3] thermal/core: Remove ms based delay fields

Quoted 8 lines · Hans de Goede

Hi Daniel,

Quoted 5 lines · Daniel Lezcano

The code does no longer use the ms unit based fields to set the delays as they are replaced by the jiffies.

Remove them and replace their user to use the jiffies version instead.

Quoted 8 lines
Quoted 3 lines

I assume that you will merge this through the thermal tree, here is my ack for doing so for the pdx86 bits:

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
#11 lore raw

RE: [PATCH v2 3/3] thermal/core: Remove ms based delay fields

In reply to Daniel Lezcano
Quoted 8 lines · Daniel Lezcano

The code does no longer use the ms unit based fields to set the delays as they are replaced by the jiffies.

Remove them and replace their user to use the jiffies version instead.

For DA9062: Reviewed-by: Adam Thomson <[email protected]>

#12 lore raw

Re: [PATCH v2 3/3] thermal/core: Remove ms based delay fields

Quoted 5 lines · Adam Thomson
Quoted 3 lines · Daniel Lezcano

The code does no longer use the ms unit based fields to set the delays as they are replaced by the jiffies.

Quoted 7 lines
Quoted 5 lines

Remove them and replace their user to use the jiffies version instead.

For DA9062: Reviewed-by: Adam Thomson <[email protected]>

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
#13 lore raw

[thermal: thermal/next] thermal/core: Remove ms based delay fields

In reply to Daniel Lezcano
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:     b39d2dd5b5ed08d15711aefd5afd72bd87387c64
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//b39d2dd5b5ed08d15711aefd5afd72bd87387c64
Author:        Daniel Lezcano <[email protected]>
AuthorDate:    Wed, 16 Dec 2020 23:03:37 +01:00
Committer:     Daniel Lezcano <[email protected]>
CommitterDate: Tue, 19 Jan 2021 22:23:49 +01:00

thermal/core: Remove ms based delay fields

The code does no longer use the ms unit based fields to set the delays as they are replaced by the jiffies.

Remove them and replace their user to use the jiffies version instead.

---
 drivers/platform/x86/acerhdf.c                     | 3 ++-
 drivers/thermal/da9062-thermal.c                   | 4 ++--
 drivers/thermal/gov_power_allocator.c              | 2 +-
 drivers/thermal/thermal_core.c                     | 4 +---
 drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 6 ++++--
 include/linux/thermal.h                            | 7 -------
 6 files changed, 10 insertions(+), 16 deletions(-)
drivers/platform/x86/acerhdf.c +2 -1
index b6aa6e5..6b8b3ab 100644
@@ -336,7 +336,8 @@ static void acerhdf_check_param(struct thermal_zone_device *thermal)
 			pr_notice("interval changed to: %d\n", interval);
 
 		if (thermal)
-			thermal->polling_delay = interval*1000;
+			thermal->polling_delay_jiffies =
+				round_jiffies(msecs_to_jiffies(interval * 1000));
 
 		prev_interval = interval;
 	}
drivers/thermal/da9062-thermal.c +2 -2
index 4d74994..180edec 100644
@@ -95,7 +95,7 @@ static void da9062_thermal_poll_on(struct work_struct *work)
 		thermal_zone_device_update(thermal->zone,
 					   THERMAL_EVENT_UNSPECIFIED);
 
-		delay = msecs_to_jiffies(thermal->zone->passive_delay);
+		delay = thermal->zone->passive_delay_jiffies;
 		queue_delayed_work(system_freezable_wq, &thermal->work, delay);
 		return;
 	}
@@ -245,7 +245,7 @@ static int da9062_thermal_probe(struct platform_device *pdev)
 
 	dev_dbg(&pdev->dev,
 		"TJUNC temperature polling period set at %d ms\n",
-		thermal->zone->passive_delay);
+		jiffies_to_msecs(thermal->zone->passive_delay_jiffies));
 
 	ret = platform_get_irq_byname(pdev, "THERMAL");
 	if (ret < 0) {
drivers/thermal/gov_power_allocator.c +1 -1
index 7a4170a..f8c3d1e 100644
@@ -258,7 +258,7 @@ static u32 pid_controller(struct thermal_zone_device *tz,
 	 * power being applied, slowing down the controller)
 	 */
 	d = mul_frac(tz->tzp->k_d, err - params->prev_err);
-	d = div_frac(d, tz->passive_delay);
+	d = div_frac(d, jiffies_to_msecs(tz->passive_delay_jiffies));
 	params->prev_err = err;
 
 	power_range = p + i + d;
drivers/thermal/thermal_core.c +1 -3
index d96c515..b261544 100644
@@ -313,7 +313,7 @@ static void monitor_thermal_zone(struct thermal_zone_device *tz)
 
 	if (!stop && tz->passive)
 		thermal_zone_device_set_polling(tz, tz->passive_delay_jiffies);
-	else if (!stop && tz->polling_delay)
+	else if (!stop && tz->polling_delay_jiffies)
 		thermal_zone_device_set_polling(tz, tz->polling_delay_jiffies);
 	else
 		thermal_zone_device_set_polling(tz, 0);
@@ -1307,8 +1307,6 @@ thermal_zone_device_register(const char *type, int trips, int mask,
 	tz->device.class = &thermal_class;
 	tz->devdata = devdata;
 	tz->trips = trips;
-	tz->passive_delay = passive_delay;
-	tz->polling_delay = polling_delay;
 
 	thermal_set_delay_jiffies(&tz->passive_delay_jiffies, passive_delay);
 	thermal_set_delay_jiffies(&tz->polling_delay_jiffies, polling_delay);
drivers/thermal/ti-soc-thermal/ti-thermal-common.c +4 -2
index 2ce4b19..f843758 100644
@@ -166,6 +166,7 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id,
 			     char *domain)
 {
 	struct ti_thermal_data *data;
+	int interval;
 
 	data = ti_bandgap_get_sensor_data(bgp, id);
 
@@ -183,9 +184,10 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id,
 		return PTR_ERR(data->ti_thermal);
 	}
 
+	interval = jiffies_to_msecs(data->ti_thermal->polling_delay_jiffies);
+
 	ti_bandgap_set_sensor_data(bgp, id, data);
-	ti_bandgap_write_update_interval(bgp, data->sensor_id,
-					data->ti_thermal->polling_delay);
+	ti_bandgap_write_update_interval(bgp, data->sensor_id, interval);
 
 	return 0;
 }
include/linux/thermal.h +0 -7
index d1b82c7..1e68640 100644
@@ -115,13 +115,8 @@ struct thermal_cooling_device {
  * @devdata:	private pointer for device private data
  * @trips:	number of trip points the thermal zone supports
  * @trips_disabled;	bitmap for disabled trips
- * @passive_delay:	number of milliseconds to wait between polls when
- *			performing passive cooling.
  * @passive_delay_jiffies: number of jiffies to wait between polls when
  *			performing passive cooling.
- * @polling_delay:	number of milliseconds to wait between polls when
- *			checking whether trip points have been crossed (0 for
- *			interrupt driven systems)
  * @polling_delay_jiffies: number of jiffies to wait between polls when
  *			checking whether trip points have been crossed (0 for
  *			interrupt driven systems)
@@ -162,8 +157,6 @@ struct thermal_zone_device {
 	unsigned long trips_disabled;	/* bitmap for disabled trips */
 	unsigned long passive_delay_jiffies;
 	unsigned long polling_delay_jiffies;
-	int passive_delay;
-	int polling_delay;
 	int temperature;
 	int last_temperature;
 	int emul_temperature;
Reviewed-by on v2 1/3
#14 lore raw
In reply to Daniel Lezcano
Quoted 9 lines · Daniel Lezcano

The delays are stored in ms units and when the polling function is called this delay is converted into jiffies at each call.

Instead of doing the conversion again and again, compute the jiffies at init time and use the value directly when setting the polling.

Quoted 6 lines
---
  drivers/thermal/thermal_core.c    | 3 +++
  drivers/thermal/thermal_core.h    | 1 +
  drivers/thermal/thermal_helpers.c | 7 +++++++
  include/linux/thermal.h           | 7 +++++++
  4 files changed, 18 insertions(+)
Quoted 74 lines
drivers/thermal/thermal_core.c +3 -0
index bcc2ea4f5482..2c41d4a0923f 100644
@@ -1315,6 +1315,9 @@ thermal_zone_device_register(const char *type, int trips, int mask,
  	tz->passive_delay = passive_delay;
  	tz->polling_delay = polling_delay;
 
+	thermal_set_delay_jiffies(&tz->passive_delay_jiffies, passive_delay);
+	thermal_set_delay_jiffies(&tz->polling_delay_jiffies, polling_delay);
+
  	/* sys I/F */
  	/* Add nodes that are always present via .groups */
  	result = thermal_zone_create_device_groups(tz, mask);
drivers/thermal/thermal_core.h +1 -0
index e50c6b2909fe..90f9a80c8b23 100644
@@ -123,6 +123,7 @@ int thermal_build_list_of_policies(char *buf);
 
  /* Helpers */
  void thermal_zone_set_trips(struct thermal_zone_device *tz);
+void thermal_set_delay_jiffies(unsigned long *delay_jiffies, int delay_ms);
 
  /* sysfs I/F */
  int thermal_zone_create_device_groups(struct thermal_zone_device *, int);
drivers/thermal/thermal_helpers.c +7 -0
index c94bc824e5d3..7f50f412e02a 100644
@@ -175,6 +175,13 @@ void thermal_zone_set_trips(struct thermal_zone_device *tz)
  	mutex_unlock(&tz->lock);
  }
 
+void thermal_set_delay_jiffies(unsigned long *delay_jiffies, int delay_ms)
+{
+	*delay_jiffies = msecs_to_jiffies(delay_ms);
+	if (delay_ms > 1000)
+		*delay_jiffies = round_jiffies(*delay_jiffies);
+}
+
  static void thermal_cdev_set_cur_state(struct thermal_cooling_device *cdev,
  				       int target)
  {
include/linux/thermal.h +7 -0
index 060a2160add4..d1b82c70de69 100644
@@ -117,9 +117,14 @@ struct thermal_cooling_device {
   * @trips_disabled;	bitmap for disabled trips
   * @passive_delay:	number of milliseconds to wait between polls when
   *			performing passive cooling.
+ * @passive_delay_jiffies: number of jiffies to wait between polls when
+ *			performing passive cooling.
   * @polling_delay:	number of milliseconds to wait between polls when
   *			checking whether trip points have been crossed (0 for
   *			interrupt driven systems)
+ * @polling_delay_jiffies: number of jiffies to wait between polls when
+ *			checking whether trip points have been crossed (0 for
+ *			interrupt driven systems)
   * @temperature:	current temperature.  This is only for core code,
   *			drivers should use thermal_zone_get_temp() to get the
   *			current temperature
@@ -155,6 +160,8 @@ struct thermal_zone_device {
  	void *devdata;
  	int trips;
  	unsigned long trips_disabled;	/* bitmap for disabled trips */
+	unsigned long passive_delay_jiffies;
+	unsigned long polling_delay_jiffies;
  	int passive_delay;
  	int polling_delay;
  	int temperature;
Signature · 2 lines
Warm Regards
Thara
#15 lore raw
In reply to Daniel Lezcano
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:     17d399cd9c8936909bc8936a5837b6da9af9c29e
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//17d399cd9c8936909bc8936a5837b6da9af9c29e
Author:        Daniel Lezcano <[email protected]>
AuthorDate:    Wed, 16 Dec 2020 23:03:35 +01:00
Committer:     Daniel Lezcano <[email protected]>
CommitterDate: Tue, 19 Jan 2021 22:23:38 +01:00

thermal/core: Precompute the delays from msecs to jiffies

The delays are stored in ms units and when the polling function is called this delay is converted into jiffies at each call.

Instead of doing the conversion again and again, compute the jiffies at init time and use the value directly when setting the polling.

---
 drivers/thermal/thermal_core.c    | 3 +++
 drivers/thermal/thermal_core.h    | 1 +
 drivers/thermal/thermal_helpers.c | 7 +++++++
 include/linux/thermal.h           | 7 +++++++
 4 files changed, 18 insertions(+)
drivers/thermal/thermal_core.c +3 -0
index bcc2ea4..2c41d4a 100644
@@ -1315,6 +1315,9 @@ thermal_zone_device_register(const char *type, int trips, int mask,
 	tz->passive_delay = passive_delay;
 	tz->polling_delay = polling_delay;
 
+	thermal_set_delay_jiffies(&tz->passive_delay_jiffies, passive_delay);
+	thermal_set_delay_jiffies(&tz->polling_delay_jiffies, polling_delay);
+
 	/* sys I/F */
 	/* Add nodes that are always present via .groups */
 	result = thermal_zone_create_device_groups(tz, mask);
drivers/thermal/thermal_core.h +1 -0
index e50c6b2..90f9a80 100644
@@ -123,6 +123,7 @@ int thermal_build_list_of_policies(char *buf);
 
 /* Helpers */
 void thermal_zone_set_trips(struct thermal_zone_device *tz);
+void thermal_set_delay_jiffies(unsigned long *delay_jiffies, int delay_ms);
 
 /* sysfs I/F */
 int thermal_zone_create_device_groups(struct thermal_zone_device *, int);
drivers/thermal/thermal_helpers.c +7 -0
index c94bc82..7f50f41 100644
@@ -175,6 +175,13 @@ exit:
 	mutex_unlock(&tz->lock);
 }
 
+void thermal_set_delay_jiffies(unsigned long *delay_jiffies, int delay_ms)
+{
+	*delay_jiffies = msecs_to_jiffies(delay_ms);
+	if (delay_ms > 1000)
+		*delay_jiffies = round_jiffies(*delay_jiffies);
+}
+
 static void thermal_cdev_set_cur_state(struct thermal_cooling_device *cdev,
 				       int target)
 {
include/linux/thermal.h +7 -0
index 060a216..d1b82c7 100644
@@ -117,9 +117,14 @@ struct thermal_cooling_device {
  * @trips_disabled;	bitmap for disabled trips
  * @passive_delay:	number of milliseconds to wait between polls when
  *			performing passive cooling.
+ * @passive_delay_jiffies: number of jiffies to wait between polls when
+ *			performing passive cooling.
  * @polling_delay:	number of milliseconds to wait between polls when
  *			checking whether trip points have been crossed (0 for
  *			interrupt driven systems)
+ * @polling_delay_jiffies: number of jiffies to wait between polls when
+ *			checking whether trip points have been crossed (0 for
+ *			interrupt driven systems)
  * @temperature:	current temperature.  This is only for core code,
  *			drivers should use thermal_zone_get_temp() to get the
  *			current temperature
@@ -155,6 +160,8 @@ struct thermal_zone_device {
 	void *devdata;
 	int trips;
 	unsigned long trips_disabled;	/* bitmap for disabled trips */
+	unsigned long passive_delay_jiffies;
+	unsigned long polling_delay_jiffies;
 	int passive_delay;
 	int polling_delay;
 	int temperature;