Skip to content

Commit 5ee8009

Browse files
aeglhansendc
aegl
authored and
hansendc
committed
perf/x86/intel/cstate: Switch to new Intel CPU model defines
New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Link: https://lore.kernel.org/all/20240424181459.41500-1-tony.luck%40intel.com
1 parent b24e466 commit 5ee8009

File tree

1 file changed

+72
-72
lines changed

1 file changed

+72
-72
lines changed

‎arch/x86/events/intel/cstate.c

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -696,78 +696,78 @@ static const struct cstate_model srf_cstates __initconst = {
696696

697697

698698
static const struct x86_cpu_id intel_cstates_match[] __initconst = {
699-
X86_MATCH_INTEL_FAM6_MODEL(NEHALEM, &nhm_cstates),
700-
X86_MATCH_INTEL_FAM6_MODEL(NEHALEM_EP, &nhm_cstates),
701-
X86_MATCH_INTEL_FAM6_MODEL(NEHALEM_EX, &nhm_cstates),
702-
703-
X86_MATCH_INTEL_FAM6_MODEL(WESTMERE, &nhm_cstates),
704-
X86_MATCH_INTEL_FAM6_MODEL(WESTMERE_EP, &nhm_cstates),
705-
X86_MATCH_INTEL_FAM6_MODEL(WESTMERE_EX, &nhm_cstates),
706-
707-
X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE, &snb_cstates),
708-
X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE_X, &snb_cstates),
709-
710-
X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE, &snb_cstates),
711-
X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE_X, &snb_cstates),
712-
713-
X86_MATCH_INTEL_FAM6_MODEL(HASWELL, &snb_cstates),
714-
X86_MATCH_INTEL_FAM6_MODEL(HASWELL_X, &snb_cstates),
715-
X86_MATCH_INTEL_FAM6_MODEL(HASWELL_G, &snb_cstates),
716-
717-
X86_MATCH_INTEL_FAM6_MODEL(HASWELL_L, &hswult_cstates),
718-
719-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, &slm_cstates),
720-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_D, &slm_cstates),
721-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT, &slm_cstates),
722-
723-
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL, &snb_cstates),
724-
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D, &snb_cstates),
725-
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G, &snb_cstates),
726-
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, &snb_cstates),
727-
728-
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, &snb_cstates),
729-
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, &snb_cstates),
730-
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, &snb_cstates),
731-
732-
X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, &hswult_cstates),
733-
X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, &hswult_cstates),
734-
X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, &hswult_cstates),
735-
X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, &hswult_cstates),
736-
737-
X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L, &cnl_cstates),
738-
739-
X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL, &knl_cstates),
740-
X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNM, &knl_cstates),
741-
742-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT, &glm_cstates),
743-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_D, &glm_cstates),
744-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS, &glm_cstates),
745-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &glm_cstates),
746-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT, &glm_cstates),
747-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_L, &glm_cstates),
748-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GRACEMONT, &adl_cstates),
749-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_CRESTMONT_X, &srf_cstates),
750-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_CRESTMONT, &grr_cstates),
751-
752-
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, &icl_cstates),
753-
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE, &icl_cstates),
754-
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, &icx_cstates),
755-
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D, &icx_cstates),
756-
X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &icx_cstates),
757-
X86_MATCH_INTEL_FAM6_MODEL(EMERALDRAPIDS_X, &icx_cstates),
758-
X86_MATCH_INTEL_FAM6_MODEL(GRANITERAPIDS_X, &icx_cstates),
759-
X86_MATCH_INTEL_FAM6_MODEL(GRANITERAPIDS_D, &icx_cstates),
760-
761-
X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, &icl_cstates),
762-
X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, &icl_cstates),
763-
X86_MATCH_INTEL_FAM6_MODEL(ROCKETLAKE, &icl_cstates),
764-
X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, &adl_cstates),
765-
X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, &adl_cstates),
766-
X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &adl_cstates),
767-
X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, &adl_cstates),
768-
X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &adl_cstates),
769-
X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE, &adl_cstates),
770-
X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, &adl_cstates),
699+
X86_MATCH_VFM(INTEL_NEHALEM, &nhm_cstates),
700+
X86_MATCH_VFM(INTEL_NEHALEM_EP, &nhm_cstates),
701+
X86_MATCH_VFM(INTEL_NEHALEM_EX, &nhm_cstates),
702+
703+
X86_MATCH_VFM(INTEL_WESTMERE, &nhm_cstates),
704+
X86_MATCH_VFM(INTEL_WESTMERE_EP, &nhm_cstates),
705+
X86_MATCH_VFM(INTEL_WESTMERE_EX, &nhm_cstates),
706+
707+
X86_MATCH_VFM(INTEL_SANDYBRIDGE, &snb_cstates),
708+
X86_MATCH_VFM(INTEL_SANDYBRIDGE_X, &snb_cstates),
709+
710+
X86_MATCH_VFM(INTEL_IVYBRIDGE, &snb_cstates),
711+
X86_MATCH_VFM(INTEL_IVYBRIDGE_X, &snb_cstates),
712+
713+
X86_MATCH_VFM(INTEL_HASWELL, &snb_cstates),
714+
X86_MATCH_VFM(INTEL_HASWELL_X, &snb_cstates),
715+
X86_MATCH_VFM(INTEL_HASWELL_G, &snb_cstates),
716+
717+
X86_MATCH_VFM(INTEL_HASWELL_L, &hswult_cstates),
718+
719+
X86_MATCH_VFM(INTEL_ATOM_SILVERMONT, &slm_cstates),
720+
X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_D, &slm_cstates),
721+
X86_MATCH_VFM(INTEL_ATOM_AIRMONT, &slm_cstates),
722+
723+
X86_MATCH_VFM(INTEL_BROADWELL, &snb_cstates),
724+
X86_MATCH_VFM(INTEL_BROADWELL_D, &snb_cstates),
725+
X86_MATCH_VFM(INTEL_BROADWELL_G, &snb_cstates),
726+
X86_MATCH_VFM(INTEL_BROADWELL_X, &snb_cstates),
727+
728+
X86_MATCH_VFM(INTEL_SKYLAKE_L, &snb_cstates),
729+
X86_MATCH_VFM(INTEL_SKYLAKE, &snb_cstates),
730+
X86_MATCH_VFM(INTEL_SKYLAKE_X, &snb_cstates),
731+
732+
X86_MATCH_VFM(INTEL_KABYLAKE_L, &hswult_cstates),
733+
X86_MATCH_VFM(INTEL_KABYLAKE, &hswult_cstates),
734+
X86_MATCH_VFM(INTEL_COMETLAKE_L, &hswult_cstates),
735+
X86_MATCH_VFM(INTEL_COMETLAKE, &hswult_cstates),
736+
737+
X86_MATCH_VFM(INTEL_CANNONLAKE_L, &cnl_cstates),
738+
739+
X86_MATCH_VFM(INTEL_XEON_PHI_KNL, &knl_cstates),
740+
X86_MATCH_VFM(INTEL_XEON_PHI_KNM, &knl_cstates),
741+
742+
X86_MATCH_VFM(INTEL_ATOM_GOLDMONT, &glm_cstates),
743+
X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_D, &glm_cstates),
744+
X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_PLUS, &glm_cstates),
745+
X86_MATCH_VFM(INTEL_ATOM_TREMONT_D, &glm_cstates),
746+
X86_MATCH_VFM(INTEL_ATOM_TREMONT, &glm_cstates),
747+
X86_MATCH_VFM(INTEL_ATOM_TREMONT_L, &glm_cstates),
748+
X86_MATCH_VFM(INTEL_ATOM_GRACEMONT, &adl_cstates),
749+
X86_MATCH_VFM(INTEL_ATOM_CRESTMONT_X, &srf_cstates),
750+
X86_MATCH_VFM(INTEL_ATOM_CRESTMONT, &grr_cstates),
751+
752+
X86_MATCH_VFM(INTEL_ICELAKE_L, &icl_cstates),
753+
X86_MATCH_VFM(INTEL_ICELAKE, &icl_cstates),
754+
X86_MATCH_VFM(INTEL_ICELAKE_X, &icx_cstates),
755+
X86_MATCH_VFM(INTEL_ICELAKE_D, &icx_cstates),
756+
X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, &icx_cstates),
757+
X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X, &icx_cstates),
758+
X86_MATCH_VFM(INTEL_GRANITERAPIDS_X, &icx_cstates),
759+
X86_MATCH_VFM(INTEL_GRANITERAPIDS_D, &icx_cstates),
760+
761+
X86_MATCH_VFM(INTEL_TIGERLAKE_L, &icl_cstates),
762+
X86_MATCH_VFM(INTEL_TIGERLAKE, &icl_cstates),
763+
X86_MATCH_VFM(INTEL_ROCKETLAKE, &icl_cstates),
764+
X86_MATCH_VFM(INTEL_ALDERLAKE, &adl_cstates),
765+
X86_MATCH_VFM(INTEL_ALDERLAKE_L, &adl_cstates),
766+
X86_MATCH_VFM(INTEL_RAPTORLAKE, &adl_cstates),
767+
X86_MATCH_VFM(INTEL_RAPTORLAKE_P, &adl_cstates),
768+
X86_MATCH_VFM(INTEL_RAPTORLAKE_S, &adl_cstates),
769+
X86_MATCH_VFM(INTEL_METEORLAKE, &adl_cstates),
770+
X86_MATCH_VFM(INTEL_METEORLAKE_L, &adl_cstates),
771771
{ },
772772
};
773773
MODULE_DEVICE_TABLE(x86cpu, intel_cstates_match);

0 commit comments

Comments
 (0)