powercap: intel_rapl: add support for Emerald Rapids

mainline inclusion
from mainline-v6.3-rc1
commit 7adc6885
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 7adc6885 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: NZhang Rui <rui.zhang@intel.com>
Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: NXiaolong Wang <xiaolong.wang@intel.com>
(cherry picked from commit a4a34465)

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),