diff options
| author | Tony Luck <tony.luck@intel.com> | 2024-04-24 11:15:02 -0700 |
|---|---|---|
| committer | Dave Hansen <dave.hansen@linux.intel.com> | 2024-04-25 09:04:32 -0700 |
| commit | d413a1955a8e32e4425ff4dd47f5c6fcf09427c3 (patch) | |
| tree | 76470b605ec62cf3b79f0e4f824427d8b4f7a449 | |
| parent | 9b2583d8103eee0f122fd24046ed012174bf8f72 (diff) | |
| download | tip-d413a1955a8e32e4425ff4dd47f5c6fcf09427c3.tar.gz | |
perf/x86/intel/uncore: Switch to new Intel CPU model defines
Notice: this object is not reachable from any branch.
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/20240424181502.41576-1-tony.luck%40intel.com
Notice: this object is not reachable from any branch.
| -rw-r--r-- | arch/x86/events/intel/uncore_nhmex.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/events/intel/uncore_nhmex.c b/arch/x86/events/intel/uncore_nhmex.c index 92da8aaa59660e..466833478e81fb 100644 --- a/arch/x86/events/intel/uncore_nhmex.c +++ b/arch/x86/events/intel/uncore_nhmex.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* Nehalem-EX/Westmere-EX uncore support */ +#include <asm/cpu_device_id.h> #include "uncore.h" /* NHM-EX event control */ @@ -1217,7 +1218,7 @@ static struct intel_uncore_type *nhmex_msr_uncores[] = { void nhmex_uncore_cpu_init(void) { - if (boot_cpu_data.x86_model == 46) + if (boot_cpu_data.x86_vfm == INTEL_NEHALEM_EX) uncore_nhmex = true; else nhmex_uncore_mbox.event_descs = wsmex_uncore_mbox_events; |