@@ -1240,15 +1240,18 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = {
12401240#define VMSCAPE BIT(11)
12411241
12421242static const struct x86_cpu_id cpu_vuln_blacklist [] __initconst = {
1243- VULNBL_INTEL_STEPS (INTEL_IVYBRIDGE , X86_STEP_MAX , SRBDS ),
1244- VULNBL_INTEL_STEPS (INTEL_HASWELL , X86_STEP_MAX , SRBDS ),
1245- VULNBL_INTEL_STEPS (INTEL_HASWELL_L , X86_STEP_MAX , SRBDS ),
1246- VULNBL_INTEL_STEPS (INTEL_HASWELL_G , X86_STEP_MAX , SRBDS ),
1247- VULNBL_INTEL_STEPS (INTEL_HASWELL_X , X86_STEP_MAX , MMIO ),
1248- VULNBL_INTEL_STEPS (INTEL_BROADWELL_D , X86_STEP_MAX , MMIO ),
1249- VULNBL_INTEL_STEPS (INTEL_BROADWELL_G , X86_STEP_MAX , SRBDS ),
1250- VULNBL_INTEL_STEPS (INTEL_BROADWELL_X , X86_STEP_MAX , MMIO ),
1251- VULNBL_INTEL_STEPS (INTEL_BROADWELL , X86_STEP_MAX , SRBDS ),
1243+ VULNBL_INTEL_STEPS (INTEL_SANDYBRIDGE_X , X86_STEP_MAX , VMSCAPE ),
1244+ VULNBL_INTEL_STEPS (INTEL_SANDYBRIDGE , X86_STEP_MAX , VMSCAPE ),
1245+ VULNBL_INTEL_STEPS (INTEL_IVYBRIDGE_X , X86_STEP_MAX , VMSCAPE ),
1246+ VULNBL_INTEL_STEPS (INTEL_IVYBRIDGE , X86_STEP_MAX , SRBDS | VMSCAPE ),
1247+ VULNBL_INTEL_STEPS (INTEL_HASWELL , X86_STEP_MAX , SRBDS | VMSCAPE ),
1248+ VULNBL_INTEL_STEPS (INTEL_HASWELL_L , X86_STEP_MAX , SRBDS | VMSCAPE ),
1249+ VULNBL_INTEL_STEPS (INTEL_HASWELL_G , X86_STEP_MAX , SRBDS | VMSCAPE ),
1250+ VULNBL_INTEL_STEPS (INTEL_HASWELL_X , X86_STEP_MAX , MMIO | VMSCAPE ),
1251+ VULNBL_INTEL_STEPS (INTEL_BROADWELL_D , X86_STEP_MAX , MMIO | VMSCAPE ),
1252+ VULNBL_INTEL_STEPS (INTEL_BROADWELL_X , X86_STEP_MAX , MMIO | VMSCAPE ),
1253+ VULNBL_INTEL_STEPS (INTEL_BROADWELL_G , X86_STEP_MAX , SRBDS | VMSCAPE ),
1254+ VULNBL_INTEL_STEPS (INTEL_BROADWELL , X86_STEP_MAX , SRBDS | VMSCAPE ),
12521255 VULNBL_INTEL_STEPS (INTEL_SKYLAKE_X , 0x5 , MMIO | RETBLEED | GDS | VMSCAPE ),
12531256 VULNBL_INTEL_STEPS (INTEL_SKYLAKE_X , X86_STEP_MAX , MMIO | RETBLEED | GDS | ITS | VMSCAPE ),
12541257 VULNBL_INTEL_STEPS (INTEL_SKYLAKE_L , X86_STEP_MAX , MMIO | RETBLEED | GDS | SRBDS | VMSCAPE ),
0 commit comments