powercap: intel_rapl: add support for Emerald Rapids

commit 7adc688525 upstream.

Add Emerald Rapids to the list of supported processor models in the
Intel RAPL power capping driver.

Intel-SIG: commit 7adc688525 powercap: intel_rapl: add support for Emerald Rapids

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
[ 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 <xiaolong.wang@intel.com>
This commit is contained in:
Zhang Rui 2023-01-04 22:36:02 +08:00 committed by Jianping Liu
parent 9932062b90
commit ce9c3fae54
1 changed files with 1 additions and 0 deletions

View File

@ -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_X, rapl_defaults_hsw_server),
INTEL_CPU_FAM6(ICELAKE_D, 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(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_SILVERMONT, rapl_defaults_byt),
INTEL_CPU_FAM6(ATOM_AIRMONT, rapl_defaults_cht), INTEL_CPU_FAM6(ATOM_AIRMONT, rapl_defaults_cht),