perf/x86/rapl: Add support for Intel Emerald Rapids

jira LE-1907
Rebuild_History Non-Buildable kernel-5.14.0-284.30.1.el9_2
commit-author Zhang Rui <[email protected]>
commit 57512b5
Empty-Commit: Cherry-Pick Conflicts during history rebuild.
Will be included in final tarball splat. Ref for failed cherry-pick at:
ciq/ciq_backports/kernel-5.14.0-284.30.1.el9_2/57512b57.failed

Emerald Rapids RAPL support is the same as previous Sapphire Rapids.
Add Emerald Rapids model for RAPL.

	Signed-off-by: Zhang Rui <[email protected]>
	Signed-off-by: Ingo Molnar <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
(cherry picked from commit 57512b5)
	Signed-off-by: Jonathan Maple <[email protected]>

# Conflicts:
#	arch/x86/events/rapl.c

Author: PlaidCat

ciq/ciq_backports/kernel-5.14.0-284.30.1.el9_2/57512b57.failed

@@ -0,0 +1,48 @@
+perf/x86/rapl: Add support for Intel Emerald Rapids
+
+jira LE-1907
+Rebuild_History Non-Buildable kernel-5.14.0-284.30.1.el9_2
+commit-author Zhang Rui <[email protected]>
+commit 57512b57dcfaf63c52d8ad2fb35321328cde31b0
+Empty-Commit: Cherry-Pick Conflicts during history rebuild.
+Will be included in final tarball splat. Ref for failed cherry-pick at:
+ciq/ciq_backports/kernel-5.14.0-284.30.1.el9_2/57512b57.failed
+
+Emerald Rapids RAPL support is the same as previous Sapphire Rapids.
+Add Emerald Rapids model for RAPL.
+
+	Signed-off-by: Zhang Rui <[email protected]>
+	Signed-off-by: Ingo Molnar <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+(cherry picked from commit 57512b57dcfaf63c52d8ad2fb35321328cde31b0)
+	Signed-off-by: Jonathan Maple <[email protected]>
+
+# Conflicts:
+#	arch/x86/events/rapl.c
+diff --cc arch/x86/events/rapl.c
+index 77e3a47af5ad,52e6e7ed4f78..000000000000
+--- a/arch/x86/events/rapl.c
++++ b/arch/x86/events/rapl.c
+@@@ -804,9 -800,18 +804,18 @@@ static const struct x86_cpu_id rapl_mod
+  	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X,		&model_hsx),
+  	X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L,		&model_skl),
+  	X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE,		&model_skl),
+ -	X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L,		&model_skl),
+ -	X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE,		&model_skl),
+  	X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE,		&model_skl),
+  	X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L,		&model_skl),
+ -	X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_N,		&model_skl),
+  	X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,	&model_spr),
+++<<<<<<< HEAD
+++=======
++ 	X86_MATCH_INTEL_FAM6_MODEL(EMERALDRAPIDS_X,	&model_spr),
++ 	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE,		&model_skl),
++ 	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P,	&model_skl),
++ 	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S,	&model_skl),
++ 	X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE,		&model_skl),
++ 	X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L,	&model_skl),
+++>>>>>>> 57512b57dcfa (perf/x86/rapl: Add support for Intel Emerald Rapids)
+  	{},
+  };
+  MODULE_DEVICE_TABLE(x86cpu, rapl_model_match);
+* Unmerged path arch/x86/events/rapl.c