Skip to content

Commit a7011b8

Browse files
aeglhansendc
authored andcommitted
perf/x86/intel/pt: 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/20240424181500.41538-1-tony.luck%40intel.com
1 parent 0011a51 commit a7011b8

File tree

1 file changed

+6
-6
lines changed
  • arch/x86/events/intel

1 file changed

+6
-6
lines changed

arch/x86/events/intel/pt.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <asm/insn.h>
2323
#include <asm/io.h>
2424
#include <asm/intel_pt.h>
25-
#include <asm/intel-family.h>
25+
#include <asm/cpu_device_id.h>
2626

2727
#include "../perf_event.h"
2828
#include "pt.h"
@@ -211,11 +211,11 @@ static int __init pt_pmu_hw_init(void)
211211
}
212212

213213
/* model-specific quirks */
214-
switch (boot_cpu_data.x86_model) {
215-
case INTEL_FAM6_BROADWELL:
216-
case INTEL_FAM6_BROADWELL_D:
217-
case INTEL_FAM6_BROADWELL_G:
218-
case INTEL_FAM6_BROADWELL_X:
214+
switch (boot_cpu_data.x86_vfm) {
215+
case INTEL_BROADWELL:
216+
case INTEL_BROADWELL_D:
217+
case INTEL_BROADWELL_G:
218+
case INTEL_BROADWELL_X:
219219
/* not setting BRANCH_EN will #GP, erratum BDM106 */
220220
pt_pmu.branch_en_always_on = true;
221221
break;

0 commit comments

Comments
 (0)