Re: [PATCH] x86/bugs: Replace RFDS model checks with VFM ones

[Pawan Gupta]

On Fri, Oct 30, 2026 at 12:52:14PM -0700, Sohil Mehta wrote:
> The RFDS vulnerability check uses raw model numbers to identify Alder
> Lake and Raptor Lake. Most Intel-specific code has already moved away
> from x86_model checks, but this one got added recently.
> 
> Replace the x86_model checks with VFM ones to make them more readable.
> 
> Signed-off-by: Sohil Mehta <sohil.mehta@xxxxxxxxx>
> ---
>  arch/x86/kernel/cpu/common.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
> index c7352827f491..8d7bd8bb7b18 100644
> --- a/arch/x86/kernel/cpu/common.c
> +++ b/arch/x86/kernel/cpu/common.c
> @@ -1392,8 +1392,8 @@ static bool __init vulnerable_to_rfds(u64 x86_arch_cap_msr)
>  	 * both Core and Atom CPUs. Mark unaffected when Atom CPUs are not
>  	 * present.
>  	 */
> -	if ((boot_cpu_data.x86_model == 0x97 ||
> -	     boot_cpu_data.x86_model == 0xB7) &&
> +	if ((boot_cpu_data.x86_vfm == INTEL_ALDERLAKE ||
> +	     boot_cpu_data.x86_vfm == INTEL_RAPTORLAKE) &&

I missed that when adding the patch. Thanks for fixing.

Reviewed-by: Pawan Gupta <pawan.kumar.gupta@xxxxxxxxxxxxxxx>