Commit 14e0e8d0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents cf26839d d1137354

drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c

+2 −1
Original line number Diff line number Diff line
@@ -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 |

drivers/thermal/thermal_core.c

+2 −2
Original line number Diff line number Diff line
@@ -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.