kevin/linux
1
Fork 0
Code

x86/virt/tdx: Switch to new Intel CPU model defines

Browse Source 
New CPU #defines encode vendor and family as well as model.

Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/all/20240520224620.9480-31-tony.luck%40intel.com
This commit is contained in:
Tony Luck 2024-05-20 15:46:01 -07:00 committed by Dave Hansen
parent ac6bee4bf7
commit 189e8d4b98
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/virt/vmx/tdx/tdx.c
View File

@ -33,7 +33,7 @@
#include <asm/msr.h> #include <asm/msr.h>
#include <asm/cpufeature.h> #include <asm/cpufeature.h>
#include <asm/tdx.h> #include <asm/tdx.h>
#include <asm/intel-family.h> #include <asm/cpu_device_id.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/mce.h> #include <asm/mce.h>
#include "tdx.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 * private memory poisons that memory, and a subsequent read of
* that memory triggers #MC. * that memory triggers #MC.
*/ */
switch (boot_cpu_data.x86_model) { switch (boot_cpu_data.x86_vfm) {
case INTEL_FAM6_SAPPHIRERAPIDS_X: case INTEL_SAPPHIRERAPIDS_X:
case INTEL_FAM6_EMERALDRAPIDS_X: case INTEL_EMERALDRAPIDS_X:
setup_force_cpu_bug(X86_BUG_TDX_PW_MCE); setup_force_cpu_bug(X86_BUG_TDX_PW_MCE);
} }
} }