Re: [PATCH v3 15/15] perf/x86/p4: Replace Pentium 4 model checks with VFM ones

[Liang, Kan]

On 2025-02-19 1:41 p.m., Sohil Mehta wrote:
> Introduce names for some old pentium 4 models and replace x86_model
> checks with VFM ones.
> 
> Signed-off-by: Sohil Mehta <sohil.mehta@xxxxxxxxx>


Reviewed-by: Kan Liang <kan.liang@xxxxxxxxxxxxxxx>

Thanks,
Kan

> ---
> v3: No change.
> v2: No change.
> ---
>  arch/x86/events/intel/p4.c          | 7 ++++---
>  arch/x86/include/asm/intel-family.h | 1 +
>  2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/x86/events/intel/p4.c b/arch/x86/events/intel/p4.c
> index 844bc4fc4724..fb726c6fc6e7 100644
> --- a/arch/x86/events/intel/p4.c
> +++ b/arch/x86/events/intel/p4.c
> @@ -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;
>  	}
>  
> diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h
> index 6621d796bb3d..89cb545d521b 100644
> --- a/arch/x86/include/asm/intel-family.h
> +++ b/arch/x86/include/asm/intel-family.h
> @@ -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 */