Skip to contentSkip to conversation

powercap: intel_rapl: Add support for RAPTORLAKE_S

PATCH In review Zhang Rui 2 participants 3 messages Aug 30, 2022 – Sep 3, 2022 Power management core

lore
Share & tools
lore

Zhang Rui

author
#0 lore raw

PATCH 1/1 powercap: intel_rapl: Add support for RAPTORLAKE_S

Add intel_rapl support for RAPTORLAKE_S platform, which behaves the same as RAPTORLAKE and RAPTORLAKE_P platforms.

Signed-off-by Zhang Rui <[email protected]>
---
 drivers/powercap/intel_rapl_common.c | 1 +
 1 file changed, 1 insertion(+)
drivers/powercap/intel_rapl_common.c +1 -0
index 21d624f9f5fb..6812c1ca3100 100644
@@ -1110,6 +1110,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
 	X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_N,		&rapl_defaults_core),
 	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(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

Note that this patch depends on commit
ea902bcc1943 ("x86/cpu: Add new Raptor Lake CPU model number") which was merged in 6.0-rc3.

thanks,
rui

Quoted 28 lines · Zhang Rui

Add intel_rapl support for RAPTORLAKE_S platform, which behaves the same
as RAPTORLAKE and RAPTORLAKE_P platforms.

Signed-off-by Zhang Rui <[email protected]>
---
 drivers/powercap/intel_rapl_common.c | 1 +
 1 file changed, 1 insertion(+)
drivers/powercap/intel_rapl_common.c +0 -0
index 21d624f9f5fb..6812c1ca3100 100644
@@ -1110,6 +1110,7 @@ static const struct x86_cpu_id rapl_ids[]
 __initconst = {
 	X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_N,		&rapl_default
 s_core),
 	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE,		&rapl_default
 s_core),
 	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P,        &rapl_defaults_

core),

drivers/powercap/intel_rapl_common.c +1 -0
+	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S,	&rapl_defaults_core),
 	X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,	&rapl_default

s_spr_server),
X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD, &rapl_default
s_core),

maintainer
#2 lore raw
Quoted 29 lines · Zhang Rui

Note that this patch depends on commit
ea902bcc1943 ("x86/cpu: Add new Raptor Lake CPU model number") which was merged in 6.0-rc3.

thanks,
rui

Quoted 20 lines · Zhang Rui

Add intel_rapl support for RAPTORLAKE_S platform, which behaves the same
as RAPTORLAKE and RAPTORLAKE_P platforms.

Signed-off-by Zhang Rui <[email protected]>
---
 drivers/powercap/intel_rapl_common.c | 1 +
 1 file changed, 1 insertion(+)
drivers/powercap/intel_rapl_common.c +0 -0
index 21d624f9f5fb..6812c1ca3100 100644
@@ -1110,6 +1110,7 @@ static const struct x86_cpu_id rapl_ids[]
 __initconst = {
      X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_N,         &rapl_default
 s_core),
      X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE,          &rapl_default
 s_core),
Quoted 8 lines
Quoted 8 lines
drivers/powercap/intel_rapl_common.c +0 -0
      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(SAPPHIRERAPIDS_X, &rapl_default
s_spr_server),
X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD, &rapl_default
s_core),

Applied as 6.1 material, on top of 6.0-rc3.

Thanks!