Merge "drivers: thermal-core: Queue thermal zone update post suspend" (4e64e456) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/thermal/thermal_core.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -522,6 +522,7 @@ int thermal_zone_get_temp(struct thermal_zone_device tz, int temp)
		if (!ret && *temp < crit_temp)
		*temp = tz->emul_temperature;
		}
		trace_thermal_query_temp(tz, *temp);
		mutex_unlock(&tz->lock);
		exit:
		return ret;
		@@ -2586,9 +2587,11 @@ static int thermal_pm_notify(struct notifier_block *nb,
		case PM_POST_SUSPEND:
		atomic_set(&in_suspend, 0);
		list_for_each_entry(tz, &thermal_tz_list, node) {
		mutex_lock(&tz->lock);
		thermal_zone_device_reset(tz);
		thermal_zone_device_update(tz,
		THERMAL_EVENT_UNSPECIFIED);
		mod_delayed_work(system_freezable_power_efficient_wq,
		&tz->poll_queue, 0);
		mutex_unlock(&tz->lock);
		}
		break;
		default:

+23 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,29 @@ TRACE_DEFINE_ENUM(THERMAL_TRIP_ACTIVE);
		{ THERMAL_TRIP_PASSIVE, "PASSIVE"}, \
		{ THERMAL_TRIP_ACTIVE, "ACTIVE"})

		TRACE_EVENT(thermal_query_temp,

		TP_PROTO(struct thermal_zone_device *tz, int temp),

		TP_ARGS(tz, temp),

		TP_STRUCT__entry(
		__string(thermal_zone, tz->type)
		__field(int, id)
		__field(int, temp)
		),

		TP_fast_assign(
		__assign_str(thermal_zone, tz->type);
		__entry->id = tz->id;
		__entry->temp = temp;
		),

		TP_printk("thermal_zone=%s id=%d temp=%d",
		__get_str(thermal_zone), __entry->id,
		__entry->temp)
		);

		TRACE_EVENT(thermal_temperature,

		TP_PROTO(struct thermal_zone_device *tz),