Commit 5ee80094 authored by Tony Luck's avatar Tony Luck Committed by Dave Hansen
Browse files

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: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/all/20240424181459.41500-1-tony.luck%40intel.com
parent b24e466a

arch/x86/events/intel/cstate.c

+72 −72
Original line number Diff line number Diff line
@@ -696,78 +696,78 @@ static const struct cstate_model srf_cstates __initconst = { 




static const struct x86_cpu_id intel_cstates_match[] __initconst = {

	X86_MATCH_INTEL_FAM6_MODEL(NEHALEM,		&nhm_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(NEHALEM_EP,		&nhm_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(NEHALEM_EX,		&nhm_cstates),



	X86_MATCH_INTEL_FAM6_MODEL(WESTMERE,		&nhm_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(WESTMERE_EP,		&nhm_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(WESTMERE_EX,		&nhm_cstates),



	X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE,		&snb_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE_X,	&snb_cstates),



	X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE,		&snb_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE_X,		&snb_cstates),



	X86_MATCH_INTEL_FAM6_MODEL(HASWELL,		&snb_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(HASWELL_X,		&snb_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(HASWELL_G,		&snb_cstates),



	X86_MATCH_INTEL_FAM6_MODEL(HASWELL_L,		&hswult_cstates),



	X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT,	&slm_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_D,	&slm_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT,	&slm_cstates),



	X86_MATCH_INTEL_FAM6_MODEL(BROADWELL,		&snb_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D,		&snb_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G,		&snb_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X,		&snb_cstates),



	X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L,		&snb_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE,		&snb_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X,		&snb_cstates),



	X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L,		&hswult_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE,		&hswult_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L,		&hswult_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE,		&hswult_cstates),



	X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L,	&cnl_cstates),



	X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL,	&knl_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNM,	&knl_cstates),



	X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT,	&glm_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_D,	&glm_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS,	&glm_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D,	&glm_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT,	&glm_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_L,	&glm_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_GRACEMONT,	&adl_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_CRESTMONT_X,	&srf_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_CRESTMONT,	&grr_cstates),



	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L,		&icl_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE,		&icl_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X,		&icx_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D,		&icx_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,	&icx_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(EMERALDRAPIDS_X,	&icx_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(GRANITERAPIDS_X,	&icx_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(GRANITERAPIDS_D,	&icx_cstates),



	X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L,		&icl_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE,		&icl_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(ROCKETLAKE,		&icl_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE,		&adl_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L,		&adl_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE,		&adl_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P,	&adl_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S,	&adl_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE,		&adl_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L,	&adl_cstates),

	X86_MATCH_VFM(INTEL_NEHALEM,		&nhm_cstates),

	X86_MATCH_VFM(INTEL_NEHALEM_EP,		&nhm_cstates),

	X86_MATCH_VFM(INTEL_NEHALEM_EX,		&nhm_cstates),



	X86_MATCH_VFM(INTEL_WESTMERE,		&nhm_cstates),

	X86_MATCH_VFM(INTEL_WESTMERE_EP,	&nhm_cstates),

	X86_MATCH_VFM(INTEL_WESTMERE_EX,	&nhm_cstates),



	X86_MATCH_VFM(INTEL_SANDYBRIDGE,	&snb_cstates),

	X86_MATCH_VFM(INTEL_SANDYBRIDGE_X,	&snb_cstates),



	X86_MATCH_VFM(INTEL_IVYBRIDGE,		&snb_cstates),

	X86_MATCH_VFM(INTEL_IVYBRIDGE_X,	&snb_cstates),



	X86_MATCH_VFM(INTEL_HASWELL,		&snb_cstates),

	X86_MATCH_VFM(INTEL_HASWELL_X,		&snb_cstates),

	X86_MATCH_VFM(INTEL_HASWELL_G,		&snb_cstates),



	X86_MATCH_VFM(INTEL_HASWELL_L,		&hswult_cstates),



	X86_MATCH_VFM(INTEL_ATOM_SILVERMONT,	&slm_cstates),

	X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_D,	&slm_cstates),

	X86_MATCH_VFM(INTEL_ATOM_AIRMONT,	&slm_cstates),



	X86_MATCH_VFM(INTEL_BROADWELL,		&snb_cstates),

	X86_MATCH_VFM(INTEL_BROADWELL_D,	&snb_cstates),

	X86_MATCH_VFM(INTEL_BROADWELL_G,	&snb_cstates),

	X86_MATCH_VFM(INTEL_BROADWELL_X,	&snb_cstates),



	X86_MATCH_VFM(INTEL_SKYLAKE_L,		&snb_cstates),

	X86_MATCH_VFM(INTEL_SKYLAKE,		&snb_cstates),

	X86_MATCH_VFM(INTEL_SKYLAKE_X,		&snb_cstates),



	X86_MATCH_VFM(INTEL_KABYLAKE_L,		&hswult_cstates),

	X86_MATCH_VFM(INTEL_KABYLAKE,		&hswult_cstates),

	X86_MATCH_VFM(INTEL_COMETLAKE_L,	&hswult_cstates),

	X86_MATCH_VFM(INTEL_COMETLAKE,		&hswult_cstates),



	X86_MATCH_VFM(INTEL_CANNONLAKE_L,	&cnl_cstates),



	X86_MATCH_VFM(INTEL_XEON_PHI_KNL,	&knl_cstates),

	X86_MATCH_VFM(INTEL_XEON_PHI_KNM,	&knl_cstates),



	X86_MATCH_VFM(INTEL_ATOM_GOLDMONT,	&glm_cstates),

	X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_D,	&glm_cstates),

	X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_PLUS,	&glm_cstates),

	X86_MATCH_VFM(INTEL_ATOM_TREMONT_D,	&glm_cstates),

	X86_MATCH_VFM(INTEL_ATOM_TREMONT,	&glm_cstates),

	X86_MATCH_VFM(INTEL_ATOM_TREMONT_L,	&glm_cstates),

	X86_MATCH_VFM(INTEL_ATOM_GRACEMONT,	&adl_cstates),

	X86_MATCH_VFM(INTEL_ATOM_CRESTMONT_X,	&srf_cstates),

	X86_MATCH_VFM(INTEL_ATOM_CRESTMONT,	&grr_cstates),



	X86_MATCH_VFM(INTEL_ICELAKE_L,		&icl_cstates),

	X86_MATCH_VFM(INTEL_ICELAKE,		&icl_cstates),

	X86_MATCH_VFM(INTEL_ICELAKE_X,		&icx_cstates),

	X86_MATCH_VFM(INTEL_ICELAKE_D,		&icx_cstates),

	X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X,	&icx_cstates),

	X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X,	&icx_cstates),

	X86_MATCH_VFM(INTEL_GRANITERAPIDS_X,	&icx_cstates),

	X86_MATCH_VFM(INTEL_GRANITERAPIDS_D,	&icx_cstates),



	X86_MATCH_VFM(INTEL_TIGERLAKE_L,	&icl_cstates),

	X86_MATCH_VFM(INTEL_TIGERLAKE,		&icl_cstates),

	X86_MATCH_VFM(INTEL_ROCKETLAKE,		&icl_cstates),

	X86_MATCH_VFM(INTEL_ALDERLAKE,		&adl_cstates),

	X86_MATCH_VFM(INTEL_ALDERLAKE_L,	&adl_cstates),

	X86_MATCH_VFM(INTEL_RAPTORLAKE,		&adl_cstates),

	X86_MATCH_VFM(INTEL_RAPTORLAKE_P,	&adl_cstates),

	X86_MATCH_VFM(INTEL_RAPTORLAKE_S,	&adl_cstates),

	X86_MATCH_VFM(INTEL_METEORLAKE,		&adl_cstates),

	X86_MATCH_VFM(INTEL_METEORLAKE_L,	&adl_cstates),

	{ },

};

MODULE_DEVICE_TABLE(x86cpu, intel_cstates_match);