diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-08-26 10:42:34 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-08-26 10:42:34 +0100 |
| commit | 0a9be955459f21968516f5b220822f7350a3d3c1 (patch) | |
| tree | 6c9e7adf52934bfddae15b245d5b806b14719d43 | |
| parent | d8ae530ec00368d4adfb996b5ef6c74cb4460504 (diff) | |
| parent | f429dbf8fc526a9cacf531176b28d0c65701475a (diff) | |
| download | qemu-0a9be955459f21968516f5b220822f7350a3d3c1.zip qemu-0a9be955459f21968516f5b220822f7350a3d3c1.tar.gz qemu-0a9be955459f21968516f5b220822f7350a3d3c1.tar.bz2 | |
Merge remote-tracking branch 'remotes/ehabkost-gl/tags/x86-next-pull-request' into staging
x86 queue, 2021-08-25
Bug fixes:
* Remove split lock detect in Snowridge CPU model (Chenyi Qiang)
* Remove AVX_VNNI feature from Cooperlake cpu model (Yang Zhong)
# gpg: Signature made Wed 25 Aug 2021 20:53:59 BST
# gpg: using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6
# gpg: issuer "ehabkost@redhat.com"
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost-gl/tags/x86-next-pull-request:
i386/cpu: Remove AVX_VNNI feature from Cooperlake cpu model
target/i386: Remove split lock detect in Snowridge CPU model
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target/i386/cpu.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 34a7ce8..97e250e 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -3102,7 +3102,7 @@ static const X86CPUDefinition builtin_x86_defs[] = { MSR_ARCH_CAP_SKIP_L1DFL_VMENTRY | MSR_ARCH_CAP_MDS_NO | MSR_ARCH_CAP_PSCHANGE_MC_NO | MSR_ARCH_CAP_TAA_NO, .features[FEAT_7_1_EAX] = - CPUID_7_1_EAX_AVX_VNNI | CPUID_7_1_EAX_AVX512_BF16, + CPUID_7_1_EAX_AVX512_BF16, /* XSAVES is added in version 2 */ .features[FEAT_XSAVE] = CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XSAVEC | @@ -3682,6 +3682,14 @@ static const X86CPUDefinition builtin_x86_defs[] = { { /* end of list */ }, }, }, + { + .version = 4, + .note = "no split lock detect", + .props = (PropValue[]) { + { "split-lock-detect", "off" }, + { /* end of list */ }, + }, + }, { /* end of list */ }, }, }, |