Skip to contentSkip to conversation

powercap: intel_rapl: add support for METEORLAKE

PATCH Applied Zhang Rui 2 participants 3 messages Jan 4, 2023 – Jan 20, 2023 Power management core

lore
Share & tools
lore

Zhang Rui

author
#0 lore raw

PATCH 1/2 powercap: intel_rapl: add support for METEORLAKE

Add METEORLAKE to the list of supported processor models in the Intel RAPL power capping driver.

---
 drivers/powercap/intel_rapl_common.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/powercap/intel_rapl_common.c +2 -0
index 26d00b1853b4..ca6ff27b4384 100644
@@ -1113,6 +1113,8 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
 	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE,		&rapl_defaults_core),
 	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P,        &rapl_defaults_core),
 	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S,	&rapl_defaults_core),
+	X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE,		&rapl_defaults_core),
+	X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L,	&rapl_defaults_core),
 	X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,	&rapl_defaults_spr_server),
 	X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD,		&rapl_defaults_core),
 
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/2 powercap: intel_rapl: add support for EMERALDRAPIDS

Add EMERALDRAPIDS to the list of supported processor models in the Intel RAPL power capping driver.

---
 drivers/powercap/intel_rapl_common.c | 1 +
 1 file changed, 1 insertion(+)
drivers/powercap/intel_rapl_common.c +1 -0
index ca6ff27b4384..9a9192fc8391 100644
@@ -1116,6 +1116,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
 	X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE,		&rapl_defaults_core),
 	X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L,	&rapl_defaults_core),
 	X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,	&rapl_defaults_spr_server),
+	X86_MATCH_INTEL_FAM6_MODEL(EMERALDRAPIDS_X,	&rapl_defaults_spr_server),
 	X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD,		&rapl_defaults_core),
 
 	X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT,	&rapl_defaults_byt),
Signature · 1 line
2.25.1
maintainer Applied
#2 lore raw
In reply to Zhang Rui
Quoted 14 lines · Zhang Rui

Add METEORLAKE to the list of supported processor models in the Intel RAPL power capping driver.

---
 drivers/powercap/intel_rapl_common.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/powercap/intel_rapl_common.c +0 -0
index 26d00b1853b4..ca6ff27b4384 100644

drivers/powercap/intel_rapl_common.c static const struct x86_cpu_id rapl_ids[] __initconst = {

Quoted 9 lines
drivers/powercap/intel_rapl_common.c +2 -1
@@ -1113,6 +1113,8 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
        X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE,          &rapl_defaults_core),
        X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P,        &rapl_defaults_core),
        X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S,        &rapl_defaults_core),
+       X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE,          &rapl_defaults_core),
+       X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L,        &rapl_defaults_core),
        X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,    &rapl_defaults_spr_server),
        X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD,           &rapl_defaults_core),
 
--

Applied as 6.3 material along with the [2/2], thanks!