Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branches 'thermal-core' and 'thermal-intel'

Merge thermal core changes and Intel thermal drivers changes for
6.9-rc1:

- Store zone trips table and zone operations directly in struct
thermal_zone_device (Rafael Wysocki).

- Rework writable trip points handling (Rafael Wysocki).

- Thermal core code cleanups (Dan Carpenter, Flavio Suligoi).

- Use thermal zone accessor functions in the int340x Intel thermal
driver (Rafael Wysocki).

- Add Lunar Lake-M PCI ID to the int340x Intel thermal driver (Srinivas
Pandruvada).

* thermal-core:
thermal: core: remove unnecessary check in trip_point_hyst_store()
thermal: core: Remove excess empty line from a comment
thermal: core: Eliminate writable trip points masks
thermal: of: Set THERMAL_TRIP_FLAG_RW_TEMP directly
thermal: imx: Set THERMAL_TRIP_FLAG_RW_TEMP directly
wifi: iwlwifi: mvm: Set THERMAL_TRIP_FLAG_RW_TEMP directly
mlxsw: core_thermal: Set THERMAL_TRIP_FLAG_RW_TEMP directly
thermal: intel: Set THERMAL_TRIP_FLAG_RW_TEMP directly
thermal: core: Drop the .set_trip_hyst() thermal zone operation
thermal: core: Add flags to struct thermal_trip
thermal: core: Move initial num_trips assignment before memcpy()
thermal: Get rid of CONFIG_THERMAL_WRITABLE_TRIPS
thermal: intel: Adjust ops handling during thermal zone registration
thermal: ACPI: Constify acpi_thermal_zone_ops
thermal: core: Store zone ops in struct thermal_zone_device
thermal: intel: Discard trip tables after zone registration
thermal: ACPI: Discard trips table after zone registration
thermal: core: Store zone trips table in struct thermal_zone_device

* thermal-intel:
thermal: intel: int340x_thermal: Use thermal zone accessor functions
thermal: int340x: processor_thermal: Add Lunar Lake-M PCI ID

+4 -1
+2 -1
drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
··· 58 58 59 59 static void int340x_thermal_critical(struct thermal_zone_device *zone) 60 60 { 61 - dev_dbg(&zone->device, "%s: critical temperature reached\n", zone->type); 61 + dev_dbg(thermal_zone_device(zone), "%s: critical temperature reached\n", 62 + thermal_zone_device_type(zone)); 62 63 } 63 64 64 65 static inline void *int_to_trip_priv(int i)
+1
drivers/thermal/intel/int340x_thermal/processor_thermal_device.h
··· 25 25 #define PCI_DEVICE_ID_INTEL_HSB_THERMAL 0x0A03 26 26 #define PCI_DEVICE_ID_INTEL_ICL_THERMAL 0x8a03 27 27 #define PCI_DEVICE_ID_INTEL_JSL_THERMAL 0x4E03 28 + #define PCI_DEVICE_ID_INTEL_LNLM_THERMAL 0x641D 28 29 #define PCI_DEVICE_ID_INTEL_MTLP_THERMAL 0x7D03 29 30 #define PCI_DEVICE_ID_INTEL_RPL_THERMAL 0xA71D 30 31 #define PCI_DEVICE_ID_INTEL_SKL_THERMAL 0x1903
+1
drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
··· 407 407 static const struct pci_device_id proc_thermal_pci_ids[] = { 408 408 { PCI_DEVICE_DATA(INTEL, ADL_THERMAL, PROC_THERMAL_FEATURE_RAPL | 409 409 PROC_THERMAL_FEATURE_FIVR | PROC_THERMAL_FEATURE_DVFS | PROC_THERMAL_FEATURE_WT_REQ) }, 410 + { PCI_DEVICE_DATA(INTEL, LNLM_THERMAL, PROC_THERMAL_FEATURE_RAPL) }, 410 411 { PCI_DEVICE_DATA(INTEL, MTLP_THERMAL, PROC_THERMAL_FEATURE_RAPL | 411 412 PROC_THERMAL_FEATURE_FIVR | PROC_THERMAL_FEATURE_DVFS | PROC_THERMAL_FEATURE_DLVR | 412 413 PROC_THERMAL_FEATURE_WT_HINT | PROC_THERMAL_FEATURE_POWER_FLOOR) },