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

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

Pull thermal control updates from Rafael Wysocki:
 "These add support for Intel Panther Lake processors in multiple
  places, modify Intel thermal drivers to stop selecting the user space
  thermal governor which is not necessary for them to work any more and
  clean up the thermal core somewhat:

   - Add support for Panther Lake processors in multiple places (Zhang
     Rui, Srinivas Pandruvada)

   - Remove explicit user_space governor selection from Intel thermal
     drivers (Srinivas Pandruvada)

   - Rename a few things and relocate a comment in the thermal subsystem
     (Rafael Wysocki)"

* tag 'thermal-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal: core: Rename function argument related to trip crossing
  thermal: gov_bang_bang: Relocate regulation logic description
  thermal: core: Rename callback functions in two governors
  thermal: intel: Fix compile issue when CONFIG_NET is not defined
  thermal: intel: int340x: Panther Lake power floor and workload hint support
  thermal: intel: int340x: Panther Lake DLVR support
  thermal: intel: Remove explicit user_space governor selection
  ACPI: DPTF: Support Panther Lake
  thermal: intel: int340x: processor: Enable MMIO RAPL for Panther Lake
  powercap: intel_rapl: Add support for Panther Lake platform
parents 603f162a 2dc74869

drivers/acpi/dptf/dptf_pch_fivr.c

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ static const struct acpi_device_id pch_fivr_device_ids[] = { 
	{"INTC1064", 0},

	{"INTC106B", 0},

	{"INTC10A3", 0},

	{"INTC10D7", 0},

	{"", 0},

};

MODULE_DEVICE_TABLE(acpi, pch_fivr_device_ids);

drivers/acpi/dptf/dptf_power.c

+2 −0
Original line number Diff line number Diff line
@@ -236,6 +236,8 @@ static const struct acpi_device_id int3407_device_ids[] = { 
	{"INTC106D", 0},

	{"INTC10A4", 0},

	{"INTC10A5", 0},

	{"INTC10D8", 0},

	{"INTC10D9", 0},

	{"", 0},

};

MODULE_DEVICE_TABLE(acpi, int3407_device_ids);

drivers/acpi/dptf/int340x_thermal.c

+6 −0
Original line number Diff line number Diff line
@@ -55,6 +55,12 @@ static const struct acpi_device_id int340x_thermal_device_ids[] = { 
	{"INTC10A3"},

	{"INTC10A4"},

	{"INTC10A5"},

	{"INTC10D4"},

	{"INTC10D5"},

	{"INTC10D6"},

	{"INTC10D7"},

	{"INTC10D8"},

	{"INTC10D9"},

	{""},

};

drivers/acpi/fan.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
	{"INTC1063", }, /* Fan for Meteor Lake generation */ \

	{"INTC106A", }, /* Fan for Lunar Lake generation */ \

	{"INTC10A2", }, /* Fan for Raptor Lake generation */ \

	{"INTC10D6", }, /* Fan for Panther Lake generation */ \

	{"PNP0C0B", } /* Generic ACPI fan */



#define ACPI_FPS_NAME_LEN	20

drivers/powercap/intel_rapl_common.c

+1 −0
Original line number Diff line number Diff line
@@ -1265,6 +1265,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { 
	X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X,	&rapl_defaults_spr_server),

	X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X,	&rapl_defaults_spr_server),

	X86_MATCH_VFM(INTEL_LUNARLAKE_M,	&rapl_defaults_core),

	X86_MATCH_VFM(INTEL_PANTHERLAKE_L,	&rapl_defaults_core),

	X86_MATCH_VFM(INTEL_ARROWLAKE_H,	&rapl_defaults_core),

	X86_MATCH_VFM(INTEL_ARROWLAKE,		&rapl_defaults_core),

	X86_MATCH_VFM(INTEL_ARROWLAKE_U,	&rapl_defaults_core),