Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c379a963 authored by Ram Chandrasekar's avatar Ram Chandrasekar Committed by Manaf Meethalavalappu Pallikunhi
Browse files

drivers: thermal: Evaluate based on trip temperature 



With virtual sensors, temperature reads by different zones at different
time can be different and hence can result in different set of
thresholds. This can lead to a case where we can get interrupt for the
same temperature back to back if the temperature is fluctuating.

To avoid this, allow sensor drivers to read the temperature and provide
that information along when notifying for trip notification. Thermal
framework will now make sure all the thermal zones will use the same
temperature in all thermal zones to evaluate.

Change-Id: I10861be54f0948081a83a1e839d8f9401929c61b
Signed-off-by: default avatarRam Chandrasekar <rkumbako@codeaurora.org>
parent a6346dfb

drivers/thermal/of-thermal.c

+32 −7
Original line number Diff line number Diff line
@@ -560,12 +560,8 @@ int of_thermal_aggregate_trip(struct thermal_zone_device *tz, 
}

EXPORT_SYMBOL(of_thermal_aggregate_trip);



/*

 * of_thermal_handle_trip - Handle thermal trip from sensors

 *

 * @tz: pointer to the primary thermal zone.

 */

void of_thermal_handle_trip(struct thermal_zone_device *tz)

static void handle_thermal_trip(struct thermal_zone_device *tz,

		bool temp_valid, int trip_temp)

{

	struct thermal_zone_device *zone;

	struct __thermal_zone *data = tz->devdata;
@@ -576,8 +572,37 @@ void of_thermal_handle_trip(struct thermal_zone_device *tz) 
		zone = data->tzd;

		if (data->mode == THERMAL_DEVICE_DISABLED)

			continue;

		thermal_zone_device_update(zone, THERMAL_EVENT_UNSPECIFIED);

		if (!temp_valid) {

			thermal_zone_device_update(zone,

				THERMAL_EVENT_UNSPECIFIED);

		} else {

			thermal_zone_device_update_temp(zone,

				THERMAL_EVENT_UNSPECIFIED, trip_temp);

		}

	}

}



/*

 * of_thermal_handle_trip_temp - Handle thermal trip from sensors

 *

 * @tz: pointer to the primary thermal zone.

 * @trip_temp: The temperature

 */

void of_thermal_handle_trip_temp(struct thermal_zone_device *tz,

		int trip_temp)

{

	return handle_thermal_trip(tz, true, trip_temp);

}

EXPORT_SYMBOL(of_thermal_handle_trip_temp);



/*

 * of_thermal_handle_trip - Handle thermal trip from sensors

 *

 * @tz: pointer to the primary thermal zone.

 */

void of_thermal_handle_trip(struct thermal_zone_device *tz)

{

	return handle_thermal_trip(tz, false, 0);

}

EXPORT_SYMBOL(of_thermal_handle_trip);

drivers/thermal/thermal_core.c

+36 −12
Original line number Diff line number Diff line
@@ -438,19 +438,8 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip) 
	trace_thermal_handle_trip(tz, trip);

}



static void update_temperature(struct thermal_zone_device *tz)

static void store_temperature(struct thermal_zone_device *tz, int temp)

{

	int temp, ret;



	ret = thermal_zone_get_temp(tz, &temp);

	if (ret) {

		if (ret != -EAGAIN)

			dev_warn(&tz->device,

				 "failed to read out thermal zone (%d)\n",

				 ret);

		return;

	}



	mutex_lock(&tz->lock);

	tz->last_temperature = tz->temperature;

	tz->temperature = temp;
@@ -466,6 +455,21 @@ static void update_temperature(struct thermal_zone_device *tz) 
			tz->last_temperature, tz->temperature);

}



static void update_temperature(struct thermal_zone_device *tz)

{

	int temp, ret;



	ret = thermal_zone_get_temp(tz, &temp);

	if (ret) {

		if (ret != -EAGAIN)

			dev_warn(&tz->device,

				 "failed to read out thermal zone (%d)\n",

				 ret);

		return;

	}

	store_temperature(tz, temp);

}



static void thermal_zone_device_reset(struct thermal_zone_device *tz)

{

	struct thermal_instance *pos;
@@ -476,6 +480,26 @@ static void thermal_zone_device_reset(struct thermal_zone_device *tz) 
		pos->initialized = false;

}



void thermal_zone_device_update_temp(struct thermal_zone_device *tz,

				enum thermal_notify_event event, int temp)

{

	int count;



	if (atomic_read(&in_suspend))

		return;



	trace_thermal_device_update(tz, event);

	store_temperature(tz, temp);



	thermal_zone_set_trips(tz);



	tz->notify_event = event;



	for (count = 0; count < tz->trips; count++)

		handle_thermal_trip(tz, count);

}

EXPORT_SYMBOL(thermal_zone_device_update_temp);



void thermal_zone_device_update(struct thermal_zone_device *tz,

				enum thermal_notify_event event)

{

drivers/thermal/thermal_core.h

+6 −0
Original line number Diff line number Diff line
@@ -146,6 +146,8 @@ int of_thermal_aggregate_trip(struct thermal_zone_device *tz, 
			      enum thermal_trip_type type,

			      int *low, int *high);

void of_thermal_handle_trip(struct thermal_zone_device *tz);

void of_thermal_handle_trip_temp(struct thermal_zone_device *tz,

					int trip_temp);

#else

static inline int of_parse_thermal_zones(void) { return 0; }

static inline void of_thermal_destroy_zones(void) { }
@@ -172,6 +174,10 @@ static inline int of_thermal_aggregate_trip(struct thermal_zone_device *tz, 
static inline

void of_thermal_handle_trip(struct thermal_zone_device *tz)

{ }

static inline

void of_thermal_handle_trip_temp(struct thermal_zone_device *tz,

					int trip_temp)

{ }

#endif



#endif /* __THERMAL_CORE_H__ */

include/linux/thermal.h

+6 −0
Original line number Diff line number Diff line
@@ -512,6 +512,8 @@ int thermal_zone_unbind_cooling_device(struct thermal_zone_device *, int, 
				       struct thermal_cooling_device *);

void thermal_zone_device_update(struct thermal_zone_device *,

				enum thermal_notify_event);

void thermal_zone_device_update_temp(struct thermal_zone_device *tz,

				enum thermal_notify_event event, int temp);

void thermal_zone_set_trips(struct thermal_zone_device *);



struct thermal_cooling_device *thermal_cooling_device_register(char *, void *,
@@ -565,6 +567,10 @@ static inline int thermal_zone_unbind_cooling_device( 
static inline void thermal_zone_device_update(struct thermal_zone_device *tz,

					      enum thermal_notify_event event)

{ }

static inline void thermal_zone_device_update_temp(

		struct thermal_zone_device *tz, enum thermal_notify_event event,

		int temp)

{ }

static inline void thermal_zone_set_trips(struct thermal_zone_device *tz)

{ }

static inline struct thermal_cooling_device *