Commit aa512c11 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'thermal-6.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull more thermal control updates from Rafael Wysocki:
 "These fix assorted issues in the thermal core and ARM thermal drivers.

  Specifics:

   - Use platform data to get the sensor ID instead of parsing the
     device in imx_sc thermal driver and remove the dedicated OF
     function from the core code (Daniel Lezcano).

   - Fix Kconfig dependency for the QCom tsens thermal driver (Jonathan
     Cameron).

   - Add missing const annotation to the RCar ops thermal driver (Lad
     Prabhakar).

   - Drop duplicate parameter check from
     thermal_zone_device_register_with_trips() (Lad Prabhakar).

   - Fix NULL pointer dereference in trip_point_temp_store() by making
     it check if the ->set_trip_temp() operation is present (Lad
     Prabhakar).

   - Fix the MSM8939 fourth sensor hardware ID in the QCom tsens thermal
     driver (Vincent Knecht)"

* tag 'thermal-6.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal/drivers/qcom/tsens-v0_1: Fix MSM8939 fourth sensor hw_id
  thermal/core: Add a check before calling set_trip_temp()
  thermal/core: Drop valid pointer check for type
  thermal/drivers/rcar_thermal: Constify static thermal_zone_device_ops
  thermal/drivers/qcom: Drop false build dependency of all QCOM drivers on QCOM_TSENS
  thermal/of: Remove the thermal_zone_of_get_sensor_id() function
  thermal/drivers/imx_sc: Rely on the platform data to get the resource id
parents f848b3cd e021563f

drivers/thermal/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ obj-$(CONFIG_DA9062_THERMAL) += da9062-thermal.o 
obj-y				+= intel/

obj-$(CONFIG_TI_SOC_THERMAL)	+= ti-soc-thermal/

obj-y				+= st/

obj-$(CONFIG_QCOM_TSENS)	+= qcom/

obj-y				+= qcom/

obj-y				+= tegra/

obj-$(CONFIG_HISI_THERMAL)     += hisi_thermal.o

obj-$(CONFIG_MTK_THERMAL)	+= mtk_thermal.o

drivers/thermal/imx_sc_thermal.c

+33 −35
Original line number Diff line number Diff line
@@ -76,59 +76,55 @@ static const struct thermal_zone_device_ops imx_sc_thermal_ops = { 


static int imx_sc_thermal_probe(struct platform_device *pdev)

{

	struct device_node *np, *child, *sensor_np;

	struct imx_sc_sensor *sensor;

	int ret;

	const int *resource_id;

	int i, ret;



	ret = imx_scu_get_handle(&thermal_ipc_handle);

	if (ret)

		return ret;



	np = of_find_node_by_name(NULL, "thermal-zones");

	if (!np)

		return -ENODEV;

	resource_id = of_device_get_match_data(&pdev->dev);

	if (!resource_id)

		return -EINVAL;



	sensor_np = of_node_get(pdev->dev.of_node);

	for (i = 0; resource_id[i] > 0; i++) {



	for_each_available_child_of_node(np, child) {

		sensor = devm_kzalloc(&pdev->dev, sizeof(*sensor), GFP_KERNEL);

		if (!sensor) {

			of_node_put(child);

			ret = -ENOMEM;

			goto put_node;

		}

		if (!sensor)

			return -ENOMEM;



		ret = thermal_zone_of_get_sensor_id(child,

						    sensor_np,

						    &sensor->resource_id);

		if (ret < 0) {

			dev_err(&pdev->dev,

				"failed to get valid sensor resource id: %d\n",

				ret);

			of_node_put(child);

			break;

		}

		sensor->resource_id = resource_id[i];



		sensor->tzd = devm_thermal_of_zone_register(&pdev->dev,

							    sensor->resource_id,

							    sensor,

							    &imx_sc_thermal_ops);

		sensor->tzd = devm_thermal_of_zone_register(&pdev->dev, sensor->resource_id,

							    sensor, &imx_sc_thermal_ops);

		if (IS_ERR(sensor->tzd)) {

			dev_err(&pdev->dev, "failed to register thermal zone\n");

			/*

			 * Save the error value before freeing the

			 * sensor pointer, otherwise we endup with a

			 * use-after-free error

			 */

			ret = PTR_ERR(sensor->tzd);

			of_node_put(child);

			break;



			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");

	}



put_node:

	of_node_put(sensor_np);

	of_node_put(np);



	return ret;

	return 0;

}



static int imx_sc_thermal_remove(struct platform_device *pdev)
@@ -136,8 +132,10 @@ 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", },

	{ .compatible = "fsl,imx-sc-thermal", .data =  imx_sc_sensors },

	{}

};

MODULE_DEVICE_TABLE(of, imx_sc_thermal_table);

drivers/thermal/qcom/tsens-v0_1.c

+1 −1
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ static const struct tsens_ops ops_8939 = { 
struct tsens_plat_data data_8939 = {

	.num_sensors	= 10,

	.ops		= &ops_8939,

	.hw_ids		= (unsigned int []){ 0, 1, 2, 4, 5, 6, 7, 8, 9, 10 },

	.hw_ids		= (unsigned int []){ 0, 1, 2, 3, 5, 6, 7, 8, 9, 10 },



	.feat		= &tsens_v0_1_feat,

	.fields	= tsens_v0_1_regfields,

drivers/thermal/rcar_thermal.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static int rcar_thermal_get_trip_temp(struct thermal_zone_device *zone, 
	return 0;

}



static struct thermal_zone_device_ops rcar_thermal_zone_of_ops = {

static const struct thermal_zone_device_ops rcar_thermal_zone_of_ops = {

	.get_temp	= rcar_thermal_get_temp,

};

drivers/thermal/thermal_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1186,7 +1186,7 @@ thermal_zone_device_register_with_trips(const char *type, struct thermal_trip *t 
		return ERR_PTR(-EINVAL);

	}



	if (type && strlen(type) >= THERMAL_NAME_LENGTH) {

	if (strlen(type) >= THERMAL_NAME_LENGTH) {

		pr_err("Thermal zone name (%s) too long, should be under %d chars\n",

		       type, THERMAL_NAME_LENGTH);

		return ERR_PTR(-EINVAL);