Commit 5a350665 authored by Andrzej Pietrasiewicz's avatar Andrzej Pietrasiewicz Committed by Daniel Lezcano
Browse files

thermal: Store device mode in struct thermal_zone_device 



Prepare for eliminating get_mode().

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

drivers/acpi/thermal.c

+6 −12
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ struct acpi_thermal { 
	struct acpi_thermal_trips trips;

	struct acpi_handle_list devices;

	struct thermal_zone_device *thermal_zone;

	enum thermal_device_mode mode;

	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->mode != THERMAL_DEVICE_ENABLED)

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

		return;



	thermal_zone_device_update(tz->thermal_zone,
@@ -529,12 +528,7 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp) 
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->mode;

	*mode = thermal->mode;



	return 0;

}
@@ -556,11 +550,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->mode) {

		tz->mode = mode;

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

		tz->thermal_zone->mode = mode;

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,

			"%s kernel ACPI thermal control\n",

			tz->mode == THERMAL_DEVICE_ENABLED ?

			tz->thermal_zone->mode == THERMAL_DEVICE_ENABLED ?

			"Enable" : "Disable"));

		acpi_thermal_check(tz);

	}
@@ -912,7 +906,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) 
		goto remove_dev_link;

	}



	tz->mode = THERMAL_DEVICE_ENABLED;

	tz->thermal_zone->mode = THERMAL_DEVICE_ENABLED;



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

		 tz->thermal_zone->id);

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

+8 −13
Original line number Diff line number Diff line
@@ -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;
@@ -280,9 +278,7 @@ static int mlxsw_thermal_unbind(struct thermal_zone_device *tzdev, 
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;

	*mode = tzdev->mode;



	return 0;

}
@@ -299,9 +295,9 @@ static int mlxsw_thermal_set_mode(struct thermal_zone_device *tzdev, 
	else

		tzdev->polling_delay = 0;



	tzdev->mode = mode;

	mutex_unlock(&tzdev->lock);



	thermal->mode = mode;

	thermal_zone_device_update(tzdev, THERMAL_EVENT_UNSPECIFIED);



	return 0;
@@ -468,9 +464,7 @@ static int mlxsw_thermal_module_unbind(struct thermal_zone_device *tzdev, 
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;

	*mode = tzdev->mode;



	return 0;

}
@@ -488,9 +482,10 @@ static int mlxsw_thermal_module_mode_set(struct thermal_zone_device *tzdev, 
	else

		tzdev->polling_delay = 0;



	tzdev->mode = mode;



	mutex_unlock(&tzdev->lock);



	tz->mode = mode;

	thermal_zone_device_update(tzdev, THERMAL_EVENT_UNSPECIFIED);



	return 0;
@@ -780,7 +775,7 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz) 
		return err;

	}



	module_tz->mode = THERMAL_DEVICE_ENABLED;

	module_tz->tzdev->mode = THERMAL_DEVICE_ENABLED;

	return 0;

}
@@ -896,7 +891,7 @@ 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;

	gearbox_tz->tzdev->mode = THERMAL_DEVICE_ENABLED;

	return 0;

}
@@ -1065,7 +1060,7 @@ int mlxsw_thermal_init(struct mlxsw_core *core, 
	if (err)

		goto err_unreg_modules_tzdev;



	thermal->mode = THERMAL_DEVICE_ENABLED;

	thermal->tzdev->mode = THERMAL_DEVICE_ENABLED;

	*p_thermal = thermal;

	return 0;

drivers/platform/x86/acerhdf.c

+8 −7
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ static int kernelmode = 1; 
#else

static int kernelmode;

#endif

static enum thermal_device_mode thermal_mode;



static unsigned int interval = 10;

static unsigned int fanon = 60000;
@@ -398,15 +397,16 @@ static inline void acerhdf_revert_to_bios_mode(void) 
{

	acerhdf_change_fanstate(ACERHDF_FAN_AUTO);

	kernelmode = 0;

	thermal_mode = THERMAL_DEVICE_DISABLED;

	if (thz_dev)

	if (thz_dev) {

		thz_dev->mode = THERMAL_DEVICE_DISABLED;

		thz_dev->polling_delay = 0;

	}

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

}

static inline void acerhdf_enable_kernelmode(void)

{

	kernelmode = 1;

	thermal_mode = THERMAL_DEVICE_ENABLED;

	thz_dev->mode = THERMAL_DEVICE_ENABLED;



	thz_dev->polling_delay = interval*1000;

	thermal_zone_device_update(thz_dev, THERMAL_EVENT_UNSPECIFIED);
@@ -419,7 +419,7 @@ static int acerhdf_get_mode(struct thermal_zone_device *thermal, 
	if (verbose)

		pr_notice("kernel mode fan control %d\n", kernelmode);



	*mode = thermal_mode;

	*mode = thermal->mode;



	return 0;

}
@@ -741,8 +741,6 @@ static int __init acerhdf_register_thermal(void) 
	if (IS_ERR(cl_dev))

		return -EINVAL;



	thermal_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,
@@ -750,6 +748,9 @@ 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 (strcmp(thz_dev->governor->name,

				acerhdf_zone_params.governor_name)) {

		pr_err("Didn't get thermal governor %s, perhaps not compiled into thermal subsystem.\n",

drivers/thermal/da9062-thermal.c

+2 −4
Original line number Diff line number Diff line
@@ -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;
@@ -124,8 +123,7 @@ static irqreturn_t da9062_thermal_irq_handler(int irq, void *data) 
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;

	*mode = z->mode;

	return 0;

}
@@ -233,7 +231,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);
@@ -248,6 +245,7 @@ static int da9062_thermal_probe(struct platform_device *pdev) 
		ret = PTR_ERR(thermal->zone);

		goto err;

	}

	thermal->zone->mode = THERMAL_DEVICE_ENABLED;



	dev_dbg(&pdev->dev,

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

drivers/thermal/imx_thermal.c

+7 −10
Original line number Diff line number Diff line
@@ -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,
@@ -334,9 +333,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp) 
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;

	*mode = tz->mode;



	return 0;

}
@@ -376,7 +373,7 @@ static int imx_set_mode(struct thermal_zone_device *tz, 
		}

	}



	data->mode = mode;

	tz->mode = mode;

	thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);



	return 0;
@@ -831,7 +828,7 @@ static int imx_thermal_probe(struct platform_device *pdev) 
		     data->socdata->measure_temp_mask);



	data->irq_enabled = true;

	data->mode = THERMAL_DEVICE_ENABLED;

	data->tz->mode = THERMAL_DEVICE_ENABLED;



	ret = devm_request_threaded_irq(&pdev->dev, data->irq,

			imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,
@@ -885,7 +882,7 @@ static int __maybe_unused imx_thermal_suspend(struct device *dev) 
		     data->socdata->measure_temp_mask);

	regmap_write(map, data->socdata->sensor_ctrl + REG_SET,

		     data->socdata->power_down_mask);

	data->mode = THERMAL_DEVICE_DISABLED;

	data->tz->mode = THERMAL_DEVICE_DISABLED;

	clk_disable_unprepare(data->thermal_clk);



	return 0;
@@ -905,7 +902,7 @@ static int __maybe_unused imx_thermal_resume(struct device *dev) 
		     data->socdata->power_down_mask);

	regmap_write(map, data->socdata->sensor_ctrl + REG_SET,

		     data->socdata->measure_temp_mask);

	data->mode = THERMAL_DEVICE_ENABLED;

	data->tz->mode = THERMAL_DEVICE_ENABLED;



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE