SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/i386/cpu: Explicitly express SGX_LC and SGX feature words dependency

Browse Source 
At present, cpu_x86_cpuid() silently masks off SGX_LC if SGX is absent.

This is not proper because the user is not told about the dependency
between the two.

So explicitly define the dependency between SGX_LC and SGX feature
words, so that user could get a warning when SGX_LC is enabled but
SGX is absent.

Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Link: https://lore.kernel.org/r/20240730045544.2516284-3-zhao1.liu@intel.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Zhao Liu 2024-07-30 12:55:42 +08:00 committed by Paolo Bonzini
parent eee194dd71
commit 4912d6990b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/i386/cpu.c
View File

@ -1730,6 +1730,10 @@ static FeatureDep feature_dependencies[] = {
.from = { FEAT_7_1_EAX, CPUID_7_1_EAX_WRMSRNS }, .from = { FEAT_7_1_EAX, CPUID_7_1_EAX_WRMSRNS },
.to = { FEAT_7_1_EAX, CPUID_7_1_EAX_FRED }, .to = { FEAT_7_1_EAX, CPUID_7_1_EAX_FRED },
}, },
{
.from = { FEAT_7_0_EBX, CPUID_7_0_EBX_SGX },
.to = { FEAT_7_0_ECX, CPUID_7_0_ECX_SGX_LC },
},
}; };
typedef struct X86RegisterInfo32 { typedef struct X86RegisterInfo32 {
@ -6545,11 +6549,6 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
*ecx |= CPUID_7_0_ECX_OSPKE; *ecx |= CPUID_7_0_ECX_OSPKE;
} }
*edx = env->features[FEAT_7_0_EDX]; /* Feature flags */ *edx = env->features[FEAT_7_0_EDX]; /* Feature flags */
if ((*ecx & CPUID_7_0_ECX_SGX_LC)
&& (!(*ebx & CPUID_7_0_EBX_SGX))) {
*ecx &= ~CPUID_7_0_ECX_SGX_LC;
}
} else if (count == 1) { } else if (count == 1) {
*eax = env->features[FEAT_7_1_EAX]; *eax = env->features[FEAT_7_1_EAX];
*edx = env->features[FEAT_7_1_EDX]; *edx = env->features[FEAT_7_1_EDX];