diff options
| author |   Michael Roth <michael.roth@amd.com> | 2022-02-09 12:10:02 -0600 |
|---|---|---|
| committer |   Borislav Petkov <bp@suse.de> | 2022-04-06 13:02:26 +0200 |
| commit | bcce829083339bf862d66df602cbb111943da8fb (patch) | |
| tree | 7e7a7045dce184d60217670d8c22a7066125bd27 /arch/x86/kernel/head_64.S | |
| parent | x86/compressed/64: Detect/setup SEV/SME features earlier during boot (diff) | |
| download | linux-dev-bcce829083339bf862d66df602cbb111943da8fb.tar.xz linux-dev-bcce829083339bf862d66df602cbb111943da8fb.zip | |
x86/sev: Detect/setup SEV/SME features earlier in boot
sme_enable() handles feature detection for both SEV and SME. Future
patches will also use it for SEV-SNP feature detection/setup, which
will need to be done immediately after the first #VC handler is set up.
Move it now in preparation.
Signed-off-by: Michael Roth <michael.roth@amd.com>
Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Venu Busireddy <venu.busireddy@oracle.com>
Link: https://lore.kernel.org/r/20220307213356.2797205-9-brijesh.singh@amd.com
Diffstat (limited to 'arch/x86/kernel/head_64.S')
| -rw-r--r-- | arch/x86/kernel/head_64.S | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index b8e3019547a5..6bf340c91165 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -69,6 +69,19 @@ SYM_CODE_START_NOALIGN(startup_64) call startup_64_setup_env popq %rsi +#ifdef CONFIG_AMD_MEM_ENCRYPT + /* + * Activate SEV/SME memory encryption if supported/enabled. This needs to + * be done now, since this also includes setup of the SEV-SNP CPUID table, + * which needs to be done before any CPUID instructions are executed in + * subsequent code. + */ + movq %rsi, %rdi + pushq %rsi + call sme_enable + popq %rsi +#endif + /* Now switch to __KERNEL_CS so IRET works reliably */ pushq $__KERNEL_CS leaq .Lon_kernel_cs(%rip), %rax |