Skip to content

Commit 2dc7486

Browse files
committed
Merge branch 'thermal-intel'
Merge updates of Intel thermal drivers for 6.14: - 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). * thermal-intel: 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
2 parents 0ac66e5 + 207a792 commit 2dc7486

File tree

12 files changed

+21
-7
lines changed

12 files changed

+21
-7
lines changed

drivers/acpi/dptf/dptf_pch_fivr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ static const struct acpi_device_id pch_fivr_device_ids[] = {
152152
{"INTC1064", 0},
153153
{"INTC106B", 0},
154154
{"INTC10A3", 0},
155+
{"INTC10D7", 0},
155156
{"", 0},
156157
};
157158
MODULE_DEVICE_TABLE(acpi, pch_fivr_device_ids);

drivers/acpi/dptf/dptf_power.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,8 @@ static const struct acpi_device_id int3407_device_ids[] = {
236236
{"INTC106D", 0},
237237
{"INTC10A4", 0},
238238
{"INTC10A5", 0},
239+
{"INTC10D8", 0},
240+
{"INTC10D9", 0},
239241
{"", 0},
240242
};
241243
MODULE_DEVICE_TABLE(acpi, int3407_device_ids);

drivers/acpi/dptf/int340x_thermal.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ static const struct acpi_device_id int340x_thermal_device_ids[] = {
5555
{"INTC10A3"},
5656
{"INTC10A4"},
5757
{"INTC10A5"},
58+
{"INTC10D4"},
59+
{"INTC10D5"},
60+
{"INTC10D6"},
61+
{"INTC10D7"},
62+
{"INTC10D8"},
63+
{"INTC10D9"},
5864
{""},
5965
};
6066

drivers/acpi/fan.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
{"INTC1063", }, /* Fan for Meteor Lake generation */ \
2020
{"INTC106A", }, /* Fan for Lunar Lake generation */ \
2121
{"INTC10A2", }, /* Fan for Raptor Lake generation */ \
22+
{"INTC10D6", }, /* Fan for Panther Lake generation */ \
2223
{"PNP0C0B", } /* Generic ACPI fan */
2324

2425
#define ACPI_FPS_NAME_LEN 20

drivers/powercap/intel_rapl_common.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1265,6 +1265,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
12651265
X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, &rapl_defaults_spr_server),
12661266
X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X, &rapl_defaults_spr_server),
12671267
X86_MATCH_VFM(INTEL_LUNARLAKE_M, &rapl_defaults_core),
1268+
X86_MATCH_VFM(INTEL_PANTHERLAKE_L, &rapl_defaults_core),
12681269
X86_MATCH_VFM(INTEL_ARROWLAKE_H, &rapl_defaults_core),
12691270
X86_MATCH_VFM(INTEL_ARROWLAKE, &rapl_defaults_core),
12701271
X86_MATCH_VFM(INTEL_ARROWLAKE_U, &rapl_defaults_core),

drivers/thermal/intel/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ config INTEL_TCC
2121

2222
config X86_PKG_TEMP_THERMAL
2323
tristate "X86 package temperature thermal driver"
24-
depends on X86_THERMAL_VECTOR
25-
select THERMAL_GOV_USER_SPACE
24+
depends on X86_THERMAL_VECTOR && NET
25+
select THERMAL_NETLINK
2626
select INTEL_TCC
2727
default m
2828
help

drivers/thermal/intel/int340x_thermal/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
config INT340X_THERMAL
77
tristate "ACPI INT340X thermal drivers"
8-
depends on X86_64 && ACPI && PCI
9-
select THERMAL_GOV_USER_SPACE
8+
depends on X86_64 && ACPI && PCI && NET
9+
select THERMAL_NETLINK
1010
select ACPI_THERMAL_REL
1111
select ACPI_FAN
1212
select ACPI_THERMAL_LIB

drivers/thermal/intel/int340x_thermal/int3400_thermal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,6 @@ static struct thermal_zone_device_ops int3400_thermal_ops = {
521521
};
522522

523523
static struct thermal_zone_params int3400_thermal_params = {
524-
.governor_name = "user_space",
525524
.no_hwmon = true,
526525
};
527526

@@ -690,6 +689,7 @@ static const struct acpi_device_id int3400_thermal_match[] = {
690689
{"INTC1042", 0},
691690
{"INTC1068", 0},
692691
{"INTC10A0", 0},
692+
{"INTC10D4", 0},
693693
{}
694694
};
695695

drivers/thermal/intel/int340x_thermal/int3403_thermal.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ static const struct acpi_device_id int3403_device_ids[] = {
275275
{"INTC1062", 0},
276276
{"INTC1069", 0},
277277
{"INTC10A1", 0},
278+
{"INTC10D5", 0},
278279
{"", 0},
279280
};
280281
MODULE_DEVICE_TABLE(acpi, int3403_device_ids);

drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ static int int340x_thermal_read_trips(struct acpi_device *zone_adev,
105105
}
106106

107107
static struct thermal_zone_params int340x_thermal_params = {
108-
.governor_name = "user_space",
109108
.no_hwmon = true,
110109
};
111110

0 commit comments

Comments
 (0)