Commit f364beb5 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'thermal-intel' 

Merge changes affecting thermal control on Intel platforms for 6.3-rc1:

 - Consolidate code accessing the Intel TCC (Thermal Control Circuitry)
   MSRs by introducing library functions for that and making the
   TCC-related code in thermal drivers use them (Zhang Rui).

 - Enhance the x86_pkg_temp_thermal driver to support dynamic tjmax
   changes (Zhang Rui).

 - Address an "unsigned expression compared with zero" warning in the
   intel_soc_dts_iosf thermal driver (Yang Li).

 - Update comments regarding two functions in the Intel Menlow thermal
   driver (Deming Wang).

 - Use sysfs_emit_at() instead of scnprintf() in the int340x thermal
   driver (ye xingchen).

 - Make the intel_pch thermal driver support the Wellsburg PCH (Tim
   Zimmermann).

 - Add trip point initialization helper functions for ACPI-defined trip
   points and modify two thermal drivers to use them (Rafael Wysocki,
   Daniel Lezcano).

 - Modify the intel_pch and processor_thermal_device_pci thermal drivers
   use generic trip point tables instead of thermal zone trip point
   callbacks (Daniel Lezcano).

 - Add production mode attribute sysfs attribute to the int340x thermal
   driver (Srinivas Pandruvada).

 - Rework dynamic trip point updates handling and locking in the int340x
   thermal driver (Rafael Wysocki).

 - Make the int340x thermal driver use a generic trip points table
   instead of thermal zone trip point callbacks (Rafael Wysocki, Daniel
   Lezcano).

* thermal-intel:
  thermal: intel: int340x: Use generic trip points table
  thermal: intel: int340x: Use zone lock for synchronization
  thermal: intel: int340x: Rework updating trip points
  thermal: ACPI: Initialize trips if temperature is out of range
  thermal: intel: processor_thermal_device_pci: Use generic trip point
  thermal: intel: int340x: Add production mode attribute
  thermal: intel: intel_pch: Use generic trip points
  thermal: ACPI: Add ACPI trip point routines
  thermal: intel: intel_pch: Add support for Wellsburg PCH
  thermal: int340x_thermal: Use sysfs_emit_at() instead of scnprintf()
  thermal: intel: menlow: Update function descriptions
  thermal: intel: Fix unsigned comparison with less than zero
  thermal/x86_pkg_temp_thermal: Add support for handling dynamic tjmax
  thermal/x86_pkg_temp_thermal: Use Intel TCC library
  thermal/intel/intel_tcc_cooling: Use Intel TCC library
  thermal/intel/intel_soc_dts_iosf: Use Intel TCC library
  thermal/int340x/processor_thermal: Use Intel TCC library
  thermal/intel: Introduce Intel TCC library
parents 79b20270 f4118dbe

Documentation/driver-api/thermal/intel_dptf.rst

+3 −0
Original line number Diff line number Diff line
@@ -84,6 +84,9 @@ DPTF ACPI Drivers interface 
	https:/github.com/intel/thermal_daemon for decoding

	thermal table.



``production_mode`` (RO)

	When different from zero, manufacturer locked thermal configuration

	from further changes.



ACPI Thermal Relationship table interface

------------------------------------------

drivers/thermal/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -76,6 +76,10 @@ config THERMAL_OF 
	  Say 'Y' here if you need to build thermal infrastructure

	  based on device tree.



config THERMAL_ACPI

       depends on ACPI

       bool



config THERMAL_WRITABLE_TRIPS

	bool "Enable writable trip points"

	help

drivers/thermal/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ thermal_sys-$(CONFIG_THERMAL_NETLINK) += thermal_netlink.o 
# interface to/from other layers providing sensors

thermal_sys-$(CONFIG_THERMAL_HWMON)		+= thermal_hwmon.o

thermal_sys-$(CONFIG_THERMAL_OF)		+= thermal_of.o

thermal_sys-$(CONFIG_THERMAL_ACPI)		+= thermal_acpi.o



# governors

thermal_sys-$(CONFIG_THERMAL_GOV_FAIR_SHARE)	+= gov_fair_share.o

drivers/thermal/intel/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -12,11 +12,16 @@ config X86_THERMAL_VECTOR 
	def_bool y

	depends on X86 && CPU_SUP_INTEL && X86_LOCAL_APIC



config INTEL_TCC

	bool

	depends on X86



config X86_PKG_TEMP_THERMAL

	tristate "X86 package temperature thermal driver"

	depends on X86_THERMAL_VECTOR

	select THERMAL_GOV_USER_SPACE

	select THERMAL_WRITABLE_TRIPS

	select INTEL_TCC

	default m

	help

	  Enable this to register CPU digital sensor for package temperature as
@@ -28,6 +33,7 @@ config INTEL_SOC_DTS_IOSF_CORE 
	tristate

	depends on X86 && PCI

	select IOSF_MBI

	select INTEL_TCC

	help

	  This is becoming a common feature for Intel SoCs to expose the additional

	  digital temperature sensors (DTSs) using side band interface (IOSF). This
@@ -75,6 +81,7 @@ config INTEL_BXT_PMIC_THERMAL 
config INTEL_PCH_THERMAL

	tristate "Intel PCH Thermal Reporting Driver"

	depends on X86 && PCI

	select THERMAL_ACPI if ACPI

	help

	  Enable this to support thermal reporting on certain intel PCHs.

	  Thermal reporting device will provide temperature reading,
@@ -83,6 +90,7 @@ config INTEL_PCH_THERMAL 
config INTEL_TCC_COOLING

	tristate "Intel TCC offset cooling Driver"

	depends on X86

	select INTEL_TCC

	help

	  Enable this to support system cooling by adjusting the effective TCC

	  activation temperature via the TCC Offset register, which is widely

drivers/thermal/intel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#

# Makefile for various Intel thermal drivers.



obj-$(CONFIG_INTEL_TCC)	+= intel_tcc.o

obj-$(CONFIG_INTEL_POWERCLAMP)	+= intel_powerclamp.o

obj-$(CONFIG_X86_PKG_TEMP_THERMAL)	+= x86_pkg_temp_thermal.o

obj-$(CONFIG_INTEL_SOC_DTS_IOSF_CORE)	+= intel_soc_dts_iosf.o