From ce9c3fae543ca242fa7fe13c50b0b1efcc75b227 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 commit 7adc6885259edd4ef5c9a7a62fd4270cf38fdbfb upstream. Add Emerald Rapids to the list of supported processor models in the Intel RAPL power capping driver. Intel-SIG: commit 7adc6885259e powercap: intel_rapl: add support for Emerald Rapids Signed-off-by: Zhang Rui Signed-off-by: Rafael J. Wysocki [ Xiaolong Wang: cherry-pick from upstream, fix the conflict by adding the CPU model ID in the v5.4 style table, amend commit log ] 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 8566bf72f3fb..1436bd1eb16e 100644 --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -1056,6 +1056,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { INTEL_CPU_FAM6(ICELAKE_X, rapl_defaults_hsw_server), INTEL_CPU_FAM6(ICELAKE_D, rapl_defaults_hsw_server), INTEL_CPU_FAM6(SAPPHIRERAPIDS_X, rapl_defaults_spr_server), + INTEL_CPU_FAM6(EMERALDRAPIDS_X, rapl_defaults_spr_server), INTEL_CPU_FAM6(ATOM_SILVERMONT, rapl_defaults_byt), INTEL_CPU_FAM6(ATOM_AIRMONT, rapl_defaults_cht),