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

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

arch/x86/events/intel/pt.c

+6 −6
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <asm/insn.h>

#include <asm/io.h>

#include <asm/intel_pt.h>

#include <asm/intel-family.h>

#include <asm/cpu_device_id.h>



#include "../perf_event.h"

#include "pt.h"
@@ -211,11 +211,11 @@ static int __init pt_pmu_hw_init(void) 
	}



	/* model-specific quirks */

	switch (boot_cpu_data.x86_model) {

	case INTEL_FAM6_BROADWELL:

	case INTEL_FAM6_BROADWELL_D:

	case INTEL_FAM6_BROADWELL_G:

	case INTEL_FAM6_BROADWELL_X:

	switch (boot_cpu_data.x86_vfm) {

	case INTEL_BROADWELL:

	case INTEL_BROADWELL_D:

	case INTEL_BROADWELL_G:

	case INTEL_BROADWELL_X:

		/* not setting BRANCH_EN will #GP, erratum BDM106 */

		pt_pmu.branch_en_always_on = true;

		break;