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

thermal: core: Store zone ops in struct thermal_zone_device 



The current code requires thermal zone creators to pass pointers to
writable ops structures to thermal_zone_device_register_with_trips()
which needs to modify the target struct thermal_zone_device_ops object
if the "critical" operation in it is NULL.

Moreover, the callers of thermal_zone_device_register_with_trips() are
required to hold on to the struct thermal_zone_device_ops object passed
to it until the given thermal zone is unregistered.

Both of these requirements are quite inconvenient, so modify struct
thermal_zone_device to contain struct thermal_zone_device_ops as field and
make thermal_zone_device_register_with_trips() copy the contents of the
struct thermal_zone_device_ops passed to it via a pointer (which can be
const now) to that field.

Also adjust the code using thermal zone ops accordingly and modify
thermal_of_zone_register() to use a local ops variable during
thermal zone registration so ops do not need to be freed in
thermal_of_zone_unregister() any more.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarStanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Reviewed-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent fcbf8780

drivers/thermal/thermal_core.c

+20 −20
Original line number Diff line number Diff line
@@ -356,9 +356,9 @@ static void handle_critical_trips(struct thermal_zone_device *tz, 
	trace_thermal_zone_trip(tz, thermal_zone_trip_id(tz, trip), trip->type);



	if (trip->type == THERMAL_TRIP_CRITICAL)

		tz->ops->critical(tz);

	else if (tz->ops->hot)

		tz->ops->hot(tz);

		tz->ops.critical(tz);

	else if (tz->ops.hot)

		tz->ops.hot(tz);

}



static void handle_thermal_trip(struct thermal_zone_device *tz,
@@ -493,8 +493,8 @@ static int thermal_zone_device_set_mode(struct thermal_zone_device *tz, 
		return ret;

	}



	if (tz->ops->change_mode)

		ret = tz->ops->change_mode(tz, mode);

	if (tz->ops.change_mode)

		ret = tz->ops.change_mode(tz, mode);



	if (!ret)

		tz->mode = mode;
@@ -867,8 +867,8 @@ static void bind_cdev(struct thermal_cooling_device *cdev) 
	struct thermal_zone_device *pos = NULL;



	list_for_each_entry(pos, &thermal_tz_list, node) {

		if (pos->ops->bind) {

			ret = pos->ops->bind(pos, cdev);

		if (pos->ops.bind) {

			ret = pos->ops.bind(pos, cdev);

			if (ret)

				print_bind_err_msg(pos, cdev, ret);

		}
@@ -1184,8 +1184,8 @@ void thermal_cooling_device_unregister(struct thermal_cooling_device *cdev) 


	/* Unbind all thermal zones associated with 'this' cdev */

	list_for_each_entry(tz, &thermal_tz_list, node) {

		if (tz->ops->unbind)

			tz->ops->unbind(tz, cdev);

		if (tz->ops.unbind)

			tz->ops.unbind(tz, cdev);

	}



	mutex_unlock(&thermal_list_lock);
@@ -1199,13 +1199,13 @@ static void bind_tz(struct thermal_zone_device *tz) 
	int ret;

	struct thermal_cooling_device *pos = NULL;



	if (!tz->ops->bind)

	if (!tz->ops.bind)

		return;



	mutex_lock(&thermal_list_lock);



	list_for_each_entry(pos, &thermal_cdev_list, node) {

		ret = tz->ops->bind(tz, pos);

		ret = tz->ops.bind(tz, pos);

		if (ret)

			print_bind_err_msg(tz, pos, ret);

	}
@@ -1224,8 +1224,8 @@ int thermal_zone_get_crit_temp(struct thermal_zone_device *tz, int *temp) 
{

	int i, ret = -EINVAL;



	if (tz->ops->get_crit_temp)

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

	if (tz->ops.get_crit_temp)

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



	mutex_lock(&tz->lock);
@@ -1273,7 +1273,7 @@ thermal_zone_device_register_with_trips(const char *type, 
					const struct thermal_trip *trips,

					int num_trips, int mask,

					void *devdata,

					struct thermal_zone_device_ops *ops,

					const struct thermal_zone_device_ops *ops,

					const struct thermal_zone_params *tzp,

					int passive_delay, int polling_delay)

{
@@ -1348,10 +1348,10 @@ thermal_zone_device_register_with_trips(const char *type, 
	tz->id = id;

	strscpy(tz->type, type, sizeof(tz->type));



	if (!ops->critical)

		ops->critical = thermal_zone_device_critical;

	tz->ops = *ops;

	if (!tz->ops.critical)

		tz->ops.critical = thermal_zone_device_critical;



	tz->ops = ops;

	tz->device.class = thermal_class;

	tz->devdata = devdata;

	memcpy(tz->trips, trips, num_trips * sizeof(*trips));
@@ -1437,7 +1437,7 @@ EXPORT_SYMBOL_GPL(thermal_zone_device_register_with_trips); 
struct thermal_zone_device *thermal_tripless_zone_device_register(

					const char *type,

					void *devdata,

					struct thermal_zone_device_ops *ops,

					const struct thermal_zone_device_ops *ops,

					const struct thermal_zone_params *tzp)

{

	return thermal_zone_device_register_with_trips(type, NULL, 0, 0, devdata,
@@ -1499,8 +1499,8 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz) 


	/* Unbind all cdevs associated with 'this' thermal zone */

	list_for_each_entry(cdev, &thermal_cdev_list, node)

		if (tz->ops->unbind)

			tz->ops->unbind(tz, cdev);

		if (tz->ops.unbind)

			tz->ops.unbind(tz, cdev);



	mutex_unlock(&thermal_list_lock);

drivers/thermal/thermal_helpers.c

+5 −5
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ int get_tz_trend(struct thermal_zone_device *tz, const struct thermal_trip *trip 
{

	enum thermal_trend trend;



	if (tz->emul_temperature || !tz->ops->get_trend ||

	    tz->ops->get_trend(tz, trip, &trend)) {

	if (tz->emul_temperature || !tz->ops.get_trend ||

	    tz->ops.get_trend(tz, trip, &trend)) {

		if (tz->temperature > tz->last_temperature)

			trend = THERMAL_TREND_RAISING;

		else if (tz->temperature < tz->last_temperature)
@@ -75,7 +75,7 @@ EXPORT_SYMBOL(get_thermal_instance); 
 * temperature and fill @temp.

 *

 * Both tz and tz->ops must be valid pointers when calling this function,

 * and the tz->ops->get_temp callback must be provided.

 * and the tz->ops.get_temp callback must be provided.

 * The function must be called under tz->lock.

 *

 * Return: On success returns 0, an error code otherwise
@@ -88,7 +88,7 @@ int __thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp) 


	lockdep_assert_held(&tz->lock);



	ret = tz->ops->get_temp(tz, temp);

	ret = tz->ops.get_temp(tz, temp);



	if (IS_ENABLED(CONFIG_THERMAL_EMULATION) && tz->emul_temperature) {

		for_each_trip(tz, trip) {
@@ -132,7 +132,7 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp) 


	mutex_lock(&tz->lock);



	if (!tz->ops->get_temp) {

	if (!tz->ops.get_temp) {

		ret = -EINVAL;

		goto unlock;

	}

drivers/thermal/thermal_hwmon.c

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ temp_crit_show(struct device *dev, struct device_attribute *attr, char *buf) 


	mutex_lock(&tz->lock);



	ret = tz->ops->get_crit_temp(tz, &temperature);

	ret = tz->ops.get_crit_temp(tz, &temperature);



	mutex_unlock(&tz->lock);
@@ -132,7 +132,7 @@ thermal_hwmon_lookup_temp(const struct thermal_hwmon_device *hwmon, 
static bool thermal_zone_crit_temp_valid(struct thermal_zone_device *tz)

{

	int temp;

	return tz->ops->get_crit_temp && !tz->ops->get_crit_temp(tz, &temp);

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

}



int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)

drivers/thermal/thermal_of.c

+8 −19
Original line number Diff line number Diff line
@@ -438,11 +438,8 @@ static int thermal_of_unbind(struct thermal_zone_device *tz, 
 */

static void thermal_of_zone_unregister(struct thermal_zone_device *tz)

{

	struct thermal_zone_device_ops *ops = tz->ops;



	thermal_zone_device_disable(tz);

	thermal_zone_device_unregister(tz);

	kfree(ops);

}



/**
@@ -468,33 +465,27 @@ static void thermal_of_zone_unregister(struct thermal_zone_device *tz) 
static struct thermal_zone_device *thermal_of_zone_register(struct device_node *sensor, int id, void *data,

							    const struct thermal_zone_device_ops *ops)

{

	struct thermal_zone_device_ops of_ops = *ops;

	struct thermal_zone_device *tz;

	struct thermal_trip *trips;

	struct thermal_zone_params tzp = {};

	struct thermal_zone_device_ops *of_ops;

	struct device_node *np;

	const char *action;

	int delay, pdelay;

	int ntrips, mask;

	int ret;



	of_ops = kmemdup(ops, sizeof(*ops), GFP_KERNEL);

	if (!of_ops)

		return ERR_PTR(-ENOMEM);



	np = of_thermal_zone_find(sensor, id);

	if (IS_ERR(np)) {

		if (PTR_ERR(np) != -ENODEV)

			pr_err("Failed to find thermal zone for %pOFn id=%d\n", sensor, id);

		ret = PTR_ERR(np);

		goto out_kfree_of_ops;

		return ERR_CAST(np);

	}



	trips = thermal_of_trips_init(np, &ntrips);

	if (IS_ERR(trips)) {

		pr_err("Failed to find trip points for %pOFn id=%d\n", sensor, id);

		ret = PTR_ERR(trips);

		goto out_kfree_of_ops;

		return ERR_CAST(trips);

	}



	ret = thermal_of_monitor_init(np, &delay, &pdelay);
@@ -505,18 +496,18 @@ static struct thermal_zone_device *thermal_of_zone_register(struct device_node * 


	thermal_of_parameters_init(np, &tzp);



	of_ops->bind = thermal_of_bind;

	of_ops->unbind = thermal_of_unbind;

	of_ops.bind = thermal_of_bind;

	of_ops.unbind = thermal_of_unbind;



	mask = GENMASK_ULL((ntrips) - 1, 0);



	ret = of_property_read_string(np, "critical-action", &action);

	if (!ret)

		if (!of_ops->critical && !strcasecmp(action, "reboot"))

			of_ops->critical = thermal_zone_device_critical_reboot;

		if (!of_ops.critical && !strcasecmp(action, "reboot"))

			of_ops.critical = thermal_zone_device_critical_reboot;



	tz = thermal_zone_device_register_with_trips(np->name, trips, ntrips,

						     mask, data, of_ops, &tzp,

						     mask, data, &of_ops, &tzp,

						     pdelay, delay);

	if (IS_ERR(tz)) {

		ret = PTR_ERR(tz);
@@ -538,8 +529,6 @@ static struct thermal_zone_device *thermal_of_zone_register(struct device_node * 


out_kfree_trips:

	kfree(trips);

out_kfree_of_ops:

	kfree(of_ops);



	return ERR_PTR(ret);

}

drivers/thermal/thermal_sysfs.c

+7 −7
Original line number Diff line number Diff line
@@ -123,8 +123,8 @@ trip_point_temp_store(struct device *dev, struct device_attribute *attr, 
	trip = &tz->trips[trip_id];



	if (temp != trip->temperature) {

		if (tz->ops->set_trip_temp) {

			ret = tz->ops->set_trip_temp(tz, trip_id, temp);

		if (tz->ops.set_trip_temp) {

			ret = tz->ops.set_trip_temp(tz, trip_id, temp);

			if (ret)

				goto unlock;

		}
@@ -174,8 +174,8 @@ trip_point_hyst_store(struct device *dev, struct device_attribute *attr, 
	trip = &tz->trips[trip_id];



	if (hyst != trip->hysteresis) {

		if (tz->ops->set_trip_hyst) {

			ret = tz->ops->set_trip_hyst(tz, trip_id, hyst);

		if (tz->ops.set_trip_hyst) {

			ret = tz->ops.set_trip_hyst(tz, trip_id, hyst);

			if (ret)

				goto unlock;

		}
@@ -250,10 +250,10 @@ emul_temp_store(struct device *dev, struct device_attribute *attr, 


	mutex_lock(&tz->lock);



	if (!tz->ops->set_emul_temp)

	if (!tz->ops.set_emul_temp)

		tz->emul_temperature = temperature;

	else

		ret = tz->ops->set_emul_temp(tz, temperature);

		ret = tz->ops.set_emul_temp(tz, temperature);



	if (!ret)

		__thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);
@@ -474,7 +474,7 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask) 
					tz->trip_hyst_attrs[indx].name;

		tz->trip_hyst_attrs[indx].attr.attr.mode = S_IRUGO;

		tz->trip_hyst_attrs[indx].attr.show = trip_point_hyst_show;

		if (tz->ops->set_trip_hyst) {

		if (tz->ops.set_trip_hyst) {

			tz->trip_hyst_attrs[indx].attr.attr.mode |= S_IWUSR;

			tz->trip_hyst_attrs[indx].attr.store =

					trip_point_hyst_store;