On 4/23/20 6:57 PM, Andrzej Pietrasiewicz wrote:
> Thermal zone devices' mode is stored in individual drivers. This patch
> changes it so that mode is stored in struct thermal_zone_device instead.
> 
> As a result all driver-specific variables storing the mode are not needed
> and are removed. Consequently, the get_mode() implementations have nothing
> to operate on and need to be removed, too.
> 
> Some thermal framework functions are introduced:
> 
> thermal_zone_device_get_mode()
> thermal_zone_device_set_mode()
> thermal_zone_device_enable()
> thermal_zone_device_disable()
> 
> thermal_zone_device_get_mode() and its "set" counterpart take tzd's lock
> and the "set" calls driver's set_mode() if provided, so the latter must
> not take this lock again. At the end of the "set"
> thermal_zone_device_update() is called so drivers don't need to repeat this
> invocation in their specific set_mode() implementations.
> 
> struct thermal_zone_params gains a new member called initial_mode, which
> is used to set tzd's mode at registration time and if tzp is not provided
> to thermal_zone_device_register() then it is assumed that the initial
> mode is THERMAL_DEVICE_ENABLED.
> 
> The sysfs "mode" attribute is always exposed from now on, because all
> thermal zone devices now have their get_mode() implemented at the generic
> level and it is always available. Exposing "mode" doesn't hurt the drivers
> which don't provide their own set_mode(), because writing to "mode" will
> result in -EPERM, as expected.
> 
> Signed-off-by: Andrzej Pietrasiewicz <andrze...@collabora.com>

Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnier...@samsung.com>

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

> ---
>  drivers/acpi/thermal.c                        | 35 ++-----------
>  .../ethernet/mellanox/mlxsw/core_thermal.c    | 42 ----------------
>  drivers/platform/x86/acerhdf.c                | 17 ++-----
>  drivers/thermal/da9062-thermal.c              | 11 -----
>  drivers/thermal/hisi_thermal.c                |  6 ++-
>  drivers/thermal/imx_thermal.c                 | 36 ++------------
>  .../intel/int340x_thermal/int3400_thermal.c   | 31 ++----------
>  .../int340x_thermal/int340x_thermal_zone.c    |  1 +
>  .../thermal/intel/intel_quark_dts_thermal.c   | 30 +++---------
>  drivers/thermal/intel/x86_pkg_temp_thermal.c  |  1 +
>  drivers/thermal/of-thermal.c                  | 24 +--------
>  drivers/thermal/rockchip_thermal.c            |  6 ++-
>  drivers/thermal/sprd_thermal.c                |  6 ++-
>  drivers/thermal/thermal_core.c                | 49 +++++++++++++++----
>  drivers/thermal/thermal_core.h                |  3 ++
>  drivers/thermal/thermal_sysfs.c               | 29 ++---------
>  include/linux/thermal.h                       | 22 ++++++++-
>  17 files changed, 105 insertions(+), 244 deletions(-)
> 
> diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
> index 19067a5e5293..d1f352ed5241 100644
> --- a/drivers/acpi/thermal.c
> +++ b/drivers/acpi/thermal.c
> @@ -172,7 +172,6 @@ struct acpi_thermal {
>       struct acpi_thermal_trips trips;
>       struct acpi_handle_list devices;
>       struct thermal_zone_device *thermal_zone;
> -     int tz_enabled;
>       int kelvin_offset;      /* in millidegrees */
>       struct work_struct thermal_check_work;
>  };
> @@ -500,7 +499,7 @@ static void acpi_thermal_check(void *data)
>  {
>       struct acpi_thermal *tz = data;
>  
> -     if (!tz->tz_enabled)
> +     if (tz->thermal_zone->mode != THERMAL_DEVICE_ENABLED)
>               return;
>  
>       thermal_zone_device_update(tz->thermal_zone,
> @@ -526,25 +525,10 @@ static int thermal_get_temp(struct thermal_zone_device 
> *thermal, int *temp)
>       return 0;
>  }
>  
> -static int thermal_get_mode(struct thermal_zone_device *thermal,
> -                             enum thermal_device_mode *mode)
> -{
> -     struct acpi_thermal *tz = thermal->devdata;
> -
> -     if (!tz)
> -             return -EINVAL;
> -
> -     *mode = tz->tz_enabled ? THERMAL_DEVICE_ENABLED :
> -             THERMAL_DEVICE_DISABLED;
> -
> -     return 0;
> -}
> -
>  static int thermal_set_mode(struct thermal_zone_device *thermal,
>                               enum thermal_device_mode mode)
>  {
>       struct acpi_thermal *tz = thermal->devdata;
> -     int enable;
>  
>       if (!tz)
>               return -EINVAL;
> @@ -552,20 +536,14 @@ static int thermal_set_mode(struct thermal_zone_device 
> *thermal,
>       /*
>        * enable/disable thermal management from ACPI thermal driver
>        */
> -     if (mode == THERMAL_DEVICE_ENABLED)
> -             enable = 1;
> -     else if (mode == THERMAL_DEVICE_DISABLED) {
> -             enable = 0;
> +     if (mode == THERMAL_DEVICE_DISABLED)
>               pr_warn("thermal zone will be disabled\n");
> -     } else
> -             return -EINVAL;
>  
> -     if (enable != tz->tz_enabled) {
> -             tz->tz_enabled = enable;
> +     if (mode != thermal->mode) {
>               ACPI_DEBUG_PRINT((ACPI_DB_INFO,
>                       "%s kernel ACPI thermal control\n",
> -                     tz->tz_enabled ? "Enable" : "Disable"));
> -             acpi_thermal_check(tz);
> +                     mode == THERMAL_DEVICE_ENABLED ?
> +                     "Enable" : "Disable"));
>       }
>       return 0;
>  }
> @@ -856,7 +834,6 @@ static struct thermal_zone_device_ops 
> acpi_thermal_zone_ops = {
>       .bind = acpi_thermal_bind_cooling_device,
>       .unbind = acpi_thermal_unbind_cooling_device,
>       .get_temp = thermal_get_temp,
> -     .get_mode = thermal_get_mode,
>       .set_mode = thermal_set_mode,
>       .get_trip_type = thermal_get_trip_type,
>       .get_trip_temp = thermal_get_trip_temp,
> @@ -913,8 +890,6 @@ static int acpi_thermal_register_thermal_zone(struct 
> acpi_thermal *tz)
>       if (ACPI_FAILURE(status))
>               return -ENODEV;
>  
> -     tz->tz_enabled = 1;
> -
>       dev_info(&tz->device->dev, "registered as thermal_zone%d\n",
>                tz->thermal_zone->id);
>       return 0;
> diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c 
> b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
> index ce0a6837daa3..5d28384046da 100644
> --- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
> +++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
> @@ -98,7 +98,6 @@ struct mlxsw_thermal_module {
>       struct mlxsw_thermal *parent;
>       struct thermal_zone_device *tzdev;
>       struct mlxsw_thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS];
> -     enum thermal_device_mode mode;
>       int module; /* Module or gearbox number */
>  };
>  
> @@ -110,7 +109,6 @@ struct mlxsw_thermal {
>       struct thermal_cooling_device *cdevs[MLXSW_MFCR_PWMS_MAX];
>       u8 cooling_levels[MLXSW_THERMAL_MAX_STATE + 1];
>       struct mlxsw_thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS];
> -     enum thermal_device_mode mode;
>       struct mlxsw_thermal_module *tz_module_arr;
>       u8 tz_module_num;
>       struct mlxsw_thermal_module *tz_gearbox_arr;
> @@ -277,33 +275,16 @@ static int mlxsw_thermal_unbind(struct 
> thermal_zone_device *tzdev,
>       return 0;
>  }
>  
> -static int mlxsw_thermal_get_mode(struct thermal_zone_device *tzdev,
> -                               enum thermal_device_mode *mode)
> -{
> -     struct mlxsw_thermal *thermal = tzdev->devdata;
> -
> -     *mode = thermal->mode;
> -
> -     return 0;
> -}
> -
>  static int mlxsw_thermal_set_mode(struct thermal_zone_device *tzdev,
>                                 enum thermal_device_mode mode)
>  {
>       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;
>  
> -     mutex_unlock(&tzdev->lock);
> -
> -     thermal->mode = mode;
> -     thermal_zone_device_update(tzdev, THERMAL_EVENT_UNSPECIFIED);
> -
>       return 0;
>  }
>  
> @@ -407,7 +388,6 @@ static int mlxsw_thermal_trend_get(struct 
> thermal_zone_device *tzdev,
>  static struct thermal_zone_device_ops mlxsw_thermal_ops = {
>       .bind = mlxsw_thermal_bind,
>       .unbind = mlxsw_thermal_unbind,
> -     .get_mode = mlxsw_thermal_get_mode,
>       .set_mode = mlxsw_thermal_set_mode,
>       .get_temp = mlxsw_thermal_get_temp,
>       .get_trip_type  = mlxsw_thermal_get_trip_type,
> @@ -466,34 +446,17 @@ static int mlxsw_thermal_module_unbind(struct 
> thermal_zone_device *tzdev,
>       return err;
>  }
>  
> -static int mlxsw_thermal_module_mode_get(struct thermal_zone_device *tzdev,
> -                                      enum thermal_device_mode *mode)
> -{
> -     struct mlxsw_thermal_module *tz = tzdev->devdata;
> -
> -     *mode = tz->mode;
> -
> -     return 0;
> -}
> -
>  static int mlxsw_thermal_module_mode_set(struct thermal_zone_device *tzdev,
>                                        enum thermal_device_mode mode)
>  {
>       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;
>  
> -     mutex_unlock(&tzdev->lock);
> -
> -     tz->mode = mode;
> -     thermal_zone_device_update(tzdev, THERMAL_EVENT_UNSPECIFIED);
> -
>       return 0;
>  }
>  
> @@ -596,7 +559,6 @@ mlxsw_thermal_module_trip_hyst_set(struct 
> thermal_zone_device *tzdev, int trip,
>  static struct thermal_zone_device_ops mlxsw_thermal_module_ops = {
>       .bind           = mlxsw_thermal_module_bind,
>       .unbind         = mlxsw_thermal_module_unbind,
> -     .get_mode       = mlxsw_thermal_module_mode_get,
>       .set_mode       = mlxsw_thermal_module_mode_set,
>       .get_temp       = mlxsw_thermal_module_temp_get,
>       .get_trip_type  = mlxsw_thermal_module_trip_type_get,
> @@ -635,7 +597,6 @@ static int mlxsw_thermal_gearbox_temp_get(struct 
> thermal_zone_device *tzdev,
>  static struct thermal_zone_device_ops mlxsw_thermal_gearbox_ops = {
>       .bind           = mlxsw_thermal_module_bind,
>       .unbind         = mlxsw_thermal_module_unbind,
> -     .get_mode       = mlxsw_thermal_module_mode_get,
>       .set_mode       = mlxsw_thermal_module_mode_set,
>       .get_temp       = mlxsw_thermal_gearbox_temp_get,
>       .get_trip_type  = mlxsw_thermal_module_trip_type_get,
> @@ -765,7 +726,6 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module 
> *module_tz)
>               return err;
>       }
>  
> -     module_tz->mode = THERMAL_DEVICE_ENABLED;
>       return 0;
>  }
>  
> @@ -881,7 +841,6 @@ 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->mode = THERMAL_DEVICE_ENABLED;
>       return 0;
>  }
>  
> @@ -1050,7 +1009,6 @@ int mlxsw_thermal_init(struct mlxsw_core *core,
>       if (err)
>               goto err_unreg_modules_tzdev;
>  
> -     thermal->mode = THERMAL_DEVICE_ENABLED;
>       *p_thermal = thermal;
>       return 0;
>  
> diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
> index 8cc86f4e3ac1..aaf8b845be90 100644
> --- a/drivers/platform/x86/acerhdf.c
> +++ b/drivers/platform/x86/acerhdf.c
> @@ -406,22 +406,9 @@ static inline void acerhdf_enable_kernelmode(void)
>       kernelmode = 1;
>  
>       thz_dev->polling_delay = interval*1000;
> -     thermal_zone_device_update(thz_dev, THERMAL_EVENT_UNSPECIFIED);
>       pr_notice("kernel mode fan control ON\n");
>  }
>  
> -static int acerhdf_get_mode(struct thermal_zone_device *thermal,
> -                         enum thermal_device_mode *mode)
> -{
> -     if (verbose)
> -             pr_notice("kernel mode fan control %d\n", kernelmode);
> -
> -     *mode = (kernelmode) ? THERMAL_DEVICE_ENABLED
> -                          : THERMAL_DEVICE_DISABLED;
> -
> -     return 0;
> -}
> -
>  /*
>   * set operation mode;
>   * enabled: the thermal layer of the kernel takes care about
> @@ -488,7 +475,6 @@ static struct thermal_zone_device_ops acerhdf_dev_ops = {
>       .bind = acerhdf_bind,
>       .unbind = acerhdf_unbind,
>       .get_temp = acerhdf_get_ec_temp,
> -     .get_mode = acerhdf_get_mode,
>       .set_mode = acerhdf_set_mode,
>       .get_trip_type = acerhdf_get_trip_type,
>       .get_trip_hyst = acerhdf_get_trip_hyst,
> @@ -554,6 +540,7 @@ static int acerhdf_set_cur_state(struct 
> thermal_cooling_device *cdev,
>  
>  err_out:
>       acerhdf_revert_to_bios_mode();
> +     thz_dev->mode = THERMAL_DEVICE_DISABLED;
>       return -EINVAL;
>  }
>  
> @@ -739,6 +726,8 @@ static int __init acerhdf_register_thermal(void)
>       if (IS_ERR(cl_dev))
>               return -EINVAL;
>  
> +     acerhdf_zone_params.initial_mode =
> +             kernelmode ? THERMAL_DEVICE_ENABLED : THERMAL_DEVICE_DISABLED;
>       thz_dev = thermal_zone_device_register("acerhdf", 2, 0, NULL,
>                                             &acerhdf_dev_ops,
>                                             &acerhdf_zone_params, 0,
> diff --git a/drivers/thermal/da9062-thermal.c 
> b/drivers/thermal/da9062-thermal.c
> index c32709badeda..c3075d038095 100644
> --- a/drivers/thermal/da9062-thermal.c
> +++ b/drivers/thermal/da9062-thermal.c
> @@ -49,7 +49,6 @@ struct da9062_thermal {
>       struct da9062 *hw;
>       struct delayed_work work;
>       struct thermal_zone_device *zone;
> -     enum thermal_device_mode mode;
>       struct mutex lock; /* protection for da9062_thermal temperature */
>       int temperature;
>       int irq;
> @@ -121,14 +120,6 @@ static irqreturn_t da9062_thermal_irq_handler(int irq, 
> void *data)
>       return IRQ_HANDLED;
>  }
>  
> -static int da9062_thermal_get_mode(struct thermal_zone_device *z,
> -                                enum thermal_device_mode *mode)
> -{
> -     struct da9062_thermal *thermal = z->devdata;
> -     *mode = thermal->mode;
> -     return 0;
> -}
> -
>  static int da9062_thermal_get_trip_type(struct thermal_zone_device *z,
>                                       int trip,
>                                       enum thermal_trip_type *type)
> @@ -181,7 +172,6 @@ static int da9062_thermal_get_temp(struct 
> thermal_zone_device *z,
>  
>  static struct thermal_zone_device_ops da9062_thermal_ops = {
>       .get_temp       = da9062_thermal_get_temp,
> -     .get_mode       = da9062_thermal_get_mode,
>       .get_trip_type  = da9062_thermal_get_trip_type,
>       .get_trip_temp  = da9062_thermal_get_trip_temp,
>  };
> @@ -233,7 +223,6 @@ static int da9062_thermal_probe(struct platform_device 
> *pdev)
>  
>       thermal->config = match->data;
>       thermal->hw = chip;
> -     thermal->mode = THERMAL_DEVICE_ENABLED;
>       thermal->dev = &pdev->dev;
>  
>       INIT_DELAYED_WORK(&thermal->work, da9062_thermal_poll_on);
> diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
> index 2d26ae80e202..ee05950afd2f 100644
> --- a/drivers/thermal/hisi_thermal.c
> +++ b/drivers/thermal/hisi_thermal.c
> @@ -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)
> diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
> index e761c9b42217..800d2388c440 100644
> --- a/drivers/thermal/imx_thermal.c
> +++ b/drivers/thermal/imx_thermal.c
> @@ -197,7 +197,6 @@ struct imx_thermal_data {
>       struct cpufreq_policy *policy;
>       struct thermal_zone_device *tz;
>       struct thermal_cooling_device *cdev;
> -     enum thermal_device_mode mode;
>       struct regmap *tempmon;
>       u32 c1, c2; /* See formula in imx_init_calib() */
>       int temp_passive;
> @@ -256,7 +255,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, 
> int *temp)
>       bool wait;
>       u32 val;
>  
> -     if (data->mode == THERMAL_DEVICE_ENABLED) {
> +     if (tz->mode == THERMAL_DEVICE_ENABLED) {
>               /* Check if a measurement is currently in progress */
>               regmap_read(map, soc_data->temp_data, &val);
>               wait = !(val & soc_data->temp_valid_mask);
> @@ -283,7 +282,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, 
> int *temp)
>  
>       regmap_read(map, soc_data->temp_data, &val);
>  
> -     if (data->mode != THERMAL_DEVICE_ENABLED) {
> +     if (tz->mode != THERMAL_DEVICE_ENABLED) {
>               regmap_write(map, soc_data->sensor_ctrl + REG_CLR,
>                            soc_data->measure_temp_mask);
>               regmap_write(map, soc_data->sensor_ctrl + REG_SET,
> @@ -331,16 +330,6 @@ static int imx_get_temp(struct thermal_zone_device *tz, 
> int *temp)
>       return 0;
>  }
>  
> -static int imx_get_mode(struct thermal_zone_device *tz,
> -                     enum thermal_device_mode *mode)
> -{
> -     struct imx_thermal_data *data = tz->devdata;
> -
> -     *mode = data->mode;
> -
> -     return 0;
> -}
> -
>  static int imx_set_mode(struct thermal_zone_device *tz,
>                       enum thermal_device_mode mode)
>  {
> @@ -376,9 +365,6 @@ static int imx_set_mode(struct thermal_zone_device *tz,
>               }
>       }
>  
> -     data->mode = mode;
> -     thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);
> -
>       return 0;
>  }
>  
> @@ -467,7 +453,6 @@ static struct thermal_zone_device_ops imx_tz_ops = {
>       .bind = imx_bind,
>       .unbind = imx_unbind,
>       .get_temp = imx_get_temp,
> -     .get_mode = imx_get_mode,
>       .set_mode = imx_set_mode,
>       .get_trip_type = imx_get_trip_type,
>       .get_trip_temp = imx_get_trip_temp,
> @@ -831,7 +816,6 @@ static int imx_thermal_probe(struct platform_device *pdev)
>                    data->socdata->measure_temp_mask);
>  
>       data->irq_enabled = true;
> -     data->mode = THERMAL_DEVICE_ENABLED;
>  
>       ret = devm_request_threaded_irq(&pdev->dev, data->irq,
>                       imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,
> @@ -873,19 +857,14 @@ static int imx_thermal_remove(struct platform_device 
> *pdev)
>  static int __maybe_unused imx_thermal_suspend(struct device *dev)
>  {
>       struct imx_thermal_data *data = dev_get_drvdata(dev);
> -     struct regmap *map = data->tempmon;
>  
>       /*
>        * Need to disable thermal sensor, otherwise, when thermal core
>        * try to get temperature before thermal sensor resume, a wrong
>        * temperature will be read as the thermal sensor is powered
> -      * down.
> +      * down. This is done in thermal_zone_device_disable().
>        */
> -     regmap_write(map, data->socdata->sensor_ctrl + REG_CLR,
> -                  data->socdata->measure_temp_mask);
> -     regmap_write(map, data->socdata->sensor_ctrl + REG_SET,
> -                  data->socdata->power_down_mask);
> -     data->mode = THERMAL_DEVICE_DISABLED;
> +     thermal_zone_device_disable(data->tz);
>       clk_disable_unprepare(data->thermal_clk);
>  
>       return 0;
> @@ -894,18 +873,13 @@ static int __maybe_unused imx_thermal_suspend(struct 
> device *dev)
>  static int __maybe_unused imx_thermal_resume(struct device *dev)
>  {
>       struct imx_thermal_data *data = dev_get_drvdata(dev);
> -     struct regmap *map = data->tempmon;
>       int ret;
>  
>       ret = clk_prepare_enable(data->thermal_clk);
>       if (ret)
>               return ret;
>       /* Enabled thermal sensor after resume */
> -     regmap_write(map, data->socdata->sensor_ctrl + REG_CLR,
> -                  data->socdata->power_down_mask);
> -     regmap_write(map, data->socdata->sensor_ctrl + REG_SET,
> -                  data->socdata->measure_temp_mask);
> -     data->mode = THERMAL_DEVICE_ENABLED;
> +     thermal_zone_device_enable(data->tz);
>  
>       return 0;
>  }
> diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c 
> b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
> index e802922a13cf..1751d4b103b1 100644
> --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
> +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
> @@ -44,7 +44,6 @@ static char 
> *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = {
>  struct int3400_thermal_priv {
>       struct acpi_device *adev;
>       struct thermal_zone_device *thermal;
> -     int mode;
>       int art_count;
>       struct art *arts;
>       int trt_count;
> @@ -230,54 +229,32 @@ static int int3400_thermal_get_temp(struct 
> thermal_zone_device *thermal,
>       return 0;
>  }
>  
> -static int int3400_thermal_get_mode(struct thermal_zone_device *thermal,
> -                             enum thermal_device_mode *mode)
> -{
> -     struct int3400_thermal_priv *priv = thermal->devdata;
> -
> -     if (!priv)
> -             return -EINVAL;
> -
> -     *mode = priv->mode;
> -
> -     return 0;
> -}
> -
>  static int int3400_thermal_set_mode(struct thermal_zone_device *thermal,
>                               enum thermal_device_mode mode)
>  {
>       struct int3400_thermal_priv *priv = thermal->devdata;
> -     bool enable;
>       int result = 0;
>  
>       if (!priv)
>               return -EINVAL;
>  
> -     if (mode == THERMAL_DEVICE_ENABLED)
> -             enable = true;
> -     else if (mode == THERMAL_DEVICE_DISABLED)
> -             enable = false;
> -     else
> -             return -EINVAL;
> -
> -     if (enable != priv->mode) {
> -             priv->mode = enable;
> +     if (mode != thermal->mode) {
>               result = int3400_thermal_run_osc(priv->adev->handle,
> -                                              priv->current_uuid_index,
> -                                              enable);
> +                                             priv->current_uuid_index,
> +                                             mode == THERMAL_DEVICE_ENABLED);
>       }
>       return result;
>  }
>  
>  static struct thermal_zone_device_ops int3400_thermal_ops = {
>       .get_temp = int3400_thermal_get_temp,
> -     .get_mode = int3400_thermal_get_mode,
>       .set_mode = int3400_thermal_set_mode,
>  };
>  
>  static struct thermal_zone_params int3400_thermal_params = {
>       .governor_name = "user_space",
>       .no_hwmon = true,
> +     .initial_mode = THERMAL_DEVICE_DISABLED,
>  };
>  
>  static int int3400_thermal_probe(struct platform_device *pdev)
> diff --git a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c 
> b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
> index 432213272f1e..b36da9bfbf8a 100644
> --- a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
> +++ b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
> @@ -208,6 +208,7 @@ EXPORT_SYMBOL_GPL(int340x_thermal_read_trips);
>  static struct thermal_zone_params int340x_thermal_params = {
>       .governor_name = "user_space",
>       .no_hwmon = true,
> +     .initial_mode = THERMAL_DEVICE_ENABLED,
>  };
>  
>  struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device 
> *adev,
> diff --git a/drivers/thermal/intel/intel_quark_dts_thermal.c 
> b/drivers/thermal/intel/intel_quark_dts_thermal.c
> index d704fc104cfd..02dabd93f607 100644
> --- a/drivers/thermal/intel/intel_quark_dts_thermal.c
> +++ b/drivers/thermal/intel/intel_quark_dts_thermal.c
> @@ -103,7 +103,6 @@ struct soc_sensor_entry {
>       bool locked;
>       u32 store_ptps;
>       u32 store_dts_enable;
> -     enum thermal_device_mode mode;
>       struct thermal_zone_device *tzone;
>  };
>  
> @@ -128,7 +127,7 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)
>               return ret;
>  
>       if (out & QRK_DTS_ENABLE_BIT) {
> -             aux_entry->mode = THERMAL_DEVICE_ENABLED;
> +             tzd->mode = THERMAL_DEVICE_ENABLED;
>               return 0;
>       }
>  
> @@ -139,9 +138,9 @@ static int soc_dts_enable(struct thermal_zone_device *tzd)
>               if (ret)
>                       return ret;
>  
> -             aux_entry->mode = THERMAL_DEVICE_ENABLED;
> +             tzd->mode = THERMAL_DEVICE_ENABLED;
>       } else {
> -             aux_entry->mode = THERMAL_DEVICE_DISABLED;
> +             tzd->mode = THERMAL_DEVICE_DISABLED;
>               pr_info("DTS is locked. Cannot enable DTS\n");
>               ret = -EPERM;
>       }
> @@ -161,7 +160,7 @@ static int soc_dts_disable(struct thermal_zone_device 
> *tzd)
>               return ret;
>  
>       if (!(out & QRK_DTS_ENABLE_BIT)) {
> -             aux_entry->mode = THERMAL_DEVICE_DISABLED;
> +             tzd->mode = THERMAL_DEVICE_DISABLED;
>               return 0;
>       }
>  
> @@ -173,9 +172,9 @@ static int soc_dts_disable(struct thermal_zone_device 
> *tzd)
>               if (ret)
>                       return ret;
>  
> -             aux_entry->mode = THERMAL_DEVICE_DISABLED;
> +             tzd->mode = THERMAL_DEVICE_DISABLED;
>       } else {
> -             aux_entry->mode = THERMAL_DEVICE_ENABLED;
> +             tzd->mode = THERMAL_DEVICE_ENABLED;
>               pr_info("DTS is locked. Cannot disable DTS\n");
>               ret = -EPERM;
>       }
> @@ -309,14 +308,6 @@ static int sys_get_curr_temp(struct thermal_zone_device 
> *tzd,
>       return 0;
>  }
>  
> -static int sys_get_mode(struct thermal_zone_device *tzd,
> -                             enum thermal_device_mode *mode)
> -{
> -     struct soc_sensor_entry *aux_entry = tzd->devdata;
> -     *mode = aux_entry->mode;
> -     return 0;
> -}
> -
>  static int sys_set_mode(struct thermal_zone_device *tzd,
>                               enum thermal_device_mode mode)
>  {
> @@ -338,7 +329,6 @@ static struct thermal_zone_device_ops tzone_ops = {
>       .get_trip_type = sys_get_trip_type,
>       .set_trip_temp = sys_set_trip_temp,
>       .get_crit_temp = sys_get_crit_temp,
> -     .get_mode = sys_get_mode,
>       .set_mode = sys_set_mode,
>  };
>  
> @@ -414,16 +404,8 @@ static struct soc_sensor_entry *alloc_soc_dts(void)
>               goto err_ret;
>       }
>  
> -     mutex_lock(&dts_update_mutex);
> -     err = soc_dts_enable(aux_entry->tzone);
> -     mutex_unlock(&dts_update_mutex);
> -     if (err)
> -             goto err_aux_status;
> -
>       return aux_entry;
>  
> -err_aux_status:
> -     thermal_zone_device_unregister(aux_entry->tzone);
>  err_ret:
>       kfree(aux_entry);
>       return ERR_PTR(err);
> diff --git a/drivers/thermal/intel/x86_pkg_temp_thermal.c 
> b/drivers/thermal/intel/x86_pkg_temp_thermal.c
> index a006b9fd1d72..cb810a02aab0 100644
> --- a/drivers/thermal/intel/x86_pkg_temp_thermal.c
> +++ b/drivers/thermal/intel/x86_pkg_temp_thermal.c
> @@ -56,6 +56,7 @@ struct zone_device {
>  
>  static struct thermal_zone_params pkg_temp_tz_params = {
>       .no_hwmon       = true,
> +     .initial_mode   = THERMAL_DEVICE_ENABLED,
>  };
>  
>  /* Keep track of how many zone pointers we allocated in init() */
> diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
> index 874a47d6923f..48787a5576d8 100644
> --- a/drivers/thermal/of-thermal.c
> +++ b/drivers/thermal/of-thermal.c
> @@ -51,7 +51,6 @@ struct __thermal_bind_params {
>  
>  /**
>   * struct __thermal_zone - internal representation of a thermal zone
> - * @mode: current thermal zone device mode (enabled/disabled)
>   * @passive_delay: polling interval while passive cooling is activated
>   * @polling_delay: zone polling interval
>   * @slope: slope of the temperature adjustment curve
> @@ -65,7 +64,6 @@ struct __thermal_bind_params {
>   */
>  
>  struct __thermal_zone {
> -     enum thermal_device_mode mode;
>       int passive_delay;
>       int polling_delay;
>       int slope;
> @@ -269,23 +267,11 @@ static int of_thermal_unbind(struct thermal_zone_device 
> *thermal,
>       return 0;
>  }
>  
> -static int of_thermal_get_mode(struct thermal_zone_device *tz,
> -                            enum thermal_device_mode *mode)
> -{
> -     struct __thermal_zone *data = tz->devdata;
> -
> -     *mode = data->mode;
> -
> -     return 0;
> -}
> -
>  static int of_thermal_set_mode(struct thermal_zone_device *tz,
>                              enum thermal_device_mode mode)
>  {
>       struct __thermal_zone *data = tz->devdata;
>  
> -     mutex_lock(&tz->lock);
> -
>       if (mode == THERMAL_DEVICE_ENABLED) {
>               tz->polling_delay = data->polling_delay;
>               tz->passive_delay = data->passive_delay;
> @@ -294,11 +280,6 @@ static int of_thermal_set_mode(struct 
> thermal_zone_device *tz,
>               tz->passive_delay = 0;
>       }
>  
> -     mutex_unlock(&tz->lock);
> -
> -     data->mode = mode;
> -     thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);
> -
>       return 0;
>  }
>  
> @@ -393,7 +374,6 @@ static int of_thermal_get_crit_temp(struct 
> thermal_zone_device *tz,
>  }
>  
>  static struct thermal_zone_device_ops of_thermal_ops = {
> -     .get_mode = of_thermal_get_mode,
>       .set_mode = of_thermal_set_mode,
>  
>       .get_trip_type = of_thermal_get_trip_type,
> @@ -554,7 +534,7 @@ thermal_zone_of_sensor_register(struct device *dev, int 
> sensor_id, void *data,
>                       tzd = thermal_zone_of_add_sensor(child, sensor_np,
>                                                        data, ops);
>                       if (!IS_ERR(tzd))
> -                             tzd->ops->set_mode(tzd, THERMAL_DEVICE_ENABLED);
> +                             thermal_zone_device_enable(tzd);
>  
>                       of_node_put(child);
>                       goto exit;
> @@ -979,7 +959,6 @@ __init *thermal_of_build_thermal_zone(struct device_node 
> *np)
>  
>  finish:
>       of_node_put(child);
> -     tz->mode = THERMAL_DEVICE_DISABLED;
>  
>       return tz;
>  
> @@ -1120,6 +1099,7 @@ int __init of_parse_thermal_zones(void)
>               /* these two are left for temperature drivers to use */
>               tzp->slope = tz->slope;
>               tzp->offset = tz->offset;
> +             tzp->initial_mode = THERMAL_DEVICE_DISABLED;
>  
>               zone = thermal_zone_device_register(child->name, tz->ntrips,
>                                                   mask, tz,
> diff --git a/drivers/thermal/rockchip_thermal.c 
> b/drivers/thermal/rockchip_thermal.c
> index 15a71ecc916c..aa9e0e31ef98 100644
> --- a/drivers/thermal/rockchip_thermal.c
> +++ b/drivers/thermal/rockchip_thermal.c
> @@ -1068,8 +1068,10 @@ rockchip_thermal_toggle_sensor(struct 
> rockchip_thermal_sensor *sensor, bool on)
>  {
>       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 irqreturn_t rockchip_thermal_alarm_irq_thread(int irq, void *dev)
> diff --git a/drivers/thermal/sprd_thermal.c b/drivers/thermal/sprd_thermal.c
> index a340374e8c51..58f995b0f804 100644
> --- a/drivers/thermal/sprd_thermal.c
> +++ b/drivers/thermal/sprd_thermal.c
> @@ -322,8 +322,10 @@ static void sprd_thm_toggle_sensor(struct 
> sprd_thermal_sensor *sen, bool on)
>  {
>       struct thermal_zone_device *tzd = sen->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 sprd_thm_probe(struct platform_device *pdev)
> diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
> index c06550930979..a2a5034f76e7 100644
> --- a/drivers/thermal/thermal_core.c
> +++ b/drivers/thermal/thermal_core.c
> @@ -463,6 +463,41 @@ static void thermal_zone_device_reset(struct 
> thermal_zone_device *tz)
>       thermal_zone_device_init(tz);
>  }
>  
> +enum thermal_device_mode
> +thermal_zone_device_get_mode(struct thermal_zone_device *tz)
> +{
> +     enum thermal_device_mode mode;
> +
> +     mutex_lock(&tz->lock);
> +
> +     mode = tz->mode;
> +
> +     mutex_unlock(&tz->lock);
> +
> +     return mode;
> +}
> +
> +int thermal_zone_device_set_mode(struct thermal_zone_device *tz,
> +                              enum thermal_device_mode mode)
> +{
> +     int ret = 0;
> +
> +     mutex_lock(&tz->lock);
> +
> +     if (tz->ops->set_mode)
> +             ret = tz->ops->set_mode(tz, mode);
> +
> +     if (!ret)
> +             tz->mode = mode;
> +
> +     mutex_unlock(&tz->lock);
> +
> +     thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);
> +
> +     return ret;
> +}
> +EXPORT_SYMBOL_GPL(thermal_zone_device_set_mode);
> +
>  void thermal_zone_device_update(struct thermal_zone_device *tz,
>                               enum thermal_notify_event event)
>  {
> @@ -1236,6 +1271,7 @@ thermal_zone_device_register(const char *type, int 
> trips, int mask,
>       int result;
>       int count;
>       struct thermal_governor *governor;
> +     enum thermal_device_mode mode;
>  
>       if (!type || strlen(type) == 0) {
>               pr_err("Error: No thermal zone type defined\n");
> @@ -1290,9 +1326,6 @@ thermal_zone_device_register(const char *type, int 
> trips, int mask,
>       if (result)
>               goto remove_id;
>  
> -     /* A new thermal zone needs to be updated anyway. */
> -     atomic_set(&tz->need_update, 1);
> -
>       dev_set_name(&tz->device, "thermal_zone%d", tz->id);
>       result = device_register(&tz->device);
>       if (result)
> @@ -1340,9 +1373,9 @@ thermal_zone_device_register(const char *type, int 
> trips, int mask,
>       INIT_DELAYED_WORK(&tz->poll_queue, thermal_zone_device_check);
>  
>       thermal_zone_device_reset(tz);
> -     /* Update the new thermal zone and mark it as already updated. */
> -     if (atomic_cmpxchg(&tz->need_update, 1, 0))
> -             thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);
> +
> +     mode = tzp ? tzp->initial_mode : THERMAL_DEVICE_ENABLED;
> +     thermal_zone_device_set_mode(tz, mode);
>  
>       return tz;
>  
> @@ -1473,9 +1506,7 @@ 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) {
> -                     tz_mode = THERMAL_DEVICE_ENABLED;
> -                     if (tz->ops->get_mode)
> -                             tz->ops->get_mode(tz, &tz_mode);
> +                     tz_mode = thermal_zone_device_get_mode(tz);
>  
>                       if (tz_mode == THERMAL_DEVICE_DISABLED)
>                               continue;
> diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h
> index c95689586e19..ff5519adb68a 100644
> --- a/drivers/thermal/thermal_core.h
> +++ b/drivers/thermal/thermal_core.h
> @@ -141,6 +141,9 @@ thermal_cooling_device_stats_update(struct 
> thermal_cooling_device *cdev,
>                                   unsigned long new_state) {}
>  #endif /* CONFIG_THERMAL_STATISTICS */
>  
> +enum thermal_device_mode
> +thermal_zone_device_get_mode(struct thermal_zone_device *tz);
> +
>  /* device tree support */
>  #ifdef CONFIG_THERMAL_OF
>  int of_parse_thermal_zones(void);
> diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
> index aa99edb4dff7..cbb27b3c96d2 100644
> --- a/drivers/thermal/thermal_sysfs.c
> +++ b/drivers/thermal/thermal_sysfs.c
> @@ -50,14 +50,8 @@ mode_show(struct device *dev, struct device_attribute 
> *attr, char *buf)
>  {
>       struct thermal_zone_device *tz = to_thermal_zone(dev);
>       enum thermal_device_mode mode;
> -     int result;
> -
> -     if (!tz->ops->get_mode)
> -             return -EPERM;
>  
> -     result = tz->ops->get_mode(tz, &mode);
> -     if (result)
> -             return result;
> +     mode = thermal_zone_device_get_mode(tz);
>  
>       return sprintf(buf, "%s\n", mode == THERMAL_DEVICE_ENABLED ? "enabled"
>                      : "disabled");
> @@ -74,9 +68,9 @@ mode_store(struct device *dev, struct device_attribute 
> *attr,
>               return -EPERM;
>  
>       if (!strncmp(buf, "enabled", sizeof("enabled") - 1))
> -             result = tz->ops->set_mode(tz, THERMAL_DEVICE_ENABLED);
> +             result = thermal_zone_device_enable(tz);
>       else if (!strncmp(buf, "disabled", sizeof("disabled") - 1))
> -             result = tz->ops->set_mode(tz, THERMAL_DEVICE_DISABLED);
> +             result = thermal_zone_device_disable(tz);
>       else
>               result = -EINVAL;
>  
> @@ -428,30 +422,13 @@ static struct attribute_group 
> thermal_zone_attribute_group = {
>       .attrs = thermal_zone_dev_attrs,
>  };
>  
> -/* We expose mode only if .get_mode is present */
>  static struct attribute *thermal_zone_mode_attrs[] = {
>       &dev_attr_mode.attr,
>       NULL,
>  };
>  
> -static umode_t thermal_zone_mode_is_visible(struct kobject *kobj,
> -                                         struct attribute *attr,
> -                                         int attrno)
> -{
> -     struct device *dev = container_of(kobj, struct device, kobj);
> -     struct thermal_zone_device *tz;
> -
> -     tz = container_of(dev, struct thermal_zone_device, device);
> -
> -     if (tz->ops->get_mode)
> -             return attr->mode;
> -
> -     return 0;
> -}
> -
>  static struct attribute_group thermal_zone_mode_attribute_group = {
>       .attrs = thermal_zone_mode_attrs,
> -     .is_visible = thermal_zone_mode_is_visible,
>  };
>  
>  /* We expose passive only if passive trips are present */
> diff --git a/include/linux/thermal.h b/include/linux/thermal.h
> index 216185bb3014..c789d4ff6e63 100644
> --- a/include/linux/thermal.h
> +++ b/include/linux/thermal.h
> @@ -76,8 +76,6 @@ struct thermal_zone_device_ops {
>                      struct thermal_cooling_device *);
>       int (*get_temp) (struct thermal_zone_device *, int *);
>       int (*set_trips) (struct thermal_zone_device *, int, int);
> -     int (*get_mode) (struct thermal_zone_device *,
> -                      enum thermal_device_mode *);
>       int (*set_mode) (struct thermal_zone_device *,
>               enum thermal_device_mode);
>       int (*get_trip_type) (struct thermal_zone_device *, int,
> @@ -128,6 +126,7 @@ struct thermal_cooling_device {
>   * @trip_temp_attrs: attributes for trip points for sysfs: trip temperature
>   * @trip_type_attrs: attributes for trip points for sysfs: trip type
>   * @trip_hyst_attrs: attributes for trip points for sysfs: trip hysteresis
> + * @mode:            current mode of this thermal zone
>   * @devdata: private pointer for device private data
>   * @trips:   number of trip points the thermal zone supports
>   * @trips_disabled;  bitmap for disabled trips
> @@ -170,6 +169,7 @@ struct thermal_zone_device {
>       struct thermal_attr *trip_temp_attrs;
>       struct thermal_attr *trip_type_attrs;
>       struct thermal_attr *trip_hyst_attrs;
> +     enum thermal_device_mode mode;
>       void *devdata;
>       int trips;
>       unsigned long trips_disabled;   /* bitmap for disabled trips */
> @@ -264,6 +264,9 @@ struct thermal_zone_params {
>       int num_tbps;   /* Number of tbp entries */
>       struct thermal_bind_params *tbp;
>  
> +     /* Initial mode of this thermal zone device */
> +     enum thermal_device_mode initial_mode;
> +
>       /*
>        * Sustainable power (heat) that this thermal zone can dissipate in
>        * mW
> @@ -395,6 +398,8 @@ int thermal_zone_bind_cooling_device(struct 
> thermal_zone_device *, int,
>                                    unsigned int);
>  int thermal_zone_unbind_cooling_device(struct thermal_zone_device *, int,
>                                      struct thermal_cooling_device *);
> +int thermal_zone_device_set_mode(struct thermal_zone_device *tz,
> +                              enum thermal_device_mode mode);
>  void thermal_zone_device_update(struct thermal_zone_device *,
>                               enum thermal_notify_event);
>  
> @@ -426,6 +431,9 @@ static inline struct thermal_zone_device 
> *thermal_zone_device_register(
>  static inline void thermal_zone_device_unregister(
>       struct thermal_zone_device *tz)
>  { }
> +int thermal_zone_device_set_mode(struct thermal_zone_device *tz,
> +                              enum thermal_device_mode mode)
> +{ return -EINVAL; }
>  static inline struct thermal_cooling_device *
>  thermal_cooling_device_register(char *type, void *devdata,
>       const struct thermal_cooling_device_ops *ops)
> @@ -465,4 +473,14 @@ static inline void thermal_notify_framework(struct 
> thermal_zone_device *tz,
>  { }
>  #endif /* CONFIG_THERMAL */
>  
> +static inline int thermal_zone_device_enable(struct thermal_zone_device *tz)
> +{
> +     return thermal_zone_device_set_mode(tz, THERMAL_DEVICE_ENABLED);
> +}
> +
> +static inline int thermal_zone_device_disable(struct thermal_zone_device *tz)
> +{
> +     return thermal_zone_device_set_mode(tz, THERMAL_DEVICE_DISABLED);
> +}
> +
>  #endif /* __THERMAL_H__ */
> 

Reply via email to