2023-01-04 14:40:20

by Zhang, Rui

Subject: [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.

Signed-off-by: Zhang Rui <[email protected]>
---
drivers/powercap/intel_rapl_common.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
index 26d00b1853b4..ca6ff27b4384 100644
--- a/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -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),

--
2.25.1

2023-01-20 16:51:13

by Rafael J. Wysocki

Subject: Re: [PATCH 1/2] powercap: intel_rapl: add support for METEORLAKE

On Wed, Jan 4, 2023 at 3:29 PM Zhang Rui <[email protected]> wrote:
>
> Add METEORLAKE to the list of supported processor models in the Intel
> RAPL power capping driver.
>
> Signed-off-by: Zhang Rui <[email protected]>
> ---
> drivers/powercap/intel_rapl_common.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
> index 26d00b1853b4..ca6ff27b4384 100644
> --- a/drivers/powercap/intel_rapl_common.c
> +++ b/drivers/powercap/intel_rapl_common.c
> @@ -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!