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

x86/virt/tdx: 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/20240520224620.9480-31-tony.luck%40intel.com
parent ac6bee4b

arch/x86/virt/vmx/tdx/tdx.c

+4 −4
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include <asm/msr.h>

#include <asm/cpufeature.h>

#include <asm/tdx.h>

#include <asm/intel-family.h>

#include <asm/cpu_device_id.h>

#include <asm/processor.h>

#include <asm/mce.h>

#include "tdx.h"
@@ -1426,9 +1426,9 @@ static void __init check_tdx_erratum(void) 
	 * private memory poisons that memory, and a subsequent read of

	 * that memory triggers #MC.

	 */

	switch (boot_cpu_data.x86_model) {

	case INTEL_FAM6_SAPPHIRERAPIDS_X:

	case INTEL_FAM6_EMERALDRAPIDS_X:

	switch (boot_cpu_data.x86_vfm) {

	case INTEL_SAPPHIRERAPIDS_X:

	case INTEL_EMERALDRAPIDS_X:

		setup_force_cpu_bug(X86_BUG_TDX_PW_MCE);

	}

}