From 6f0630299a3edbb8f5e5ac41eb9e1f1c363f1e3e Mon Sep 17 00:00:00 2001 From: Danilo de Paula Date: Tue, 9 Jun 2020 18:46:51 +0100 Subject: [PATCH 15/17] target/i386: Add new bit definitions of MSR_IA32_ARCH_CAPABILITIES RH-Author: Danilo de Paula Message-id: <20200609184651.1328372-1-ddepaula@redhat.com> Patchwork-id: 97489 O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH 5/4] target/i386: Add new bit definitions of MSR_IA32_ARCH_CAPABILITIES Bugzilla: 1769912 RH-Acked-by: Dr. David Alan Gilbert RH-Acked-by: Eduardo Habkost From: Danilo de Paula redhat: builds with that series were failing. It complains about a undefined MSR_ARCH_CAP_TAA_NO. The bit 6, 7 and 8 of MSR_IA32_ARCH_CAPABILITIES are recently disclosed for some security issues. Add the definitions for them to be used by named CPU models. Signed-off-by: Xiaoyao Li Message-Id: <20191225063018.20038-2-xiaoyao.li@intel.com> Signed-off-by: Paolo Bonzini (cherry picked from commit 6c997b4adb300788d61d72e2b8bc67c03a584956) Signed-off-by: Paolo Bonzini Signed-off-by: Danilo C. L. de Paula --- target/i386/cpu.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index e77d101..7bfbf2a 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -836,12 +836,15 @@ typedef uint64_t FeatureWordArray[FEATURE_WORDS]; #define CPUID_TOPOLOGY_LEVEL_DIE (5U << 8) /* MSR Feature Bits */ -#define MSR_ARCH_CAP_RDCL_NO (1U << 0) -#define MSR_ARCH_CAP_IBRS_ALL (1U << 1) -#define MSR_ARCH_CAP_RSBA (1U << 2) +#define MSR_ARCH_CAP_RDCL_NO (1U << 0) +#define MSR_ARCH_CAP_IBRS_ALL (1U << 1) +#define MSR_ARCH_CAP_RSBA (1U << 2) #define MSR_ARCH_CAP_SKIP_L1DFL_VMENTRY (1U << 3) -#define MSR_ARCH_CAP_SSB_NO (1U << 4) -#define MSR_ARCH_CAP_MDS_NO (1U << 5) +#define MSR_ARCH_CAP_SSB_NO (1U << 4) +#define MSR_ARCH_CAP_MDS_NO (1U << 5) +#define MSR_ARCH_CAP_PSCHANGE_MC_NO (1U << 6) +#define MSR_ARCH_CAP_TSX_CTRL_MSR (1U << 7) +#define MSR_ARCH_CAP_TAA_NO (1U << 8) #define MSR_CORE_CAP_SPLIT_LOCK_DETECT (1U << 5) -- 1.8.3.1