Skip to content

Commit 8e88753

Browse files
aeglhansendc
aegl
authored and
hansendc
committed
perf/x86/rapl: Switch to new Intel CPU model defines
New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck <[email protected]> Signed-off-by: Dave Hansen <[email protected]> Link: https://lore.kernel.org/all/20240520224620.9480-44-tony.luck%40intel.com
1 parent 6fd5e88 commit 8e88753

File tree

1 file changed

+45
-45
lines changed

1 file changed

+45
-45
lines changed

‎arch/x86/events/rapl.c

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -764,51 +764,51 @@ static struct rapl_model model_amd_hygon = {
764764
};
765765

766766
static const struct x86_cpu_id rapl_model_match[] __initconst = {
767-
X86_MATCH_FEATURE(X86_FEATURE_RAPL, &model_amd_hygon),
768-
X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE, &model_snb),
769-
X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE_X, &model_snbep),
770-
X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE, &model_snb),
771-
X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE_X, &model_snbep),
772-
X86_MATCH_INTEL_FAM6_MODEL(HASWELL, &model_hsw),
773-
X86_MATCH_INTEL_FAM6_MODEL(HASWELL_X, &model_hsx),
774-
X86_MATCH_INTEL_FAM6_MODEL(HASWELL_L, &model_hsw),
775-
X86_MATCH_INTEL_FAM6_MODEL(HASWELL_G, &model_hsw),
776-
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL, &model_hsw),
777-
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G, &model_hsw),
778-
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, &model_hsx),
779-
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D, &model_hsx),
780-
X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL, &model_knl),
781-
X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNM, &model_knl),
782-
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, &model_skl),
783-
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, &model_skl),
784-
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, &model_hsx),
785-
X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, &model_skl),
786-
X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, &model_skl),
787-
X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L, &model_skl),
788-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT, &model_hsw),
789-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_D, &model_hsw),
790-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS, &model_hsw),
791-
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, &model_skl),
792-
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE, &model_skl),
793-
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D, &model_hsx),
794-
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, &model_hsx),
795-
X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, &model_skl),
796-
X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, &model_skl),
797-
X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, &model_skl),
798-
X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, &model_skl),
799-
X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, &model_skl),
800-
X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, &model_skl),
801-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GRACEMONT, &model_skl),
802-
X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &model_spr),
803-
X86_MATCH_INTEL_FAM6_MODEL(EMERALDRAPIDS_X, &model_spr),
804-
X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &model_skl),
805-
X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, &model_skl),
806-
X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &model_skl),
807-
X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE, &model_skl),
808-
X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, &model_skl),
809-
X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE_H, &model_skl),
810-
X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE, &model_skl),
811-
X86_MATCH_INTEL_FAM6_MODEL(LUNARLAKE_M, &model_skl),
767+
X86_MATCH_FEATURE(X86_FEATURE_RAPL, &model_amd_hygon),
768+
X86_MATCH_VFM(INTEL_SANDYBRIDGE, &model_snb),
769+
X86_MATCH_VFM(INTEL_SANDYBRIDGE_X, &model_snbep),
770+
X86_MATCH_VFM(INTEL_IVYBRIDGE, &model_snb),
771+
X86_MATCH_VFM(INTEL_IVYBRIDGE_X, &model_snbep),
772+
X86_MATCH_VFM(INTEL_HASWELL, &model_hsw),
773+
X86_MATCH_VFM(INTEL_HASWELL_X, &model_hsx),
774+
X86_MATCH_VFM(INTEL_HASWELL_L, &model_hsw),
775+
X86_MATCH_VFM(INTEL_HASWELL_G, &model_hsw),
776+
X86_MATCH_VFM(INTEL_BROADWELL, &model_hsw),
777+
X86_MATCH_VFM(INTEL_BROADWELL_G, &model_hsw),
778+
X86_MATCH_VFM(INTEL_BROADWELL_X, &model_hsx),
779+
X86_MATCH_VFM(INTEL_BROADWELL_D, &model_hsx),
780+
X86_MATCH_VFM(INTEL_XEON_PHI_KNL, &model_knl),
781+
X86_MATCH_VFM(INTEL_XEON_PHI_KNM, &model_knl),
782+
X86_MATCH_VFM(INTEL_SKYLAKE_L, &model_skl),
783+
X86_MATCH_VFM(INTEL_SKYLAKE, &model_skl),
784+
X86_MATCH_VFM(INTEL_SKYLAKE_X, &model_hsx),
785+
X86_MATCH_VFM(INTEL_KABYLAKE_L, &model_skl),
786+
X86_MATCH_VFM(INTEL_KABYLAKE, &model_skl),
787+
X86_MATCH_VFM(INTEL_CANNONLAKE_L, &model_skl),
788+
X86_MATCH_VFM(INTEL_ATOM_GOLDMONT, &model_hsw),
789+
X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_D, &model_hsw),
790+
X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_PLUS, &model_hsw),
791+
X86_MATCH_VFM(INTEL_ICELAKE_L, &model_skl),
792+
X86_MATCH_VFM(INTEL_ICELAKE, &model_skl),
793+
X86_MATCH_VFM(INTEL_ICELAKE_D, &model_hsx),
794+
X86_MATCH_VFM(INTEL_ICELAKE_X, &model_hsx),
795+
X86_MATCH_VFM(INTEL_COMETLAKE_L, &model_skl),
796+
X86_MATCH_VFM(INTEL_COMETLAKE, &model_skl),
797+
X86_MATCH_VFM(INTEL_TIGERLAKE_L, &model_skl),
798+
X86_MATCH_VFM(INTEL_TIGERLAKE, &model_skl),
799+
X86_MATCH_VFM(INTEL_ALDERLAKE, &model_skl),
800+
X86_MATCH_VFM(INTEL_ALDERLAKE_L, &model_skl),
801+
X86_MATCH_VFM(INTEL_ATOM_GRACEMONT, &model_skl),
802+
X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, &model_spr),
803+
X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X, &model_spr),
804+
X86_MATCH_VFM(INTEL_RAPTORLAKE, &model_skl),
805+
X86_MATCH_VFM(INTEL_RAPTORLAKE_P, &model_skl),
806+
X86_MATCH_VFM(INTEL_RAPTORLAKE_S, &model_skl),
807+
X86_MATCH_VFM(INTEL_METEORLAKE, &model_skl),
808+
X86_MATCH_VFM(INTEL_METEORLAKE_L, &model_skl),
809+
X86_MATCH_VFM(INTEL_ARROWLAKE_H, &model_skl),
810+
X86_MATCH_VFM(INTEL_ARROWLAKE, &model_skl),
811+
X86_MATCH_VFM(INTEL_LUNARLAKE_M, &model_skl),
812812
{},
813813
};
814814
MODULE_DEVICE_TABLE(x86cpu, rapl_model_match);

0 commit comments

Comments
 (0)