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

Merge tag 'thermal-5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull thermal control fixes from Rafael Wysocki:
 "These fix the handling of thermal zones during system resume and
  disable building of the int340x thermal driver on 32-bit.

  Specifics:

   - Prevent the previous high and low thermal zone trip values from
     being retained over a system suspend-resume cycle (Manaf
     Meethalavalappu Pallikunhi)

   - Prevent the int340x thermal driver from being built in 32-bit
     kernel configurations, because running it on 32-bit is questionable
     (Arnd Bergmann)"

* tag 'thermal-5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal: core: Reset previous low and high trip during thermal zone init
  thermal: int340x: Limit Kconfig to 64-bit
parents 18e2befa b49e0015

drivers/thermal/intel/int340x_thermal/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -5,12 +5,12 @@ 


config INT340X_THERMAL

	tristate "ACPI INT340X thermal drivers"

	depends on X86 && ACPI && PCI

	depends on X86_64 && ACPI && PCI

	select THERMAL_GOV_USER_SPACE

	select ACPI_THERMAL_REL

	select ACPI_FAN

	select INTEL_SOC_DTS_IOSF_CORE

	select PROC_THERMAL_MMIO_RAPL if X86_64 && POWERCAP

	select PROC_THERMAL_MMIO_RAPL if POWERCAP

	help

	  Newer laptops and tablets that use ACPI may have thermal sensors and

	  other devices with thermal control capabilities outside the core

drivers/thermal/thermal_core.c

+2 −0
Original line number Diff line number Diff line
@@ -421,6 +421,8 @@ static void thermal_zone_device_init(struct thermal_zone_device *tz) 
{

	struct thermal_instance *pos;

	tz->temperature = THERMAL_TEMP_INVALID;

	tz->prev_low_trip = -INT_MAX;

	tz->prev_high_trip = INT_MAX;

	list_for_each_entry(pos, &tz->thermal_instances, tz_node)

		pos->initialized = false;

}