Unverified Commit 6796bf23 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!885 [sync] PR-860: [OLK-5.10] Add support for Emerald Rapids to powercap/intel_rapl driver. 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/860 
 
Backport upstream commit 7adc6885 powercap: intel_rapl: add support for Emerald Rapids to OLK-5.10 to enable intel_rapl driver on EMR.
 
Intel-kernel issue:
https://gitee.com/openeuler/intel-kernel/issues/I77XHY
 
Test:
/sys/devices/virtual/powercap/intel-rapl/ will be available on EMR platform after this commit is merged.
 
Known issue:
N/A

Default config change:
N/A 
 
Link:https://gitee.com/openeuler/kernel/pulls/885

 

Reviewed-by: default avatarJason Zeng <jason.zeng@intel.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 184f5b47 d8bff81d

drivers/powercap/intel_rapl_common.c

+1 −0
Original line number Diff line number Diff line
@@ -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),