Commit bbcf90c0 authored by Andrzej Pietrasiewicz's avatar Andrzej Pietrasiewicz Committed by Daniel Lezcano

thermal: Explicitly enable non-changing thermal zone devices

Some thermal zone devices never change their state, so they should be
always enabled.
Signed-off-by: default avatarAndrzej Pietrasiewicz <andrzej.p@collabora.com>
Reviewed-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20200629122925.21729-9-andrzej.p@collabora.com
parent 7f4957be
...@@ -92,6 +92,14 @@ int cxgb4_thermal_init(struct adapter *adap) ...@@ -92,6 +92,14 @@ int cxgb4_thermal_init(struct adapter *adap)
ch_thermal->tzdev = NULL; ch_thermal->tzdev = NULL;
return ret; return ret;
} }
ret = thermal_zone_device_enable(ch_thermal->tzdev);
if (ret) {
dev_err(adap->pdev_dev, "Failed to enable thermal zone\n");
thermal_zone_device_unregister(adap->ch_thermal.tzdev);
return ret;
}
return 0; return 0;
} }
......
...@@ -733,7 +733,7 @@ static struct thermal_zone_device_ops tzone_ops = { ...@@ -733,7 +733,7 @@ static struct thermal_zone_device_ops tzone_ops = {
static void iwl_mvm_thermal_zone_register(struct iwl_mvm *mvm) static void iwl_mvm_thermal_zone_register(struct iwl_mvm *mvm)
{ {
int i; int i, ret;
char name[16]; char name[16];
static atomic_t counter = ATOMIC_INIT(0); static atomic_t counter = ATOMIC_INIT(0);
...@@ -759,6 +759,13 @@ static void iwl_mvm_thermal_zone_register(struct iwl_mvm *mvm) ...@@ -759,6 +759,13 @@ static void iwl_mvm_thermal_zone_register(struct iwl_mvm *mvm)
return; return;
} }
ret = thermal_zone_device_enable(mvm->tz_device.tzone);
if (ret) {
IWL_DEBUG_TEMP(mvm, "Failed to enable thermal zone\n");
thermal_zone_device_unregister(mvm->tz_device.tzone);
return;
}
/* 0 is a valid temperature, /* 0 is a valid temperature,
* so initialize the array with S16_MIN which invalid temperature * so initialize the array with S16_MIN which invalid temperature
*/ */
......
...@@ -493,6 +493,12 @@ static int mid_thermal_probe(struct platform_device *pdev) ...@@ -493,6 +493,12 @@ static int mid_thermal_probe(struct platform_device *pdev)
ret = PTR_ERR(pinfo->tzd[i]); ret = PTR_ERR(pinfo->tzd[i]);
goto err; goto err;
} }
ret = thermal_zone_device_enable(pinfo->tzd[i]);
if (ret) {
kfree(td_info);
thermal_zone_device_unregister(pinfo->tzd[i]);
goto err;
}
} }
pinfo->pdev = pdev; pinfo->pdev = pdev;
......
...@@ -939,7 +939,7 @@ static struct thermal_zone_device_ops psy_tzd_ops = { ...@@ -939,7 +939,7 @@ static struct thermal_zone_device_ops psy_tzd_ops = {
static int psy_register_thermal(struct power_supply *psy) static int psy_register_thermal(struct power_supply *psy)
{ {
int i; int i, ret;
if (psy->desc->no_thermal) if (psy->desc->no_thermal)
return 0; return 0;
...@@ -949,7 +949,12 @@ static int psy_register_thermal(struct power_supply *psy) ...@@ -949,7 +949,12 @@ static int psy_register_thermal(struct power_supply *psy)
if (psy->desc->properties[i] == POWER_SUPPLY_PROP_TEMP) { if (psy->desc->properties[i] == POWER_SUPPLY_PROP_TEMP) {
psy->tzd = thermal_zone_device_register(psy->desc->name, psy->tzd = thermal_zone_device_register(psy->desc->name,
0, 0, psy, &psy_tzd_ops, NULL, 0, 0); 0, 0, psy, &psy_tzd_ops, NULL, 0, 0);
return PTR_ERR_OR_ZERO(psy->tzd); if (IS_ERR(psy->tzd))
return PTR_ERR(psy->tzd);
ret = thermal_zone_device_enable(psy->tzd);
if (ret)
thermal_zone_device_unregister(psy->tzd);
return ret;
} }
} }
return 0; return 0;
......
...@@ -874,6 +874,12 @@ static int armada_thermal_probe(struct platform_device *pdev) ...@@ -874,6 +874,12 @@ static int armada_thermal_probe(struct platform_device *pdev)
return PTR_ERR(tz); return PTR_ERR(tz);
} }
ret = thermal_zone_device_enable(tz);
if (ret) {
thermal_zone_device_unregister(tz);
return ret;
}
drvdata->type = LEGACY; drvdata->type = LEGACY;
drvdata->data.tz = tz; drvdata->data.tz = tz;
platform_set_drvdata(pdev, drvdata); platform_set_drvdata(pdev, drvdata);
......
...@@ -153,6 +153,12 @@ static int dove_thermal_probe(struct platform_device *pdev) ...@@ -153,6 +153,12 @@ static int dove_thermal_probe(struct platform_device *pdev)
return PTR_ERR(thermal); return PTR_ERR(thermal);
} }
ret = thermal_zone_device_enable(thermal);
if (ret) {
thermal_zone_device_unregister(thermal);
return ret;
}
platform_set_drvdata(pdev, thermal); platform_set_drvdata(pdev, thermal);
return 0; return 0;
......
...@@ -259,9 +259,14 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev, ...@@ -259,9 +259,14 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev,
ret = PTR_ERR(int34x_thermal_zone->zone); ret = PTR_ERR(int34x_thermal_zone->zone);
goto err_thermal_zone; goto err_thermal_zone;
} }
ret = thermal_zone_device_enable(int34x_thermal_zone->zone);
if (ret)
goto err_enable;
return int34x_thermal_zone; return int34x_thermal_zone;
err_enable:
thermal_zone_device_unregister(int34x_thermal_zone->zone);
err_thermal_zone: err_thermal_zone:
acpi_lpat_free_conversion_table(int34x_thermal_zone->lpat_table); acpi_lpat_free_conversion_table(int34x_thermal_zone->lpat_table);
kfree(int34x_thermal_zone->aux_trips); kfree(int34x_thermal_zone->aux_trips);
......
...@@ -352,9 +352,14 @@ static int intel_pch_thermal_probe(struct pci_dev *pdev, ...@@ -352,9 +352,14 @@ static int intel_pch_thermal_probe(struct pci_dev *pdev,
err = PTR_ERR(ptd->tzd); err = PTR_ERR(ptd->tzd);
goto error_cleanup; goto error_cleanup;
} }
err = thermal_zone_device_enable(ptd->tzd);
if (err)
goto err_unregister;
return 0; return 0;
err_unregister:
thermal_zone_device_unregister(ptd->tzd);
error_cleanup: error_cleanup:
iounmap(ptd->hw_base); iounmap(ptd->hw_base);
error_release: error_release:
......
...@@ -329,6 +329,9 @@ static int add_dts_thermal_zone(int id, struct intel_soc_dts_sensor_entry *dts, ...@@ -329,6 +329,9 @@ static int add_dts_thermal_zone(int id, struct intel_soc_dts_sensor_entry *dts,
ret = PTR_ERR(dts->tzone); ret = PTR_ERR(dts->tzone);
goto err_ret; goto err_ret;
} }
ret = thermal_zone_device_enable(dts->tzone);
if (ret)
goto err_enable;
ret = soc_dts_enable(id); ret = soc_dts_enable(id);
if (ret) if (ret)
......
...@@ -363,6 +363,12 @@ static int pkg_temp_thermal_device_add(unsigned int cpu) ...@@ -363,6 +363,12 @@ static int pkg_temp_thermal_device_add(unsigned int cpu)
kfree(zonedev); kfree(zonedev);
return err; return err;
} }
err = thermal_zone_device_enable(zonedev->tzone);
if (err) {
thermal_zone_device_unregister(zonedev->tzone);
kfree(zonedev);
return err;
}
/* Store MSR value for package thermal interrupt, to restore at exit */ /* Store MSR value for package thermal interrupt, to restore at exit */
rdmsr(MSR_IA32_PACKAGE_THERM_INTERRUPT, zonedev->msr_pkg_therm_low, rdmsr(MSR_IA32_PACKAGE_THERM_INTERRUPT, zonedev->msr_pkg_therm_low,
zonedev->msr_pkg_therm_high); zonedev->msr_pkg_therm_high);
......
...@@ -65,6 +65,7 @@ static int kirkwood_thermal_probe(struct platform_device *pdev) ...@@ -65,6 +65,7 @@ static int kirkwood_thermal_probe(struct platform_device *pdev)
struct thermal_zone_device *thermal = NULL; struct thermal_zone_device *thermal = NULL;
struct kirkwood_thermal_priv *priv; struct kirkwood_thermal_priv *priv;
struct resource *res; struct resource *res;
int ret;
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
if (!priv) if (!priv)
...@@ -82,6 +83,12 @@ static int kirkwood_thermal_probe(struct platform_device *pdev) ...@@ -82,6 +83,12 @@ static int kirkwood_thermal_probe(struct platform_device *pdev)
"Failed to register thermal zone device\n"); "Failed to register thermal zone device\n");
return PTR_ERR(thermal); return PTR_ERR(thermal);
} }
ret = thermal_zone_device_enable(thermal);
if (ret) {
thermal_zone_device_unregister(thermal);
dev_err(&pdev->dev, "Failed to enable thermal zone device\n");
return ret;
}
platform_set_drvdata(pdev, thermal); platform_set_drvdata(pdev, thermal);
......
...@@ -550,12 +550,19 @@ static int rcar_thermal_probe(struct platform_device *pdev) ...@@ -550,12 +550,19 @@ static int rcar_thermal_probe(struct platform_device *pdev)
priv->zone = devm_thermal_zone_of_sensor_register( priv->zone = devm_thermal_zone_of_sensor_register(
dev, i, priv, dev, i, priv,
&rcar_thermal_zone_of_ops); &rcar_thermal_zone_of_ops);
else else {
priv->zone = thermal_zone_device_register( priv->zone = thermal_zone_device_register(
"rcar_thermal", "rcar_thermal",
1, 0, priv, 1, 0, priv,
&rcar_thermal_zone_ops, NULL, 0, &rcar_thermal_zone_ops, NULL, 0,
idle); idle);
ret = thermal_zone_device_enable(priv->zone);
if (ret) {
thermal_zone_device_unregister(priv->zone);
priv->zone = ERR_PTR(ret);
}
}
if (IS_ERR(priv->zone)) { if (IS_ERR(priv->zone)) {
dev_err(dev, "can't register thermal zone\n"); dev_err(dev, "can't register thermal zone\n");
ret = PTR_ERR(priv->zone); ret = PTR_ERR(priv->zone);
......
...@@ -131,6 +131,11 @@ static int spear_thermal_probe(struct platform_device *pdev) ...@@ -131,6 +131,11 @@ static int spear_thermal_probe(struct platform_device *pdev)
ret = PTR_ERR(spear_thermal); ret = PTR_ERR(spear_thermal);
goto disable_clk; goto disable_clk;
} }
ret = thermal_zone_device_enable(spear_thermal);
if (ret) {
dev_err(&pdev->dev, "Cannot enable thermal zone\n");
goto unregister_tzd;
}
platform_set_drvdata(pdev, spear_thermal); platform_set_drvdata(pdev, spear_thermal);
...@@ -139,6 +144,8 @@ static int spear_thermal_probe(struct platform_device *pdev) ...@@ -139,6 +144,8 @@ static int spear_thermal_probe(struct platform_device *pdev)
return 0; return 0;
unregister_tzd:
thermal_zone_device_unregister(spear_thermal);
disable_clk: disable_clk:
clk_disable(stdev->clk); clk_disable(stdev->clk);
......
...@@ -246,11 +246,16 @@ int st_thermal_register(struct platform_device *pdev, ...@@ -246,11 +246,16 @@ int st_thermal_register(struct platform_device *pdev,
ret = PTR_ERR(sensor->thermal_dev); ret = PTR_ERR(sensor->thermal_dev);
goto sensor_off; goto sensor_off;
} }
ret = thermal_zone_device_enable(sensor->thermal_dev);
if (ret)
goto tzd_unregister;
platform_set_drvdata(pdev, sensor); platform_set_drvdata(pdev, sensor);
return 0; return 0;
tzd_unregister:
thermal_zone_device_unregister(sensor->thermal_dev);
sensor_off: sensor_off:
st_thermal_sensor_off(sensor); st_thermal_sensor_off(sensor);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment