Commit de844ef5 authored by Sohil Mehta's avatar Sohil Mehta Committed by Ingo Molnar
Browse files

perf/x86/intel, x86/cpu: Replace Pentium 4 model checks with VFM ones 



Introduce a name for an old Pentium 4 model and replace the x86_model
checks with VFM ones. This gets rid of one of the last remaining
Intel-specific x86_model checks.

Signed-off-by: default avatarSohil Mehta <sohil.mehta@intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarKan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20250318223828.2945651-3-sohil.mehta@intel.com
parent 8b70c743

arch/x86/events/intel/p4.c

+4 −3
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/perf_event.h>



#include <asm/perf_event_p4.h>

#include <asm/cpu_device_id.h>

#include <asm/hardirq.h>

#include <asm/apic.h>
@@ -732,9 +733,9 @@ static bool p4_event_match_cpu_model(unsigned int event_idx) 
{

	/* INSTR_COMPLETED event only exist for model 3, 4, 6 (Prescott) */

	if (event_idx == P4_EVENT_INSTR_COMPLETED) {

		if (boot_cpu_data.x86_model != 3 &&

			boot_cpu_data.x86_model != 4 &&

			boot_cpu_data.x86_model != 6)

		if (boot_cpu_data.x86_vfm != INTEL_P4_PRESCOTT &&

		    boot_cpu_data.x86_vfm != INTEL_P4_PRESCOTT_2M &&

		    boot_cpu_data.x86_vfm != INTEL_P4_CEDARMILL)

			return false;

	}

arch/x86/include/asm/intel-family.h

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ 
/* Family 15 - NetBurst */

#define INTEL_P4_WILLAMETTE		IFM(15, 0x01) /* Also Xeon Foster */

#define INTEL_P4_PRESCOTT		IFM(15, 0x03)

#define INTEL_P4_PRESCOTT_2M		IFM(15, 0x04)

#define INTEL_P4_CEDARMILL		IFM(15, 0x06) /* Also Xeon Dempsey */



/* Family 19 */