Commit 7f4957be authored by Andrzej Pietrasiewicz's avatar Andrzej Pietrasiewicz Committed by Daniel Lezcano
Browse files

thermal: Use mode helpers in drivers 



Use thermal_zone_device_{en|dis}able() and thermal_zone_device_is_enabled().

Consequently, all set_mode() implementations in drivers:

- can stop modifying tzd's "mode" member,
- shall stop taking tzd's lock, as it is taken in the helpers
- shall stop calling thermal_zone_device_update() as it is called in the
helpers
- can assume they are called when the mode truly changes, so checks to
verify that can be dropped

Not providing set_mode() by a driver no longer prevents the core from
being able to set tzd's mode, so the relevant check in mode_store() is
removed.

Other comments:

- acpi/thermal.c: tz->thermal_zone->mode will be updated only after we
return from set_mode(), so use function parameter in thermal_set_mode()
instead, no need to call acpi_thermal_check() in set_mode()
- thermal/imx_thermal.c: regmap writes and mode assignment are done in
thermal_zone_device_{en|dis}able() and set_mode() callback
- thermal/intel/intel_quark_dts_thermal.c: soc_dts_{en|dis}able() are a
part of set_mode() callback, so they don't need to modify tzd->mode, and
don't need to fall back to the opposite mode if unsuccessful, as the return
value will be propagated to thermal_zone_device_{en|dis}able() and
ultimately tzd's member will not be changed in thermal_zone_device_set_mode().
- thermal/of-thermal.c: no need to set zone->mode to DISABLED in
of_parse_thermal_zones() as a tzd is kzalloc'ed so mode is DISABLED anyway

Signed-off-by: default avatarAndrzej Pietrasiewicz <andrzej.p@collabora.com>
[for acerhdf]
Acked-by: default avatarPeter Kaestle <peter@piie.net>
Reviewed-by: default avatarAmit Kucheria <amit.kucheria@linaro.org>
Reviewed-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20200629122925.21729-8-andrzej.p@collabora.com
parent ac5d9ecc

drivers/acpi/thermal.c

+11 −10
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ static void acpi_thermal_check(void *data) 
{

	struct acpi_thermal *tz = data;



	if (tz->thermal_zone->mode != THERMAL_DEVICE_ENABLED)

	if (!thermal_zone_device_is_enabled(tz->thermal_zone))

		return;



	thermal_zone_device_update(tz->thermal_zone,
@@ -542,14 +542,11 @@ static int thermal_set_mode(struct thermal_zone_device *thermal, 
	if (mode == THERMAL_DEVICE_DISABLED)

		pr_warn("thermal zone will be disabled\n");



	if (mode != tz->thermal_zone->mode) {

		tz->thermal_zone->mode = mode;

	ACPI_DEBUG_PRINT((ACPI_DB_INFO,

		"%s kernel ACPI thermal control\n",

			tz->thermal_zone->mode == THERMAL_DEVICE_ENABLED ?

		mode == THERMAL_DEVICE_ENABLED ?

		"Enable" : "Disable"));

		acpi_thermal_check(tz);

	}



	return 0;

}
@@ -897,13 +894,17 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) 
		goto remove_dev_link;

	}



	tz->thermal_zone->mode = THERMAL_DEVICE_ENABLED;

	result = thermal_zone_device_enable(tz->thermal_zone);

	if (result)

		goto acpi_bus_detach;



	dev_info(&tz->device->dev, "registered as thermal_zone%d\n",

		 tz->thermal_zone->id);



	return 0;



acpi_bus_detach:

	acpi_bus_detach_private_data(tz->device->handle);

remove_dev_link:

	sysfs_remove_link(&tz->thermal_zone->device.kobj, "device");

remove_tz_link:

drivers/net/ethernet/mellanox/mlxsw/core_thermal.c

+17 −20
Original line number Diff line number Diff line
@@ -280,18 +280,11 @@ static int mlxsw_thermal_set_mode(struct thermal_zone_device *tzdev, 
{

	struct mlxsw_thermal *thermal = tzdev->devdata;



	mutex_lock(&tzdev->lock);



	if (mode == THERMAL_DEVICE_ENABLED)

		tzdev->polling_delay = thermal->polling_delay;

	else

		tzdev->polling_delay = 0;



	tzdev->mode = mode;

	mutex_unlock(&tzdev->lock);



	thermal_zone_device_update(tzdev, THERMAL_EVENT_UNSPECIFIED);



	return 0;

}
@@ -458,19 +451,11 @@ static int mlxsw_thermal_module_mode_set(struct thermal_zone_device *tzdev, 
	struct mlxsw_thermal_module *tz = tzdev->devdata;

	struct mlxsw_thermal *thermal = tz->parent;



	mutex_lock(&tzdev->lock);



	if (mode == THERMAL_DEVICE_ENABLED)

		tzdev->polling_delay = thermal->polling_delay;

	else

		tzdev->polling_delay = 0;



	tzdev->mode = mode;



	mutex_unlock(&tzdev->lock);



	thermal_zone_device_update(tzdev, THERMAL_EVENT_UNSPECIFIED);



	return 0;

}
@@ -756,8 +741,11 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz) 
		return err;

	}



	module_tz->tzdev->mode = THERMAL_DEVICE_ENABLED;

	return 0;

	err = thermal_zone_device_enable(module_tz->tzdev);

	if (err)

		thermal_zone_device_unregister(module_tz->tzdev);



	return err;

}



static void mlxsw_thermal_module_tz_fini(struct thermal_zone_device *tzdev)
@@ -860,6 +848,7 @@ static int 
mlxsw_thermal_gearbox_tz_init(struct mlxsw_thermal_module *gearbox_tz)

{

	char tz_name[MLXSW_THERMAL_ZONE_MAX_NAME];

	int ret;



	snprintf(tz_name, sizeof(tz_name), "mlxsw-gearbox%d",

		 gearbox_tz->module + 1);
@@ -872,8 +861,11 @@ mlxsw_thermal_gearbox_tz_init(struct mlxsw_thermal_module *gearbox_tz) 
	if (IS_ERR(gearbox_tz->tzdev))

		return PTR_ERR(gearbox_tz->tzdev);



	gearbox_tz->tzdev->mode = THERMAL_DEVICE_ENABLED;

	return 0;

	ret = thermal_zone_device_enable(gearbox_tz->tzdev);

	if (ret)

		thermal_zone_device_unregister(gearbox_tz->tzdev);



	return ret;

}



static void
@@ -1041,10 +1033,15 @@ int mlxsw_thermal_init(struct mlxsw_core *core, 
	if (err)

		goto err_unreg_modules_tzdev;



	thermal->tzdev->mode = THERMAL_DEVICE_ENABLED;

	err = thermal_zone_device_enable(thermal->tzdev);

	if (err)

		goto err_unreg_gearboxes;



	*p_thermal = thermal;

	return 0;



err_unreg_gearboxes:

	mlxsw_thermal_gearboxes_fini(thermal);

err_unreg_modules_tzdev:

	mlxsw_thermal_modules_fini(thermal);

err_unreg_tzdev:

drivers/platform/x86/acerhdf.c

+10 −7
Original line number Diff line number Diff line
@@ -397,19 +397,16 @@ static inline void acerhdf_revert_to_bios_mode(void) 
{

	acerhdf_change_fanstate(ACERHDF_FAN_AUTO);

	kernelmode = 0;

	if (thz_dev) {

		thz_dev->mode = THERMAL_DEVICE_DISABLED;

	if (thz_dev)

		thz_dev->polling_delay = 0;

	}



	pr_notice("kernel mode fan control OFF\n");

}

static inline void acerhdf_enable_kernelmode(void)

{

	kernelmode = 1;

	thz_dev->mode = THERMAL_DEVICE_ENABLED;



	thz_dev->polling_delay = interval*1000;

	thermal_zone_device_update(thz_dev, THERMAL_EVENT_UNSPECIFIED);

	pr_notice("kernel mode fan control ON\n");

}
@@ -723,6 +720,8 @@ static void acerhdf_unregister_platform(void) 


static int __init acerhdf_register_thermal(void)

{

	int ret;



	cl_dev = thermal_cooling_device_register("acerhdf-fan", NULL,

						 &acerhdf_cooling_ops);
@@ -736,8 +735,12 @@ static int __init acerhdf_register_thermal(void) 
	if (IS_ERR(thz_dev))

		return -EINVAL;



	thz_dev->mode = kernelmode ?

		THERMAL_DEVICE_ENABLED : THERMAL_DEVICE_DISABLED;

	if (kernelmode)

		ret = thermal_zone_device_enable(thz_dev);

	else

		ret = thermal_zone_device_disable(thz_dev);

	if (ret)

		return ret;



	if (strcmp(thz_dev->governor->name,

				acerhdf_zone_params.governor_name)) {

drivers/thermal/da9062-thermal.c

+5 −1
Original line number Diff line number Diff line
@@ -237,7 +237,11 @@ static int da9062_thermal_probe(struct platform_device *pdev) 
		ret = PTR_ERR(thermal->zone);

		goto err;

	}

	thermal->zone->mode = THERMAL_DEVICE_ENABLED;

	ret = thermal_zone_device_enable(thermal->zone);

	if (ret) {

		dev_err(&pdev->dev, "Cannot enable thermal zone device\n");

		goto err_zone;

	}



	dev_dbg(&pdev->dev,

		"TJUNC temperature polling period set at %d ms\n",

drivers/thermal/hisi_thermal.c

+4 −2
Original line number Diff line number Diff line
@@ -549,8 +549,10 @@ static void hisi_thermal_toggle_sensor(struct hisi_thermal_sensor *sensor, 
{

	struct thermal_zone_device *tzd = sensor->tzd;



	tzd->ops->set_mode(tzd,

		on ? THERMAL_DEVICE_ENABLED : THERMAL_DEVICE_DISABLED);

	if (on)

		thermal_zone_device_enable(tzd);

	else

		thermal_zone_device_disable(tzd);

}



static int hisi_thermal_probe(struct platform_device *pdev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE