From 042c1f23e2bde3106424507d4f63d2cbf2d98d0e Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Wed, 4 Jan 2023 22:58:31 +0800 Subject: [PATCH] perf/x86/rapl: Add support for Intel Emerald Rapids mainline inclusion from mainline-v6.2-rc3 commit 57512b57dcfaf63c52d8ad2fb35321328cde31b0 category: feature feature: EMR RAPL support bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I6YGL6 CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=57512b57dcfaf63c52d8ad2fb35321328cde31b0 Intel-SIG: commit 57512b57dcfa perf/x86/rapl: Add support for Intel Emerald Rapids Backported for adding EMR RAPL support to OLK-5.10. ------------------------------------- Emerald Rapids RAPL support is the same as previous Sapphire Rapids. Add Emerald Rapids model for RAPL. Signed-off-by: Zhang Rui Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20230104145831.25498-2-rui.zhang@intel.com Signed-off-by: Yunying Sun --- arch/x86/events/rapl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c index 7dbbeaacd995..902188fa108e 100644 --- a/arch/x86/events/rapl.c +++ b/arch/x86/events/rapl.c @@ -801,6 +801,7 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = { X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, &model_skl), X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, &model_skl), X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &model_spr), + X86_MATCH_INTEL_FAM6_MODEL(EMERALDRAPIDS_X, &model_spr), X86_MATCH_VENDOR_FAM(AMD, 0x17, &model_amd_fam17h), X86_MATCH_VENDOR_FAM(HYGON, 0x18, &model_amd_fam17h), X86_MATCH_VENDOR_FAM(AMD, 0x19, &model_amd_fam17h), -- Gitee