47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
From 52d000a4043f3000f880bb5c75a298f57b8e0fe0 Mon Sep 17 00:00:00 2001
|
|
From: Tao Su <tao1.su@linux.intel.com>
|
|
Date: Thu, 6 Jul 2023 13:49:44 +0800
|
|
Subject: [PATCH] target/i386: Adjust feature level according to FEAT_7_1_EDX
|
|
|
|
commit 8731336e90dea3dd04948127e775c9f087f97a4c upstream.
|
|
|
|
If FEAT_7_1_EAX is 0 and FEAT_7_1_EDX is non-zero, as is the case
|
|
with a Granite Rapids host and
|
|
'-cpu host,-avx-vnni,-avx512-bf16,-fzrm,-fsrs,-fsrc,-amx-fp16', we can't
|
|
get CPUID_7_1 leaf even though CPUID_7_1_EDX has non-zero value.
|
|
|
|
Update cpuid_level_func7 according to CPUID_7_1_EDX, otherwise
|
|
guest may report wrong maximum number sub-leaves in leaf 07H.
|
|
|
|
Fixes: eaaa197d5b11 ("target/i386: Add support for AVX-VNNI-INT8 in CPUID enumeration")
|
|
|
|
Intel-SIG: commit 8731336e90de target/i386: Adjust feature level according to FEAT_7_1_EDX.
|
|
Backport GNR and SRF ISA into QEMU-6.2
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Tao Su <tao1.su@linux.intel.com>
|
|
Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
|
Message-ID: <20230706054949.66556-2-tao1.su@linux.intel.com>
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
[ Quanxian Wang: amend commit log ]
|
|
Signed-off-by: Quanxian Wang <quanxian.wang@intel.com>
|
|
---
|
|
target/i386/cpu.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
|
index efe0c2b46c..6aaa730a0d 100644
|
|
--- a/target/i386/cpu.c
|
|
+++ b/target/i386/cpu.c
|
|
@@ -6551,6 +6551,7 @@ void x86_cpu_expand_features(X86CPU *cpu, Error **errp)
|
|
x86_cpu_adjust_feat_level(cpu, FEAT_6_EAX);
|
|
x86_cpu_adjust_feat_level(cpu, FEAT_7_0_ECX);
|
|
x86_cpu_adjust_feat_level(cpu, FEAT_7_1_EAX);
|
|
+ x86_cpu_adjust_feat_level(cpu, FEAT_7_1_EDX);
|
|
x86_cpu_adjust_feat_level(cpu, FEAT_7_2_EDX);
|
|
x86_cpu_adjust_feat_level(cpu, FEAT_8000_0001_EDX);
|
|
x86_cpu_adjust_feat_level(cpu, FEAT_8000_0001_ECX);
|
|
--
|
|
2.27.0
|
|
|