diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-11-27 11:09:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-11-27 11:10:50 +0100 |
| commit | a787bdaff83a085288b6fc607afb4bb648da3cc9 (patch) | |
| tree | ec389c1494ef4790ea90f65c4f86e523caf325d0 /arch/x86/boot/compressed/mem_encrypt.S | |
| parent | 2914b0ba61a9d253535e51af16c7122a8148995d (diff) | |
| parent | 85a2c56cb4454c73f56d3099d96942e7919b292f (diff) | |
| download | linux-a787bdaff83a085288b6fc607afb4bb648da3cc9.tar.gz | |
Merge branch 'linus' into sched/core, to resolve semantic conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/boot/compressed/mem_encrypt.S')
| -rw-r--r-- | arch/x86/boot/compressed/mem_encrypt.S | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/mem_encrypt.S b/arch/x86/boot/compressed/mem_encrypt.S index dd07e7b41b11..aa561795efd1 100644 --- a/arch/x86/boot/compressed/mem_encrypt.S +++ b/arch/x86/boot/compressed/mem_encrypt.S @@ -68,6 +68,9 @@ SYM_FUNC_START(get_sev_encryption_bit) SYM_FUNC_END(get_sev_encryption_bit) .code64 + +#include "../../kernel/sev_verify_cbit.S" + SYM_FUNC_START(set_sev_encryption_mask) #ifdef CONFIG_AMD_MEM_ENCRYPT push %rbp @@ -81,6 +84,19 @@ SYM_FUNC_START(set_sev_encryption_mask) bts %rax, sme_me_mask(%rip) /* Create the encryption mask */ + /* + * Read MSR_AMD64_SEV again and store it to sev_status. Can't do this in + * get_sev_encryption_bit() because this function is 32-bit code and + * shared between 64-bit and 32-bit boot path. + */ + movl $MSR_AMD64_SEV, %ecx /* Read the SEV MSR */ + rdmsr + + /* Store MSR value in sev_status */ + shlq $32, %rdx + orq %rdx, %rax + movq %rax, sev_status(%rip) + .Lno_sev_mask: movq %rbp, %rsp /* Restore original stack pointer */ @@ -96,5 +112,7 @@ SYM_FUNC_END(set_sev_encryption_mask) #ifdef CONFIG_AMD_MEM_ENCRYPT .balign 8 -SYM_DATA(sme_me_mask, .quad 0) +SYM_DATA(sme_me_mask, .quad 0) +SYM_DATA(sev_status, .quad 0) +SYM_DATA(sev_check_data, .quad 0) #endif |