From: Hendrik Wüthrich <whendrik@google.com>
Adjust minimum CPUID level if RDT monitoring or allocation features are
enabled to ensure that CPUID will return them.
Signed-off-by: Hendrik Wüthrich <whendrik@google.com>
---
target/i386/cpu.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 1cf5e5d5ff..482f980a1f 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -7590,6 +7590,16 @@ void x86_cpu_expand_features(X86CPU *cpu, Error **errp)
if (env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_SGX) {
x86_cpu_adjust_level(cpu, &env->cpuid_min_level, 0x12);
}
+
+ /* RDT monitoring requires CPUID[0xF] */
+ if (env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_PQM) {
+ x86_cpu_adjust_level(cpu, &env->cpuid_min_level, 0xF);
+ }
+
+ /* RDT allocation requires CPUID[0x10] */
+ if (env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_PQE) {
+ x86_cpu_adjust_level(cpu, &env->cpuid_min_level, 0x10);
+ }
}
/* Set cpuid_*level* based on cpuid_min_*level, if not explicitly set */
--
2.45.2.1089.g2a221341d9-goog