Commit 8e887536 authored by Tony Luck's avatar Tony Luck Committed by Dave Hansen
Browse files

perf/x86/rapl: 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/20240520224620.9480-44-tony.luck%40intel.com
parent 6fd5e885

arch/x86/events/rapl.c

+45 −45
Original line number Diff line number Diff line
@@ -765,50 +765,50 @@ static struct rapl_model model_amd_hygon = { 


static const struct x86_cpu_id rapl_model_match[] __initconst = {

	X86_MATCH_FEATURE(X86_FEATURE_RAPL,	&model_amd_hygon),

	X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE,		&model_snb),

	X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE_X,	&model_snbep),

	X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE,		&model_snb),

	X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE_X,		&model_snbep),

	X86_MATCH_INTEL_FAM6_MODEL(HASWELL,		&model_hsw),

	X86_MATCH_INTEL_FAM6_MODEL(HASWELL_X,		&model_hsx),

	X86_MATCH_INTEL_FAM6_MODEL(HASWELL_L,		&model_hsw),

	X86_MATCH_INTEL_FAM6_MODEL(HASWELL_G,		&model_hsw),

	X86_MATCH_INTEL_FAM6_MODEL(BROADWELL,		&model_hsw),

	X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G,		&model_hsw),

	X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X,		&model_hsx),

	X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D,		&model_hsx),

	X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL,	&model_knl),

	X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNM,	&model_knl),

	X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L,		&model_skl),

	X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE,		&model_skl),

	X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X,		&model_hsx),

	X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L,		&model_skl),

	X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE,		&model_skl),

	X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L,	&model_skl),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT,	&model_hsw),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_D,	&model_hsw),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS,	&model_hsw),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L,		&model_skl),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE,		&model_skl),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D,		&model_hsx),

	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(ATOM_GRACEMONT,	&model_skl),

	X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,	&model_spr),

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

	X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE_H,		&model_skl),

	X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE,		&model_skl),

	X86_MATCH_INTEL_FAM6_MODEL(LUNARLAKE_M,		&model_skl),

	X86_MATCH_VFM(INTEL_SANDYBRIDGE,	&model_snb),

	X86_MATCH_VFM(INTEL_SANDYBRIDGE_X,	&model_snbep),

	X86_MATCH_VFM(INTEL_IVYBRIDGE,		&model_snb),

	X86_MATCH_VFM(INTEL_IVYBRIDGE_X,	&model_snbep),

	X86_MATCH_VFM(INTEL_HASWELL,		&model_hsw),

	X86_MATCH_VFM(INTEL_HASWELL_X,		&model_hsx),

	X86_MATCH_VFM(INTEL_HASWELL_L,		&model_hsw),

	X86_MATCH_VFM(INTEL_HASWELL_G,		&model_hsw),

	X86_MATCH_VFM(INTEL_BROADWELL,		&model_hsw),

	X86_MATCH_VFM(INTEL_BROADWELL_G,	&model_hsw),

	X86_MATCH_VFM(INTEL_BROADWELL_X,	&model_hsx),

	X86_MATCH_VFM(INTEL_BROADWELL_D,	&model_hsx),

	X86_MATCH_VFM(INTEL_XEON_PHI_KNL,	&model_knl),

	X86_MATCH_VFM(INTEL_XEON_PHI_KNM,	&model_knl),

	X86_MATCH_VFM(INTEL_SKYLAKE_L,		&model_skl),

	X86_MATCH_VFM(INTEL_SKYLAKE,		&model_skl),

	X86_MATCH_VFM(INTEL_SKYLAKE_X,		&model_hsx),

	X86_MATCH_VFM(INTEL_KABYLAKE_L,		&model_skl),

	X86_MATCH_VFM(INTEL_KABYLAKE,		&model_skl),

	X86_MATCH_VFM(INTEL_CANNONLAKE_L,	&model_skl),

	X86_MATCH_VFM(INTEL_ATOM_GOLDMONT,	&model_hsw),

	X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_D,	&model_hsw),

	X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_PLUS,	&model_hsw),

	X86_MATCH_VFM(INTEL_ICELAKE_L,		&model_skl),

	X86_MATCH_VFM(INTEL_ICELAKE,		&model_skl),

	X86_MATCH_VFM(INTEL_ICELAKE_D,		&model_hsx),

	X86_MATCH_VFM(INTEL_ICELAKE_X,		&model_hsx),

	X86_MATCH_VFM(INTEL_COMETLAKE_L,	&model_skl),

	X86_MATCH_VFM(INTEL_COMETLAKE,		&model_skl),

	X86_MATCH_VFM(INTEL_TIGERLAKE_L,	&model_skl),

	X86_MATCH_VFM(INTEL_TIGERLAKE,		&model_skl),

	X86_MATCH_VFM(INTEL_ALDERLAKE,		&model_skl),

	X86_MATCH_VFM(INTEL_ALDERLAKE_L,	&model_skl),

	X86_MATCH_VFM(INTEL_ATOM_GRACEMONT,	&model_skl),

	X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X,	&model_spr),

	X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X,	&model_spr),

	X86_MATCH_VFM(INTEL_RAPTORLAKE,		&model_skl),

	X86_MATCH_VFM(INTEL_RAPTORLAKE_P,	&model_skl),

	X86_MATCH_VFM(INTEL_RAPTORLAKE_S,	&model_skl),

	X86_MATCH_VFM(INTEL_METEORLAKE,		&model_skl),

	X86_MATCH_VFM(INTEL_METEORLAKE_L,	&model_skl),

	X86_MATCH_VFM(INTEL_ARROWLAKE_H,	&model_skl),

	X86_MATCH_VFM(INTEL_ARROWLAKE,		&model_skl),

	X86_MATCH_VFM(INTEL_LUNARLAKE_M,	&model_skl),

	{},

};

MODULE_DEVICE_TABLE(x86cpu, rapl_model_match);