github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-24 23:22:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Thermal control updates for 6.19-rc2

Browse Source 
- Set a feature flag in the int340x thermal driver to enable the
    power slider interface for Wildcat Lake processors (Srinivas
    Pandruvada)
 
  - Fix typo and indentation in comments in the thermal core (Thorsten
    Blum)
 -----BEGIN PGP SIGNATURE-----
 
 iQFGBAABCAAwFiEEcM8Aw/RY0dgsiRUR7l+9nS/U47UFAmlEW84SHHJqd0Byand5
 c29ja2kubmV0AAoJEO5fvZ0v1OO1dtoH/1RYu0QSZDMud/0UOX4Vipj8Gw9yIFaE
 W8yTaVSlnZ/S0T4Q7MyPvSaqPYs4l0sm3c796afTL12JiW9SqzOsGWPbJzZiDMQ6
 4zID4qZ/db4UN9WEmDAD6TGA9qZhtsXVNN01TQxYiJhK/KJ/62EYVEoI4o7rgto7
 jYsI/Ulfvdx7nwx2mmvdBARPstOvnxkj+2M7ezWYKjvx/oJpEdjZLeWe+zyCwkhj
 NAkOLKPWpBKLDH+wZPEeYkowOShVTSUFXPw/CEg+wcO5iUOwN+zb7gKNpyw1M1gc
 v/5EtTUdnHsuX7Q1O+Q8omTeGNCp14w12wc4hoEdsuGTpfQ0p9ofBo4=
 =8F9W
 -----END PGP SIGNATURE-----

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

Pull thermal control fixes from Rafael Wysocki:
 "These enable a new hardware feature in the int340x thermal driver and
  fix up comments in the thermal core code:

   - Set a feature flag in the int340x thermal driver to enable the
     power slider interface for Wildcat Lake processors (Srinivas
     Pandruvada)

   - Fix typo and indentation in comments in the thermal core (Thorsten
     Blum)"

* tag 'thermal-6.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal: core: Fix typo and indentation in comments
  thermal: intel: int340x: Enable power slider interface for Wildcat Lake
This commit is contained in:
Linus Torvalds 2025-12-19 08:23:23 +12:00
commit 14e0e8d0fc
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
View File

@ -503,7 +503,8 @@ static const struct pci_device_id proc_thermal_pci_ids[] = {
{ PCI_DEVICE_DATA(INTEL, WCL_THERMAL, PROC_THERMAL_FEATURE_MSI_SUPPORT |
PROC_THERMAL_FEATURE_RAPL | PROC_THERMAL_FEATURE_DLVR |
PROC_THERMAL_FEATURE_DVFS | PROC_THERMAL_FEATURE_WT_HINT |
PROC_THERMAL_FEATURE_POWER_FLOOR | PROC_THERMAL_FEATURE_PTC) },
PROC_THERMAL_FEATURE_POWER_FLOOR | PROC_THERMAL_FEATURE_PTC |
PROC_THERMAL_FEATURE_SOC_POWER_SLIDER) },
{ PCI_DEVICE_DATA(INTEL, NVL_H_THERMAL, PROC_THERMAL_FEATURE_RAPL |
PROC_THERMAL_FEATURE_DLVR | PROC_THERMAL_FEATURE_DVFS |
PROC_THERMAL_FEATURE_MSI_SUPPORT | PROC_THERMAL_FEATURE_WT_HINT |

4
drivers/thermal/thermal_core.c
View File

@ -500,7 +500,7 @@ void thermal_zone_set_trip_hyst(struct thermal_zone_device *tz,
WRITE_ONCE(trip->hysteresis, hyst);
thermal_notify_tz_trip_change(tz, trip);
/*
* If the zone temperature is above or at the trip tmperature, the trip
* If the zone temperature is above or at the trip temperature, the trip
* is in the trips_reached list and its threshold is equal to its low
* temperature. It needs to stay in that list, but its threshold needs
* to be updated and the list ordering may need to be restored.
@ -1043,7 +1043,7 @@ static void thermal_cooling_device_init_complete(struct thermal_cooling_device *
* @np: a pointer to a device tree node.
* @type: the thermal cooling device type.
* @devdata: device private data.
* @ops: standard thermal cooling devices callbacks.
* @ops: standard thermal cooling devices callbacks.
*
* This interface function adds a new thermal cooling device (fan/processor/...)
* to /sys/class/thermal/ folder as cooling_device[0-*]. It tries to bind itself