From a4a3446501f00264fbbc21ac79f3561baabb413b Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Wed, 4 Jan 2023 22:36:02 +0800 Subject: [PATCH] powercap: intel_rapl: add support for Emerald Rapids mainline inclusion from mainline-v6.3-rc1 commit 7adc6885259edd4ef5c9a7a62fd4270cf38fdbfb category: feature bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I77XHY CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=7adc6885259edd4ef5c9a7a62fd4270cf38fdbfb Intel-SIG: commit 7adc6885259e powercap: intel_rapl: add support for Emerald Rapids Backported to OLK-5.10 to enable intel_rapl driver on EMR. ------------------------------------- Add Emerald Rapids to the list of supported processor models in the Intel RAPL power capping driver. Signed-off-by: Zhang Rui Signed-off-by: Rafael J. Wysocki Signed-off-by: Xiaolong Wang --- drivers/powercap/intel_rapl_common.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c index 816027abb1f8..c99b3fdf3cac 100644 --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -1109,6 +1109,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { X86_MATCH_INTEL_FAM6_MODEL(ROCKETLAKE, &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, &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), -- Gitee