Skip to contentSkip to conversation

thermal/core: Rename passive_delay and polling_delay with units

PATCH In review Daniel Lezcano 2 participants 9 messages Dec 7, 2020 – Dec 10, 2020

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

PATCH v2 1/4 thermal/core: Rename passive_delay and polling_delay with units

The input unit used by the thermal framework is the msec but it uses the jiffies to set the timers.

As it is stored in the thermal zone device structure, everytime the timer is setup at each polling interval, the msecs to jiffies conversion happens. The jiffies is the unit the thermal framework is using, so keeping it under the jiffies instead of msecs will save some pointless conversion.

Set the scene to directly store the delays under their jiffies form by adding to the variable name the 'ms' suffix.

---
 drivers/platform/x86/acerhdf.c                   |  2 +-
 drivers/thermal/da9062-thermal.c                 |  4 ++--
 drivers/thermal/gov_power_allocator.c            |  2 +-
 drivers/thermal/thermal_core.c                   | 10 +++++-----
 drivers/thermal/thermal_of.c                     | 16 ++++++++--------
 drivers/thermal/thermal_sysfs.c                  |  6 +++---
 .../thermal/ti-soc-thermal/ti-thermal-common.c   |  2 +-
 include/linux/thermal.h                          |  8 ++++----
 8 files changed, 25 insertions(+), 25 deletions(-)
drivers/platform/x86/acerhdf.c +1 -1
index b6aa6e5514f4..7b26f601b407 100644
@@ -336,7 +336,7 @@ 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_ms = interval*1000;
 
 		prev_interval = interval;
 	}
drivers/thermal/da9062-thermal.c +2 -2
index 4d74994f160a..ebb3d0b4a5be 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 = msecs_to_jiffies(thermal->zone->passive_delay_ms);
 		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);
+		thermal->zone->passive_delay_ms);
 
 	ret = platform_get_irq_byname(pdev, "THERMAL");
 	if (ret < 0) {
drivers/thermal/gov_power_allocator.c +1 -1
index 7a4170a0b51f..f7a663f698d4 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, tz->passive_delay_ms);
 	params->prev_err = err;
 
 	power_range = p + i + d;
drivers/thermal/thermal_core.c +5 -5
index 1bd23ff2247b..5b500d72aab4 100644
@@ -317,9 +317,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);
-	else if (!stop && tz->polling_delay)
-		thermal_zone_device_set_polling(tz, tz->polling_delay);
+		thermal_zone_device_set_polling(tz, tz->passive_delay_ms);
+	else if (!stop && tz->polling_delay_ms)
+		thermal_zone_device_set_polling(tz, tz->polling_delay_ms);
 	else
 		thermal_zone_device_set_polling(tz, 0);
 
@@ -1340,8 +1340,8 @@ 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;
+	tz->passive_delay_ms = passive_delay;
+	tz->polling_delay_ms = polling_delay;
 
 	/* sys I/F */
 	/* Add nodes that are always present via .groups */
drivers/thermal/thermal_of.c +8 -8
index 69ef12f852b7..c01248e48c09 100644
@@ -51,8 +51,8 @@ struct __thermal_bind_params {
 
 /**
  * struct __thermal_zone - internal representation of a thermal zone
- * @passive_delay: polling interval while passive cooling is activated
- * @polling_delay: zone polling interval
+ * @passive_delay_ms: polling interval while passive cooling is activated
+ * @polling_delay_ms: zone polling interval
  * @slope: slope of the temperature adjustment curve
  * @offset: offset of the temperature adjustment curve
  * @ntrips: number of trip points
@@ -64,8 +64,8 @@ struct __thermal_bind_params {
  */
 
 struct __thermal_zone {
-	int passive_delay;
-	int polling_delay;
+	int passive_delay_ms;
+	int polling_delay_ms;
 	int slope;
 	int offset;
 
@@ -865,14 +865,14 @@ __init *thermal_of_build_thermal_zone(struct device_node *np)
 		pr_err("%pOFn: missing polling-delay-passive property\n", np);
 		goto free_tz;
 	}
-	tz->passive_delay = prop;
+	tz->passive_delay_ms = prop;
 
 	ret = of_property_read_u32(np, "polling-delay", &prop);
 	if (ret < 0) {
 		pr_err("%pOFn: missing polling-delay property\n", np);
 		goto free_tz;
 	}
-	tz->polling_delay = prop;
+	tz->polling_delay_ms = prop;
 
 	/*
 	 * REVIST: for now, the thermal framework supports only
@@ -1085,8 +1085,8 @@ int __init of_parse_thermal_zones(void)
 		zone = thermal_zone_device_register(child->name, tz->ntrips,
 						    mask, tz,
 						    ops, tzp,
-						    tz->passive_delay,
-						    tz->polling_delay);
+						    tz->passive_delay_ms,
+						    tz->polling_delay_ms);
 		if (IS_ERR(zone)) {
 			pr_err("Failed to build %pOFn zone %ld\n", child,
 			       PTR_ERR(zone));
drivers/thermal/thermal_sysfs.c +3 -3
index 0866e949339b..f465462d8aa1 100644
@@ -233,12 +233,12 @@ passive_store(struct device *dev, struct device_attribute *attr,
 		return -EINVAL;
 
 	if (state && !tz->forced_passive) {
-		if (!tz->passive_delay)
-			tz->passive_delay = 1000;
+		if (!tz->passive_delay_ms)
+			tz->passive_delay_ms = 1000;
 		thermal_zone_device_rebind_exception(tz, "Processor",
 						     sizeof("Processor"));
 	} else if (!state && tz->forced_passive) {
-		tz->passive_delay = 0;
+		tz->passive_delay_ms = 0;
 		thermal_zone_device_unbind_exception(tz, "Processor",
 						     sizeof("Processor"));
 	}
drivers/thermal/ti-soc-thermal/ti-thermal-common.c +1 -1
index 2ce4b19f312a..4baff19e1142 100644
@@ -185,7 +185,7 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id,
 
 	ti_bandgap_set_sensor_data(bgp, id, data);
 	ti_bandgap_write_update_interval(bgp, data->sensor_id,
-					data->ti_thermal->polling_delay);
+					data->ti_thermal->polling_delay_ms);
 
 	return 0;
 }
include/linux/thermal.h +4 -4
index d07ea27e72a9..230d451bf335 100644
@@ -116,9 +116,9 @@ 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
+ * @passive_delay_ms:	number of milliseconds to wait between polls when
  *			performing passive cooling.
- * @polling_delay:	number of milliseconds to wait between polls when
+ * @polling_delay_ms:	number of milliseconds 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,
@@ -159,8 +159,8 @@ struct thermal_zone_device {
 	void *devdata;
 	int trips;
 	unsigned long trips_disabled;	/* bitmap for disabled trips */
-	int passive_delay;
-	int polling_delay;
+	int passive_delay_ms;
+	int polling_delay_ms;
 	int temperature;
 	int last_temperature;
 	int emul_temperature;
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 2/4 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  |  5 +++--
 drivers/thermal/thermal_core.h  | 18 ++++++++++++++++++
 drivers/thermal/thermal_sysfs.c |  4 ++--
 include/linux/thermal.h         |  7 +++++++
 4 files changed, 30 insertions(+), 4 deletions(-)
drivers/thermal/thermal_core.c +3 -2
index 5b500d72aab4..08c6e4e36896 100644
@@ -1340,8 +1340,9 @@ 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_ms = passive_delay;
-	tz->polling_delay_ms = polling_delay;
+
+	thermal_zone_set_passive_delay(tz, passive_delay);
+	thermal_zone_set_polling_delay(tz, polling_delay);
 
 	/* sys I/F */
 	/* Add nodes that are always present via .groups */
drivers/thermal/thermal_core.h +18 -0
index 8df600fa7b79..2c9551ed5ef8 100644
@@ -128,6 +128,24 @@ int thermal_build_list_of_policies(char *buf);
 /* Helpers */
 void thermal_zone_set_trips(struct thermal_zone_device *tz);
 
+static inline void thermal_zone_set_passive_delay(
+	struct thermal_zone_device *tz, int delay_ms)
+{
+	tz->passive_delay_ms = delay_ms;
+	tz->passive_delay_jiffies = msecs_to_jiffies(delay_ms);
+	if (delay_ms > 1000)
+		tz->passive_delay_jiffies = round_jiffies(tz->passive_delay_jiffies);
+}
+
+static inline void thermal_zone_set_polling_delay(
+	struct thermal_zone_device *tz, int delay_ms)
+{
+	tz->polling_delay_ms = delay_ms;
+	tz->polling_delay_jiffies = msecs_to_jiffies(delay_ms);
+	if (delay_ms > 1000)
+		tz->polling_delay_jiffies = round_jiffies(tz->polling_delay_jiffies);
+}
+
 /* sysfs I/F */
 int thermal_zone_create_device_groups(struct thermal_zone_device *, int);
 void thermal_zone_destroy_device_groups(struct thermal_zone_device *);
drivers/thermal/thermal_sysfs.c +2 -2
index f465462d8aa1..9598b288a0a1 100644
@@ -234,11 +234,11 @@ passive_store(struct device *dev, struct device_attribute *attr,
 
 	if (state && !tz->forced_passive) {
 		if (!tz->passive_delay_ms)
-			tz->passive_delay_ms = 1000;
+			thermal_zone_set_passive_delay(tz, 1000);
 		thermal_zone_device_rebind_exception(tz, "Processor",
 						     sizeof("Processor"));
 	} else if (!state && tz->forced_passive) {
-		tz->passive_delay_ms = 0;
+		thermal_zone_set_passive_delay(tz, 0);
 		thermal_zone_device_unbind_exception(tz, "Processor",
 						     sizeof("Processor"));
 	}
include/linux/thermal.h +7 -0
index 230d451bf335..5dd9bdb6c6ad 100644
@@ -118,9 +118,14 @@ struct thermal_cooling_device {
  * @trips_disabled;	bitmap for disabled trips
  * @passive_delay_ms:	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_ms:	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
@@ -161,6 +166,8 @@ struct thermal_zone_device {
 	unsigned long trips_disabled;	/* bitmap for disabled trips */
 	int passive_delay_ms;
 	int polling_delay_ms;
+	int passive_delay_jiffies;
+	int polling_delay_jiffies;
 	int temperature;
 	int last_temperature;
 	int emul_temperature;
Signature · 1 line
2.17.1
maintainer Reviewed-by on v2 2/4
#2 lore raw

Re: [PATCH v2 2/4] thermal/core: Precompute the delays from msecs to jiffies

Quoted 8 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.

---

#3 lore raw

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

In reply to Daniel Lezcano

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

---
 drivers/thermal/thermal_core.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
drivers/thermal/thermal_core.c +4 -9
index 08c6e4e36896..16ef5d652d85 100644
@@ -291,14 +291,9 @@ static int __init thermal_register_governors(void)
 static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,
 					    int 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_ms);
+		thermal_zone_device_set_polling(tz, tz->passive_delay_jiffies);
 	else if (!stop && tz->polling_delay_ms)
-		thermal_zone_device_set_polling(tz, tz->polling_delay_ms);
+		thermal_zone_device_set_polling(tz, tz->polling_delay_jiffies);
 	else
 		thermal_zone_device_set_polling(tz, 0);
 
Signature · 1 line
2.17.1
maintainer Reviewed-by on v2 3/4
#4 lore raw

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

Quoted 32 lines · Daniel Lezcano

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

---
  drivers/thermal/thermal_core.c | 13 ++++---------
  1 file changed, 4 insertions(+), 9 deletions(-)
drivers/thermal/thermal_core.c +2 -7
index 08c6e4e36896..16ef5d652d85 100644
@@ -291,14 +291,9 @@ static int __init thermal_register_governors(void)
  static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,
  					    int 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);

drivers/thermal/thermal_core.c static void monitor_thermal_zone(struct thermal_zone_device *tz) · line 320

Quoted 10 lines
drivers/thermal/thermal_core.c +2 -2
 
  	if (!stop && tz->passive)
-		thermal_zone_device_set_polling(tz, tz->passive_delay_ms);
+		thermal_zone_device_set_polling(tz, tz->passive_delay_jiffies);
  	else if (!stop && tz->polling_delay_ms)
-		thermal_zone_device_set_polling(tz, tz->polling_delay_ms);
+		thermal_zone_device_set_polling(tz, tz->polling_delay_jiffies);
  	else
  		thermal_zone_device_set_polling(tz, 0);
 
#5 lore raw

PATCH v2 4/4 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                     | 2 +-
 drivers/thermal/thermal_core.h                     | 2 --
 drivers/thermal/thermal_sysfs.c                    | 2 +-
 drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 6 ++++--
 include/linux/thermal.h                            | 7 -------
 8 files changed, 11 insertions(+), 17 deletions(-)
drivers/platform/x86/acerhdf.c +2 -1
index 7b26f601b407..b7dbcf6be13e 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_ms = interval*1000;
+			thermal->polling_delay_jiffies =
+				msecs_to_jiffies(interval * 1000);
 
 		prev_interval = interval;
 	}
drivers/thermal/da9062-thermal.c +2 -2
index ebb3d0b4a5be..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_ms);
+		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_ms);
+		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 f7a663f698d4..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_ms);
+	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 16ef5d652d85..aff15c6b1c61 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_ms)
+	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.h +0 -2
index 2c9551ed5ef8..5baa308ee7a5 100644
@@ -131,7 +131,6 @@ void thermal_zone_set_trips(struct thermal_zone_device *tz);
 static inline void thermal_zone_set_passive_delay(
 	struct thermal_zone_device *tz, int delay_ms)
 {
-	tz->passive_delay_ms = delay_ms;
 	tz->passive_delay_jiffies = msecs_to_jiffies(delay_ms);
 	if (delay_ms > 1000)
 		tz->passive_delay_jiffies = round_jiffies(tz->passive_delay_jiffies);
@@ -140,7 +139,6 @@ static inline void thermal_zone_set_passive_delay(
 static inline void thermal_zone_set_polling_delay(
 	struct thermal_zone_device *tz, int delay_ms)
 {
-	tz->polling_delay_ms = delay_ms;
 	tz->polling_delay_jiffies = msecs_to_jiffies(delay_ms);
 	if (delay_ms > 1000)
 		tz->polling_delay_jiffies = round_jiffies(tz->polling_delay_jiffies);
drivers/thermal/thermal_sysfs.c +1 -1
index 9598b288a0a1..8532b1dd0608 100644
@@ -233,7 +233,7 @@ passive_store(struct device *dev, struct device_attribute *attr,
 		return -EINVAL;
 
 	if (state && !tz->forced_passive) {
-		if (!tz->passive_delay_ms)
+		if (!tz->passive_delay_jiffies)
 			thermal_zone_set_passive_delay(tz, 1000);
 		thermal_zone_device_rebind_exception(tz, "Processor",
 						     sizeof("Processor"));
drivers/thermal/ti-soc-thermal/ti-thermal-common.c +4 -2
index 4baff19e1142..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_ms);
+	ti_bandgap_write_update_interval(bgp, data->sensor_id, interval);
 
 	return 0;
 }
include/linux/thermal.h +0 -7
index 5dd9bdb6c6ad..f23a388ded15 100644
@@ -116,13 +116,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_ms:	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_ms:	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)
@@ -164,8 +159,6 @@ struct thermal_zone_device {
 	void *devdata;
 	int trips;
 	unsigned long trips_disabled;	/* bitmap for disabled trips */
-	int passive_delay_ms;
-	int polling_delay_ms;
 	int passive_delay_jiffies;
 	int polling_delay_jiffies;
 	int temperature;
Signature · 1 line
2.17.1
maintainer Reviewed-by on v2 4/4
#6 lore raw

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

Quoted 36 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 ++-
  drivers/thermal/da9062-thermal.c                   | 4 ++--
  drivers/thermal/gov_power_allocator.c              | 2 +-
  drivers/thermal/thermal_core.c                     | 2 +-
  drivers/thermal/thermal_core.h                     | 2 --
  drivers/thermal/thermal_sysfs.c                    | 2 +-
  drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 6 ++++--
  include/linux/thermal.h                            | 7 -------
  8 files changed, 11 insertions(+), 17 deletions(-)
drivers/platform/x86/acerhdf.c +2 -1
index 7b26f601b407..b7dbcf6be13e 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_ms = interval*1000;
+			thermal->polling_delay_jiffies =
+				msecs_to_jiffies(interval * 1000);
 
  		prev_interval = interval;
  	}
drivers/thermal/da9062-thermal.c +0 -0
index ebb3d0b4a5be..180edec34e07 100644

drivers/thermal/da9062-thermal.c static void da9062_thermal_poll_on(struct work_struct *work) · line 98

Quoted 5 lines
drivers/thermal/da9062-thermal.c +1 -1
@@ -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_ms);
+		delay = thermal->zone->passive_delay_jiffies;

We would use rounding down value to full seconds, but I couldn't find any odd values in DT for this devices. So it should be OK.

Quoted 84 lines
drivers/thermal/da9062-thermal.c +1 -1
  		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_ms);
+		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 f7a663f698d4..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_ms);
+	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 16ef5d652d85..aff15c6b1c61 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_ms)
+	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.h +0 -2
index 2c9551ed5ef8..5baa308ee7a5 100644
@@ -131,7 +131,6 @@ void thermal_zone_set_trips(struct thermal_zone_device *tz);
  static inline void thermal_zone_set_passive_delay(
  	struct thermal_zone_device *tz, int delay_ms)
  {
-	tz->passive_delay_ms = delay_ms;
  	tz->passive_delay_jiffies = msecs_to_jiffies(delay_ms);
  	if (delay_ms > 1000)
  		tz->passive_delay_jiffies = round_jiffies(tz->passive_delay_jiffies);
@@ -140,7 +139,6 @@ static inline void thermal_zone_set_passive_delay(
  static inline void thermal_zone_set_polling_delay(
  	struct thermal_zone_device *tz, int delay_ms)
  {
-	tz->polling_delay_ms = delay_ms;
  	tz->polling_delay_jiffies = msecs_to_jiffies(delay_ms);
  	if (delay_ms > 1000)
  		tz->polling_delay_jiffies = round_jiffies(tz->polling_delay_jiffies);
drivers/thermal/thermal_sysfs.c +1 -1
index 9598b288a0a1..8532b1dd0608 100644
@@ -233,7 +233,7 @@ passive_store(struct device *dev, struct device_attribute *attr,
  		return -EINVAL;
 
  	if (state && !tz->forced_passive) {
-		if (!tz->passive_delay_ms)
+		if (!tz->passive_delay_jiffies)
  			thermal_zone_set_passive_delay(tz, 1000);
  		thermal_zone_device_rebind_exception(tz, "Processor",
  						     sizeof("Processor"));
drivers/thermal/ti-soc-thermal/ti-thermal-common.c +1 -0
index 4baff19e1142..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);
 

drivers/thermal/ti-soc-thermal/ti-thermal-common.c int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id, · line 187

Quoted 4 lines
drivers/thermal/ti-soc-thermal/ti-thermal-common.c +1 -0
@@ -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);

Same here, so it should be OK.

Quoted 28 lines
drivers/thermal/ti-soc-thermal/ti-thermal-common.c +2 -2
+
  	ti_bandgap_set_sensor_data(bgp, id, data);
-	ti_bandgap_write_update_interval(bgp, data->sensor_id,
-					data->ti_thermal->polling_delay_ms);
+	ti_bandgap_write_update_interval(bgp, data->sensor_id, interval);
 
  	return 0;
  }
include/linux/thermal.h +0 -5
index 5dd9bdb6c6ad..f23a388ded15 100644
@@ -116,13 +116,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_ms:	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_ms:	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)

include/linux/thermal.h struct thermal_zone_device { · line 164

Quoted 8 lines
include/linux/thermal.h +0 -2
@@ -164,8 +159,6 @@ struct thermal_zone_device {
  	void *devdata;
  	int trips;
  	unsigned long trips_disabled;	/* bitmap for disabled trips */
-	int passive_delay_ms;
-	int polling_delay_ms;
  	int passive_delay_jiffies;
  	int polling_delay_jiffies;
  	int temperature;

LGTM

#7 lore raw
In reply to Daniel Lezcano

Cc'ing missing persons.

Sorry for the inconvenience, just a head up with those trivial changes (1/4 and 4/4).

Quoted 215 lines · Daniel Lezcano

The input unit used by the thermal framework is the msec but it uses the jiffies to set the timers.

As it is stored in the thermal zone device structure, everytime the timer is setup at each polling interval, the msecs to jiffies conversion happens. The jiffies is the unit the thermal framework is using, so keeping it under the jiffies instead of msecs will save some pointless conversion.

Set the scene to directly store the delays under their jiffies form by adding to the variable name the 'ms' suffix.

---
 drivers/platform/x86/acerhdf.c                   |  2 +-
 drivers/thermal/da9062-thermal.c                 |  4 ++--
 drivers/thermal/gov_power_allocator.c            |  2 +-
 drivers/thermal/thermal_core.c                   | 10 +++++-----
 drivers/thermal/thermal_of.c                     | 16 ++++++++--------
 drivers/thermal/thermal_sysfs.c                  |  6 +++---
 .../thermal/ti-soc-thermal/ti-thermal-common.c   |  2 +-
 include/linux/thermal.h                          |  8 ++++----
 8 files changed, 25 insertions(+), 25 deletions(-)
drivers/platform/x86/acerhdf.c +1 -1
index b6aa6e5514f4..7b26f601b407 100644
@@ -336,7 +336,7 @@ 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_ms = interval*1000;
 
 		prev_interval = interval;
 	}
drivers/thermal/da9062-thermal.c +2 -2
index 4d74994f160a..ebb3d0b4a5be 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 = msecs_to_jiffies(thermal->zone->passive_delay_ms);
 		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);
+		thermal->zone->passive_delay_ms);
 
 	ret = platform_get_irq_byname(pdev, "THERMAL");
 	if (ret < 0) {
drivers/thermal/gov_power_allocator.c +1 -1
index 7a4170a0b51f..f7a663f698d4 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, tz->passive_delay_ms);
 	params->prev_err = err;
 
 	power_range = p + i + d;
drivers/thermal/thermal_core.c +5 -5
index 1bd23ff2247b..5b500d72aab4 100644
@@ -317,9 +317,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);
-	else if (!stop && tz->polling_delay)
-		thermal_zone_device_set_polling(tz, tz->polling_delay);
+		thermal_zone_device_set_polling(tz, tz->passive_delay_ms);
+	else if (!stop && tz->polling_delay_ms)
+		thermal_zone_device_set_polling(tz, tz->polling_delay_ms);
 	else
 		thermal_zone_device_set_polling(tz, 0);
 
@@ -1340,8 +1340,8 @@ 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;
+	tz->passive_delay_ms = passive_delay;
+	tz->polling_delay_ms = polling_delay;
 
 	/* sys I/F */
 	/* Add nodes that are always present via .groups */
drivers/thermal/thermal_of.c +8 -8
index 69ef12f852b7..c01248e48c09 100644
@@ -51,8 +51,8 @@ struct __thermal_bind_params {
 
 /**
  * struct __thermal_zone - internal representation of a thermal zone
- * @passive_delay: polling interval while passive cooling is activated
- * @polling_delay: zone polling interval
+ * @passive_delay_ms: polling interval while passive cooling is activated
+ * @polling_delay_ms: zone polling interval
  * @slope: slope of the temperature adjustment curve
  * @offset: offset of the temperature adjustment curve
  * @ntrips: number of trip points
@@ -64,8 +64,8 @@ struct __thermal_bind_params {
  */
 
 struct __thermal_zone {
-	int passive_delay;
-	int polling_delay;
+	int passive_delay_ms;
+	int polling_delay_ms;
 	int slope;
 	int offset;
 
@@ -865,14 +865,14 @@ __init *thermal_of_build_thermal_zone(struct device_node *np)
 		pr_err("%pOFn: missing polling-delay-passive property\n", np);
 		goto free_tz;
 	}
-	tz->passive_delay = prop;
+	tz->passive_delay_ms = prop;
 
 	ret = of_property_read_u32(np, "polling-delay", &prop);
 	if (ret < 0) {
 		pr_err("%pOFn: missing polling-delay property\n", np);
 		goto free_tz;
 	}
-	tz->polling_delay = prop;
+	tz->polling_delay_ms = prop;
 
 	/*
 	 * REVIST: for now, the thermal framework supports only
@@ -1085,8 +1085,8 @@ int __init of_parse_thermal_zones(void)
 		zone = thermal_zone_device_register(child->name, tz->ntrips,
 						    mask, tz,
 						    ops, tzp,
-						    tz->passive_delay,
-						    tz->polling_delay);
+						    tz->passive_delay_ms,
+						    tz->polling_delay_ms);
 		if (IS_ERR(zone)) {
 			pr_err("Failed to build %pOFn zone %ld\n", child,
 			       PTR_ERR(zone));
drivers/thermal/thermal_sysfs.c +3 -3
index 0866e949339b..f465462d8aa1 100644
@@ -233,12 +233,12 @@ passive_store(struct device *dev, struct device_attribute *attr,
 		return -EINVAL;
 
 	if (state && !tz->forced_passive) {
-		if (!tz->passive_delay)
-			tz->passive_delay = 1000;
+		if (!tz->passive_delay_ms)
+			tz->passive_delay_ms = 1000;
 		thermal_zone_device_rebind_exception(tz, "Processor",
 						     sizeof("Processor"));
 	} else if (!state && tz->forced_passive) {
-		tz->passive_delay = 0;
+		tz->passive_delay_ms = 0;
 		thermal_zone_device_unbind_exception(tz, "Processor",
 						     sizeof("Processor"));
 	}
drivers/thermal/ti-soc-thermal/ti-thermal-common.c +1 -1
index 2ce4b19f312a..4baff19e1142 100644
@@ -185,7 +185,7 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id,
 
 	ti_bandgap_set_sensor_data(bgp, id, data);
 	ti_bandgap_write_update_interval(bgp, data->sensor_id,
-					data->ti_thermal->polling_delay);
+					data->ti_thermal->polling_delay_ms);
 
 	return 0;
 }
include/linux/thermal.h +4 -4
index d07ea27e72a9..230d451bf335 100644
@@ -116,9 +116,9 @@ 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
+ * @passive_delay_ms:	number of milliseconds to wait between polls when
  *			performing passive cooling.
- * @polling_delay:	number of milliseconds to wait between polls when
+ * @polling_delay_ms:	number of milliseconds 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,
@@ -159,8 +159,8 @@ struct thermal_zone_device {
 	void *devdata;
 	int trips;
 	unsigned long trips_disabled;	/* bitmap for disabled trips */
-	int passive_delay;
-	int polling_delay;
+	int passive_delay_ms;
+	int polling_delay_ms;
 	int temperature;
 	int last_temperature;
 	int emul_temperature;
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
maintainer Reviewed-by on v2 1/4
#8 lore raw
In reply to Daniel Lezcano
Quoted 8 lines · Daniel Lezcano

The input unit used by the thermal framework is the msec but it uses the jiffies to set the timers.

As it is stored in the thermal zone device structure, everytime the timer is setup at each polling interval, the msecs to jiffies conversion happens. The jiffies is the unit the thermal framework is using, so keeping it under the jiffies instead of msecs will save some pointless conversion.

Make sense

Quoted 6 lines

Set the scene to directly store the delays under their jiffies form by adding to the variable name the 'ms' suffix.

---