Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf1ba1d7 authored by Mikhail Lappo's avatar Mikhail Lappo Committed by Zhang Rui
Browse files

thermal: imx: Fix race condition in imx_thermal_probe() 



When device boots with T > T_trip_1 and requests interrupt,
the race condition takes place. The interrupt comes before
THERMAL_DEVICE_ENABLED is set. This leads to an attempt to
reading sensor value from irq and disabling the sensor, based on
the data->mode field, which expected to be THERMAL_DEVICE_ENABLED,
but still stays as THERMAL_DEVICE_DISABLED. Afher this issue
sensor is never re-enabled, as the driver state is wrong.

Fix this problem by setting the 'data' members prior to
requesting the interrupts.

Fixes: 37713a1e ("thermal: imx: implement thermal alarm interrupt handling")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarMikhail Lappo <mikhail.lappo@esrlabs.com>
Signed-off-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Acked-by: default avatarDong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent 0c8efd61

drivers/thermal/imx_thermal.c

+3 −3
Original line number Diff line number Diff line
@@ -637,6 +637,9 @@ static int imx_thermal_probe(struct platform_device *pdev) 
	regmap_write(map, TEMPSENSE0 + REG_CLR, TEMPSENSE0_POWER_DOWN);

	regmap_write(map, TEMPSENSE0 + REG_SET, TEMPSENSE0_MEASURE_TEMP);



	data->irq_enabled = true;

	data->mode = THERMAL_DEVICE_ENABLED;



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

			imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,

			0, "imx_thermal", data);
@@ -649,9 +652,6 @@ static int imx_thermal_probe(struct platform_device *pdev) 
		return ret;

	}



	data->irq_enabled = true;

	data->mode = THERMAL_DEVICE_ENABLED;



	return 0;

}