mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-12-03 08:43:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

cpu/i386: populate CPUID 0x8000_001F when SEV is active

Browse Source 
When SEV is enabled, CPUID 0x8000_001F should provide additional
information regarding the feature (such as which page table bit is used
to mark the pages as encrypted etc).

The details for memory encryption CPUID is available in AMD APM
(https://support.amd.com/TechDocs/24594.pdf) Section E.4.17

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Brijesh Singh 2018-03-08 06:48:58 -06:00 committed by Paolo Bonzini
parent 8fa4466d77
commit 6cb8f2a663
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
target/i386/cpu.c
View File

@ -26,6 +26,7 @@
#include "sysemu/hvf.h" #include "sysemu/hvf.h"
#include "sysemu/cpus.h" #include "sysemu/cpus.h"
#include "kvm_i386.h" #include "kvm_i386.h"
#include "sev_i386.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/option.h" #include "qemu/option.h"
@ -3612,6 +3613,13 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
*ecx = 0; *ecx = 0;
*edx = 0; *edx = 0;
break; break;
case 0x8000001F:
*eax = sev_enabled() ? 0x2 : 0;
*ebx = sev_get_cbit_position();
*ebx |= sev_get_reduced_phys_bits() << 6;
*ecx = 0;
*edx = 0;
break;
default: default:
/* reserved values: zero */ /* reserved values: zero */
*eax = 0; *eax = 0;
@ -4042,6 +4050,11 @@ static void x86_cpu_expand_features(X86CPU *cpu, Error **errp)
if (env->features[FEAT_8000_0001_ECX] & CPUID_EXT3_SVM) { if (env->features[FEAT_8000_0001_ECX] & CPUID_EXT3_SVM) {
x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x8000000A); x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x8000000A);
} }
/* SEV requires CPUID[0x8000001F] */
if (sev_enabled()) {
x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x8000001F);
}
} }
/* Set cpuid_*level* based on cpuid_min_*level, if not explicitly set */ /* Set cpuid_*level* based on cpuid_min_*level, if not explicitly set */