[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <313ca24a-0cc4-a976-19bb-0f30aa845226@samsung.com>
Date: Wed, 24 Jun 2020 11:51:40 +0200
From: Bartlomiej Zolnierkiewicz <b.zolnierkie@...sung.com>
To: Andrzej Pietrasiewicz <andrzej.p@...labora.com>
Cc: linux-pm@...r.kernel.org, linux-acpi@...r.kernel.org,
netdev@...r.kernel.org, linux-wireless@...r.kernel.org,
platform-driver-x86@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org,
linux-renesas-soc@...r.kernel.org,
linux-rockchip@...ts.infradead.org,
"Rafael J . Wysocki" <rjw@...ysocki.net>,
Len Brown <lenb@...nel.org>,
Vishal Kulkarni <vishal@...lsio.com>,
"David S . Miller" <davem@...emloft.net>,
Jiri Pirko <jiri@...lanox.com>,
Ido Schimmel <idosch@...lanox.com>,
Johannes Berg <johannes.berg@...el.com>,
Emmanuel Grumbach <emmanuel.grumbach@...el.com>,
Luca Coelho <luciano.coelho@...el.com>,
Intel Linux Wireless <linuxwifi@...el.com>,
Kalle Valo <kvalo@...eaurora.org>,
Peter Kaestle <peter@...e.net>,
Darren Hart <dvhart@...radead.org>,
Andy Shevchenko <andy@...radead.org>,
Sebastian Reichel <sre@...nel.org>,
Miquel Raynal <miquel.raynal@...tlin.com>,
Daniel Lezcano <daniel.lezcano@...aro.org>,
Amit Kucheria <amit.kucheria@...durent.com>,
Support Opensource <support.opensource@...semi.com>,
Shawn Guo <shawnguo@...nel.org>,
Sascha Hauer <s.hauer@...gutronix.de>,
Pengutronix Kernel Team <kernel@...gutronix.de>,
Fabio Estevam <festevam@...il.com>,
NXP Linux Team <linux-imx@....com>,
Niklas Söderlund <niklas.soderlund@...natech.se>,
Heiko Stuebner <heiko@...ech.de>,
Orson Zhai <orsonzhai@...il.com>,
Baolin Wang <baolin.wang7@...il.com>,
Chunyan Zhang <zhang.lyra@...il.com>,
Zhang Rui <rui.zhang@...el.com>,
Allison Randal <allison@...utok.net>,
Enrico Weigelt <info@...ux.net>,
Gayatri Kammela <gayatri.kammela@...el.com>,
Thomas Gleixner <tglx@...utronix.de>, kernel@...labora.com
Subject: Re: [PATCH v4 07/11] thermal: Use mode helpers in drivers
On 5/28/20 9:20 PM, Andrzej Pietrasiewicz wrote:
> 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: Andrzej Pietrasiewicz <andrzej.p@...labora.com>
> ---
> drivers/acpi/thermal.c | 21 ++++++-----
> .../ethernet/mellanox/mlxsw/core_thermal.c | 37 +++++++++----------
> drivers/platform/x86/acerhdf.c | 17 +++++----
> drivers/thermal/da9062-thermal.c | 6 ++-
> drivers/thermal/hisi_thermal.c | 6 ++-
> drivers/thermal/imx_thermal.c | 33 +++++++----------
> .../intel/int340x_thermal/int3400_thermal.c | 5 +--
> .../thermal/intel/intel_quark_dts_thermal.c | 18 ++-------
> drivers/thermal/rockchip_thermal.c | 6 ++-
> drivers/thermal/sprd_thermal.c | 6 ++-
> drivers/thermal/thermal_core.c | 2 +-
> drivers/thermal/thermal_of.c | 10 +----
> drivers/thermal/thermal_sysfs.c | 11 ++----
> 13 files changed, 80 insertions(+), 98 deletions(-)
[...]
> diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
> index 32c5fe16b7f7..3efe749dc5a0 100644
> --- a/drivers/platform/x86/acerhdf.c
> +++ b/drivers/platform/x86/acerhdf.c
> @@ -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)
Cleanup on error seems to be missing here.
> + return ret;
>
> if (strcmp(thz_dev->governor->name,
> acerhdf_zone_params.governor_name)) {
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Powered by blists - more mailing lists