mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
31fd4b9db1
Currently the imx_sc driver is reimplementing part of the thermal zone parsing from the thermal OF tree code to get the sensor id associated with a thermal zone sensor. The driver platform specific code should know what sensor is present and not rely on the thermal zone description to do a discovery. Well that is arguable but all the other drivers have a per platform data telling what sensor id to use. The imx_sc thermal driver is the only one using a different approach. Not invalid but forcing to keep a specific function 'thermal_zone_of_get_sensor_id()' to get the sensor id for a specific thermal zone as the self-explanatory function tells and having device tree code inside the driver. The thermal OF code had a rework and remains now self-encapsulated with a register/unregister functions and their 'devm' variants, except for the function mentioned above. After investigating, it appears the imx_sc sensor is defined in arch/arm64/boot/dts/freescale/imx8qxp.dtsi: which defines the cpu-thermal zone with the id: IMX_SC_R_SYSTEM This dtsi is included by: - imx8qxp-ai_ml.dts - imx8qxp-colibri.dtsi - imx8qxp-mek.dts The two first ones do not define more thermal zones The third one adds the pmic-thermal0 zone with id: IMX_SC_R_PMIC_0 The thermal OF code returns -ENODEV if the thermal zone registration with a specific id fails because the description is not available in the DT for such a sensor id. In this case we continue with the other ids without bailing out with an error. So we can build for the 'fsl,imx-sc-thermal' a compatible data, an array of sensor ids containing IMX_SC_R_SYSTEM and IMX_SC_R_PMIC_0. The latter won't be found but that will not result in an error but a normal case where we continue the initialization with other ids. Just to clarify, it is what the thermal framework does and what the other drivers are expecting: when a registration fails with -ENODEV this is not an error but a case where the description is not found in the device tree, that be can the entire thermal zones description or a specific thermal zone with an unknown id. There is one small functional change but without impact. When there is no 'thermal-zones' description the probe function was returning '-ENODEV', now it returns zero. When a thermal zone fails to register with an error different from '-ENODEV', the error is detected and returned. Change the code accordingly and remove the OF code from the driver. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Link: https://lore.kernel.org/r/20220818082316.2717095-1-daniel.lezcano@linaro.org
155 lines
3.6 KiB
C
155 lines
3.6 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright 2018-2020 NXP.
|
|
*/
|
|
|
|
#include <dt-bindings/firmware/imx/rsrc.h>
|
|
#include <linux/err.h>
|
|
#include <linux/firmware/imx/sci.h>
|
|
#include <linux/module.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_device.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/thermal.h>
|
|
|
|
#include "thermal_core.h"
|
|
#include "thermal_hwmon.h"
|
|
|
|
#define IMX_SC_MISC_FUNC_GET_TEMP 13
|
|
|
|
static struct imx_sc_ipc *thermal_ipc_handle;
|
|
|
|
struct imx_sc_sensor {
|
|
struct thermal_zone_device *tzd;
|
|
u32 resource_id;
|
|
};
|
|
|
|
struct req_get_temp {
|
|
u16 resource_id;
|
|
u8 type;
|
|
} __packed __aligned(4);
|
|
|
|
struct resp_get_temp {
|
|
s16 celsius;
|
|
s8 tenths;
|
|
} __packed __aligned(4);
|
|
|
|
struct imx_sc_msg_misc_get_temp {
|
|
struct imx_sc_rpc_msg hdr;
|
|
union {
|
|
struct req_get_temp req;
|
|
struct resp_get_temp resp;
|
|
} data;
|
|
} __packed __aligned(4);
|
|
|
|
static int imx_sc_thermal_get_temp(struct thermal_zone_device *tz, int *temp)
|
|
{
|
|
struct imx_sc_msg_misc_get_temp msg;
|
|
struct imx_sc_rpc_msg *hdr = &msg.hdr;
|
|
struct imx_sc_sensor *sensor = tz->devdata;
|
|
int ret;
|
|
|
|
msg.data.req.resource_id = sensor->resource_id;
|
|
msg.data.req.type = IMX_SC_C_TEMP;
|
|
|
|
hdr->ver = IMX_SC_RPC_VERSION;
|
|
hdr->svc = IMX_SC_RPC_SVC_MISC;
|
|
hdr->func = IMX_SC_MISC_FUNC_GET_TEMP;
|
|
hdr->size = 2;
|
|
|
|
ret = imx_scu_call_rpc(thermal_ipc_handle, &msg, true);
|
|
if (ret) {
|
|
dev_err(&sensor->tzd->device, "read temp sensor %d failed, ret %d\n",
|
|
sensor->resource_id, ret);
|
|
return ret;
|
|
}
|
|
|
|
*temp = msg.data.resp.celsius * 1000 + msg.data.resp.tenths * 100;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct thermal_zone_device_ops imx_sc_thermal_ops = {
|
|
.get_temp = imx_sc_thermal_get_temp,
|
|
};
|
|
|
|
static int imx_sc_thermal_probe(struct platform_device *pdev)
|
|
{
|
|
struct imx_sc_sensor *sensor;
|
|
const int *resource_id;
|
|
int i, ret;
|
|
|
|
ret = imx_scu_get_handle(&thermal_ipc_handle);
|
|
if (ret)
|
|
return ret;
|
|
|
|
resource_id = of_device_get_match_data(&pdev->dev);
|
|
if (!resource_id)
|
|
return -EINVAL;
|
|
|
|
for (i = 0; resource_id[i] > 0; i++) {
|
|
|
|
sensor = devm_kzalloc(&pdev->dev, sizeof(*sensor), GFP_KERNEL);
|
|
if (!sensor)
|
|
return -ENOMEM;
|
|
|
|
sensor->resource_id = resource_id[i];
|
|
|
|
sensor->tzd = devm_thermal_of_zone_register(&pdev->dev, sensor->resource_id,
|
|
sensor, &imx_sc_thermal_ops);
|
|
if (IS_ERR(sensor->tzd)) {
|
|
/*
|
|
* Save the error value before freeing the
|
|
* sensor pointer, otherwise we endup with a
|
|
* use-after-free error
|
|
*/
|
|
ret = PTR_ERR(sensor->tzd);
|
|
|
|
devm_kfree(&pdev->dev, sensor);
|
|
|
|
/*
|
|
* The thermal framework notifies us there is
|
|
* no thermal zone description for such a
|
|
* sensor id
|
|
*/
|
|
if (ret == -ENODEV)
|
|
continue;
|
|
|
|
dev_err(&pdev->dev, "failed to register thermal zone\n");
|
|
return ret;
|
|
}
|
|
|
|
if (devm_thermal_add_hwmon_sysfs(sensor->tzd))
|
|
dev_warn(&pdev->dev, "failed to add hwmon sysfs attributes\n");
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int imx_sc_thermal_remove(struct platform_device *pdev)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static int imx_sc_sensors[] = { IMX_SC_R_SYSTEM, IMX_SC_R_PMIC_0, -1 };
|
|
|
|
static const struct of_device_id imx_sc_thermal_table[] = {
|
|
{ .compatible = "fsl,imx-sc-thermal", .data = imx_sc_sensors },
|
|
{}
|
|
};
|
|
MODULE_DEVICE_TABLE(of, imx_sc_thermal_table);
|
|
|
|
static struct platform_driver imx_sc_thermal_driver = {
|
|
.probe = imx_sc_thermal_probe,
|
|
.remove = imx_sc_thermal_remove,
|
|
.driver = {
|
|
.name = "imx-sc-thermal",
|
|
.of_match_table = imx_sc_thermal_table,
|
|
},
|
|
};
|
|
module_platform_driver(imx_sc_thermal_driver);
|
|
|
|
MODULE_AUTHOR("Anson Huang <Anson.Huang@nxp.com>");
|
|
MODULE_DESCRIPTION("Thermal driver for NXP i.MX SoCs with system controller");
|
|
MODULE_LICENSE("GPL v2");
|