thermal: Store device mode in struct thermal_zone_device
Prepare for eliminating get_mode(). Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com> [for acerhdf] Acked-by: Peter Kaestle <peter@piie.net> Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Link: https://lore.kernel.org/r/20200629122925.21729-5-andrzej.p@collabora.com
This commit is contained in:
Andrzej Pietrasiewicz
Daniel Lezcano
Родитель
cbba1d7195
Коммит
5a3506657f
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@ struct int3400_thermal_priv {
|
|||
struct acpi_device *adev;
|
||||
struct platform_device *pdev;
|
||||
struct thermal_zone_device *thermal;
|
||||
enum thermal_device_mode mode;
|
||||
int art_count;
|
||||
struct art *arts;
|
||||
int trt_count;
|
||||
|
|
@ -381,12 +380,7 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal,
|
|||
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;
|
||||
*mode = thermal->mode;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -404,8 +398,8 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal,
|
|||
mode != THERMAL_DEVICE_DISABLED)
|
||||
return -EINVAL;
|
||||
|
||||
if (mode != priv->mode) {
|
||||
priv->mode = mode;
|
||||
if (mode != thermal->mode) {
|
||||
thermal->mode = mode;
|
||||
result = int3400_thermal_run_osc(priv->adev->handle,
|
||||
priv->current_uuid_index,
|
||||
mode == THERMAL_DEVICE_ENABLED);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -312,8 +311,7 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,
|
|||
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;
|
||||
*mode = tzd->mode;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -272,9 +270,7 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,
|
|||
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;
|
||||
*mode = tz->mode;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -296,7 +292,7 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz,
|
|||
|
||||
mutex_unlock(&tz->lock);
|
||||
|
||||
data->mode = mode;
|
||||
tz->mode = mode;
|
||||
thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);
|
||||
|
||||
return 0;
|
||||
|
|
@ -979,7 +975,6 @@ __init *thermal_of_build_thermal_zone(struct device_node *np)
|
|||
|
||||
finish:
|
||||
of_node_put(child);
|
||||
tz->mode = THERMAL_DEVICE_DISABLED;
|
||||
|
||||
return tz;
|
||||
|
||||
|
|
@ -1134,6 +1129,7 @@ int __init of_parse_thermal_zones(void)
|
|||
of_thermal_free_zone(tz);
|
||||
/* attempting to build remaining zones still */
|
||||
}
|
||||
zone->mode = THERMAL_DEVICE_DISABLED;
|
||||
}
|
||||
of_node_put(np);
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче