Commit a57cc2db authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Rafael J. Wysocki
Browse files

thermal: intel: int340x: processor_thermal: Fix additional deadlock 



Commit 52f04f10 ("thermal: intel: int340x: processor_thermal: Fix
deadlock") addressed deadlock issue during user space trip update. But it
missed a case when thermal zone device is disabled when user writes 0.

Call to thermal_zone_device_disable() also causes deadlock as it also
tries to lock tz->lock, which is already claimed by trip_point_temp_store()
in the thermal core code.

Remove call to thermal_zone_device_disable() in the function
sys_set_trip_temp(), which is called from trip_point_temp_store().

Fixes: 52f04f10 ("thermal: intel: int340x: processor_thermal: Fix deadlock")
Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: 6.2+ <stable@vger.kernel.org> # 6.2+
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 197b6b60

drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c

+0 −1
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ static int sys_set_trip_temp(struct thermal_zone_device *tzd, int trip, int temp 
		cancel_delayed_work_sync(&pci_info->work);

		proc_thermal_mmio_write(pci_info, PROC_THERMAL_MMIO_INT_ENABLE_0, 0);

		proc_thermal_mmio_write(pci_info, PROC_THERMAL_MMIO_THRES_0, 0);

		thermal_zone_device_disable(tzd);

		pci_info->stored_thres = 0;

		return 0;

	}