Commit daeeb032 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

thermal: core: Move threshold out of struct thermal_trip 



The threshold field in struct thermal_trip is only used internally by
the thermal core and it is better to prevent drivers from misusing it.
It also takes some space unnecessarily in the trip tables passed by
drivers to the core during thermal zone registration.

For this reason, introduce struct thermal_trip_desc as a wrapper around
struct thermal_trip, move the threshold field directly into it and make
the thermal core store struct thermal_trip_desc objects in the internal
thermal zone trip tables.  Adjust all of the code using trip tables in
the thermal core accordingly.

No intentional functional impact.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarLukasz Luba <lukasz.luba@arm.com>
parent 053b852c

drivers/thermal/gov_fair_share.c

+5 −2
Original line number Diff line number Diff line
@@ -17,10 +17,13 @@ 


static int get_trip_level(struct thermal_zone_device *tz)

{

	const struct thermal_trip *trip, *level_trip = NULL;

	const struct thermal_trip *level_trip = NULL;

	const struct thermal_trip_desc *td;

	int trip_level = -1;



	for_each_trip(tz, trip) {

	for_each_trip_desc(tz, td) {

		const struct thermal_trip *trip = &td->trip;



		if (trip->temperature >= tz->temperature)

			continue;

drivers/thermal/gov_power_allocator.c

+4 −2
Original line number Diff line number Diff line
@@ -496,9 +496,11 @@ static void get_governor_trips(struct thermal_zone_device *tz, 
	const struct thermal_trip *first_passive = NULL;

	const struct thermal_trip *last_passive = NULL;

	const struct thermal_trip *last_active = NULL;

	const struct thermal_trip *trip;

	const struct thermal_trip_desc *td;



	for_each_trip_desc(tz, td) {

		const struct thermal_trip *trip = &td->trip;



	for_each_trip(tz, trip) {

		switch (trip->type) {

		case THERMAL_TRIP_PASSIVE:

			if (!first_passive) {

drivers/thermal/thermal_core.c

+27 −19
Original line number Diff line number Diff line
@@ -361,17 +361,19 @@ static void handle_critical_trips(struct thermal_zone_device *tz, 
}



static void handle_thermal_trip(struct thermal_zone_device *tz,

				struct thermal_trip *trip)

				struct thermal_trip_desc *td)

{

	const struct thermal_trip *trip = &td->trip;



	if (trip->temperature == THERMAL_TEMP_INVALID)

		return;



	if (tz->last_temperature == THERMAL_TEMP_INVALID) {

		/* Initialization. */

		trip->threshold = trip->temperature;

		if (tz->temperature >= trip->threshold)

			trip->threshold -= trip->hysteresis;

	} else if (tz->last_temperature < trip->threshold) {

		td->threshold = trip->temperature;

		if (tz->temperature >= td->threshold)

			td->threshold -= trip->hysteresis;

	} else if (tz->last_temperature < td->threshold) {

		/*

		 * The trip threshold is equal to the trip temperature, unless

		 * the latter has changed in the meantime.  In either case,
@@ -382,9 +384,9 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, 
		if (tz->temperature >= trip->temperature) {

			thermal_notify_tz_trip_up(tz, trip);

			thermal_debug_tz_trip_up(tz, trip);

			trip->threshold = trip->temperature - trip->hysteresis;

			td->threshold = trip->temperature - trip->hysteresis;

		} else {

			trip->threshold = trip->temperature;

			td->threshold = trip->temperature;

		}

	} else {

		/*
@@ -400,9 +402,9 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, 
		if (tz->temperature < trip->temperature - trip->hysteresis) {

			thermal_notify_tz_trip_down(tz, trip);

			thermal_debug_tz_trip_down(tz, trip);

			trip->threshold = trip->temperature;

			td->threshold = trip->temperature;

		} else {

			trip->threshold = trip->temperature - trip->hysteresis;

			td->threshold = trip->temperature - trip->hysteresis;

		}

	}
@@ -458,7 +460,7 @@ static void thermal_zone_device_init(struct thermal_zone_device *tz) 
void __thermal_zone_device_update(struct thermal_zone_device *tz,

				  enum thermal_notify_event event)

{

	struct thermal_trip *trip;

	struct thermal_trip_desc *td;



	if (tz->suspended)

		return;
@@ -472,8 +474,8 @@ void __thermal_zone_device_update(struct thermal_zone_device *tz, 


	tz->notify_event = event;



	for_each_trip(tz, trip)

		handle_thermal_trip(tz, trip);

	for_each_trip_desc(tz, td)

		handle_thermal_trip(tz, td);



	monitor_thermal_zone(tz);

}
@@ -766,7 +768,7 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz, 
	if (trip_index < 0 || trip_index >= tz->num_trips)

		return -EINVAL;



	return thermal_bind_cdev_to_trip(tz, &tz->trips[trip_index], cdev,

	return thermal_bind_cdev_to_trip(tz, &tz->trips[trip_index].trip, cdev,

					 upper, lower, weight);

}

EXPORT_SYMBOL_GPL(thermal_zone_bind_cooling_device);
@@ -825,7 +827,7 @@ int thermal_zone_unbind_cooling_device(struct thermal_zone_device *tz, 
	if (trip_index < 0 || trip_index >= tz->num_trips)

		return -EINVAL;



	return thermal_unbind_cdev_from_trip(tz, &tz->trips[trip_index], cdev);

	return thermal_unbind_cdev_from_trip(tz, &tz->trips[trip_index].trip, cdev);

}

EXPORT_SYMBOL_GPL(thermal_zone_unbind_cooling_device);
@@ -1221,16 +1223,19 @@ static void thermal_set_delay_jiffies(unsigned long *delay_jiffies, int delay_ms 


int thermal_zone_get_crit_temp(struct thermal_zone_device *tz, int *temp)

{

	int i, ret = -EINVAL;

	const struct thermal_trip_desc *td;

	int ret = -EINVAL;



	if (tz->ops.get_crit_temp)

		return tz->ops.get_crit_temp(tz, temp);



	mutex_lock(&tz->lock);



	for (i = 0; i < tz->num_trips; i++) {

		if (tz->trips[i].type == THERMAL_TRIP_CRITICAL) {

			*temp = tz->trips[i].temperature;

	for_each_trip_desc(tz, td) {

		const struct thermal_trip *trip = &td->trip;



		if (trip->type == THERMAL_TRIP_CRITICAL) {

			*temp = trip->temperature;

			ret = 0;

			break;

		}
@@ -1274,7 +1279,9 @@ thermal_zone_device_register_with_trips(const char *type, 
					const struct thermal_zone_params *tzp,

					int passive_delay, int polling_delay)

{

	const struct thermal_trip *trip = trips;

	struct thermal_zone_device *tz;

	struct thermal_trip_desc *td;

	int id;

	int result;

	struct thermal_governor *governor;
@@ -1339,7 +1346,8 @@ thermal_zone_device_register_with_trips(const char *type, 
	tz->device.class = thermal_class;

	tz->devdata = devdata;

	tz->num_trips = num_trips;

	memcpy(tz->trips, trips, num_trips * sizeof(*trips));

	for_each_trip_desc(tz, td)

		td->trip = *trip++;



	thermal_set_delay_jiffies(&tz->passive_delay_jiffies, passive_delay);

	thermal_set_delay_jiffies(&tz->polling_delay_jiffies, polling_delay);

drivers/thermal/thermal_core.h

+5 −2
Original line number Diff line number Diff line
@@ -120,8 +120,11 @@ void thermal_governor_update_tz(struct thermal_zone_device *tz, 
				enum thermal_notify_event reason);



/* Helpers */

#define for_each_trip(__tz, __trip)	\

	for (__trip = __tz->trips; __trip - __tz->trips < __tz->num_trips; __trip++)

#define for_each_trip_desc(__tz, __td)	\

	for (__td = __tz->trips; __td - __tz->trips < __tz->num_trips; __td++)



#define trip_to_trip_desc(__trip)	\

	container_of(__trip, struct thermal_trip_desc, trip)



void __thermal_zone_set_trips(struct thermal_zone_device *tz);

int thermal_zone_trip_id(const struct thermal_zone_device *tz,

drivers/thermal/thermal_debugfs.c

+4 −2
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ static void tze_seq_stop(struct seq_file *s, void *v) 
static int tze_seq_show(struct seq_file *s, void *v)

{

	struct thermal_zone_device *tz = s->private;

	struct thermal_trip *trip;

	struct thermal_trip_desc *td;

	struct tz_episode *tze;

	const char *type;

	int trip_id;
@@ -757,7 +757,9 @@ static int tze_seq_show(struct seq_file *s, void *v) 


	seq_printf(s, "| trip |     type | temp(°mC) | hyst(°mC) |  duration  |  avg(°mC) |  min(°mC) |  max(°mC) |\n");



	for_each_trip(tz, trip) {

	for_each_trip_desc(tz, td) {

		const struct thermal_trip *trip = &td->trip;



		/*

		 * There is no possible mitigation happening at the

		 * critical trip point, so the stats will be always