Re: [PATCHv4 1/1] thermal: core: call thermal_zone_device_update() after mode update

[Zhang Rui]

Hi, Eduardo,

as the locking patch set has not been in upstream yet, you should
either fold this fix into patch 02/15, or rebase your locking patch
series on top of this fix.

thanks,
rui

On ä, 2016-06-22 at 08:03 -0700, Eduardo Valentin wrote:
> Because several drivers do the following pattern:
> .set_mode()
> ÂÂÂ...
> ÂÂÂlocal_data->mode = new_mode;
> ÂÂÂthermal_zone_device_update(tz);
> 
> makes sense to simply do the thermal_zone_device_update()
> in thermal core, after setting the new mode.
> 
> Also, this patch also remove deadlocks on drivers that
> call thermal_zone_device_update() on .set_mode(),
> as .set_mode()ÂÂis now called always with tz->lock held.
> 
> Cc: "Rafael J. Wysocki" <rjw@xxxxxxxxxxxxx>
> Cc: Len Brown <lenb@xxxxxxxxxx>
> Cc: linux-acpi@xxxxxxxxxxxxxxx
> Cc: "Lee, Chun-Yi" <jlee@xxxxxxxx>
> Cc: Darren Hart <dvhart@xxxxxxxxxxxxx>
> Cc: Zhang Rui <rui.zhang@xxxxxxxxx>
> Cc: Keerthy <j-keerthy@xxxxxx>
> Cc: linux-kernel@xxxxxxxxxxxxxxx
> Cc: linux-omap@xxxxxxxxxxxxxxx
> Cc: platform-driver-x86@xxxxxxxxxxxxxxx
> Cc: linux-pm@xxxxxxxxxxxxxxx
> Signed-off-by: Eduardo Valentin <edubezval@xxxxxxxxx>
> ---
> Hello,
> 
> V3->V4:
> - ti-soc: Removed extra locking from TI SoC in set_mode
> - ACPI: Kept the update on check as it is called on other places
> 
> BR,
> 
> Eduardo
> 
> Âdrivers/acpi/thermal.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ| 1 -
> Âdrivers/platform/x86/acerhdf.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ| 1 -
> Âdrivers/thermal/imx_thermal.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ| 1 -
> Âdrivers/thermal/of-thermal.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ| 5 -----
> Âdrivers/thermal/thermal_sysfs.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ| 1 +
> Âdrivers/thermal/ti-soc-thermal/ti-thermal-common.c | 5 -----
> Â6 files changed, 1 insertion(+), 13 deletions(-)
> 
> diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
> index 82707f9..03c3460 100644
> --- a/drivers/acpi/thermal.c
> +++ b/drivers/acpi/thermal.c
> @@ -581,7 +581,6 @@ static int thermal_set_mode(struct
> thermal_zone_device *thermal,
> Â		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
> Â			"%s kernel ACPI thermal control\n",
> Â			tz->tz_enabled ? "Enable" : "Disable"));
> -		acpi_thermal_check(tz);
> Â	}
> Â	return 0;
> Â}
> diff --git a/drivers/platform/x86/acerhdf.c
> b/drivers/platform/x86/acerhdf.c
> index 460fa67..aee33ba 100644
> --- a/drivers/platform/x86/acerhdf.c
> +++ b/drivers/platform/x86/acerhdf.c
> @@ -405,7 +405,6 @@ static inline void
> acerhdf_enable_kernelmode(void)
> Â	kernelmode = 1;
> Â
> Â	thz_dev->polling_delay = interval*1000;
> -	thermal_zone_device_update(thz_dev);
> Â	pr_notice("kernel mode fan control ON\n");
> Â}
> Â
> diff --git a/drivers/thermal/imx_thermal.c
> b/drivers/thermal/imx_thermal.c
> index c5547bd..a413eb6 100644
> --- a/drivers/thermal/imx_thermal.c
> +++ b/drivers/thermal/imx_thermal.c
> @@ -246,7 +246,6 @@ static int imx_set_mode(struct
> thermal_zone_device *tz,
> Â	}
> Â
> Â	data->mode = mode;
> -	thermal_zone_device_update(tz);
> Â
> Â	return 0;
> Â}
> diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-
> thermal.c
> index b8e509c..95c47da 100644
> --- a/drivers/thermal/of-thermal.c
> +++ b/drivers/thermal/of-thermal.c
> @@ -282,17 +282,12 @@ static int of_thermal_set_mode(struct
> thermal_zone_device *tz,
> Â{
> Â	struct __thermal_zone *data = tz->devdata;
> Â
> -	mutex_lock(&tz->lock);
> -
> Â	if (mode == THERMAL_DEVICE_ENABLED)
> Â		tz->polling_delay = data->polling_delay;
> Â	else
> Â		tz->polling_delay = 0;
> Â
> -	mutex_unlock(&tz->lock);
> -
> Â	data->mode = mode;
> -	thermal_zone_device_update(tz);
> Â
> Â	return 0;
> Â}
> diff --git a/drivers/thermal/thermal_sysfs.c
> b/drivers/thermal/thermal_sysfs.c
> index 743df50..3d0dc30 100644
> --- a/drivers/thermal/thermal_sysfs.c
> +++ b/drivers/thermal/thermal_sysfs.c
> @@ -100,6 +100,7 @@ mode_store(struct device *dev, struct
> device_attribute *attr,
> Â	mutex_lock(&tz->lock);
> Â	result = tz->ops->set_mode(tz, mode);
> Â	mutex_unlock(&tz->lock);
> +	thermal_zone_device_update(tz);
> Â
> Â	if (result)
> Â		return result;
> diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
> b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
> index 15c0a9a..5dce053 100644
> --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
> +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
> @@ -193,19 +193,14 @@ static int ti_thermal_set_mode(struct
> thermal_zone_device *thermal,
> Â		return 0;
> Â	}
> Â
> -	mutex_lock(&data->ti_thermal->lock);
> -
> Â	if (mode == THERMAL_DEVICE_ENABLED)
> Â		data->ti_thermal->polling_delay =
> FAST_TEMP_MONITORING_RATE;
> Â	else
> Â		data->ti_thermal->polling_delay = 0;
> Â
> -	mutex_unlock(&data->ti_thermal->lock);
> -
> Â	data->mode = mode;
> Â	ti_bandgap_write_update_interval(bgp, data->sensor_id,
> Â					data->ti_thermal-
> >polling_delay);
> -	thermal_zone_device_update(data->ti_thermal);
> Â	dev_dbg(&thermal->device, "thermal polling set for
> duration=%d msec\n",
> Â		data->ti_thermal->polling_delay);
> Â