summaryrefslogtreecommitdiffstats
path: root/arch/x86/realmode
diff options
context:
space:
mode:
authorTom Lendacky2017-10-20 16:30:46 +0200
committerThomas Gleixner2017-11-07 15:35:55 +0100
commitfcdcd6cdd98ff4d0cf876f863024a2fb0b491d41 (patch)
treeecfda2a3cec17141dccb467a026bf529e6aebd24 /arch/x86/realmode
parentx86/mm: Don't attempt to encrypt initrd under SEV (diff)
downloadkernel-qcow2-linux-fcdcd6cdd98ff4d0cf876f863024a2fb0b491d41.tar.gz
kernel-qcow2-linux-fcdcd6cdd98ff4d0cf876f863024a2fb0b491d41.tar.xz
kernel-qcow2-linux-fcdcd6cdd98ff4d0cf876f863024a2fb0b491d41.zip
x86/realmode: Don't decrypt trampoline area under SEV
When SEV is active the trampoline area will need to be in encrypted memory so only mark the area decrypted if SME is active. Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com> Signed-off-by: Brijesh Singh <brijesh.singh@amd.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Borislav Petkov <bp@suse.de> Tested-by: Borislav Petkov <bp@suse.de> Cc: Laura Abbott <labbott@redhat.com> Cc: kvm@vger.kernel.org Cc: Borislav Petkov <bp@alien8.de> Cc: Andy Lutomirski <luto@kernel.org> Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Link: https://lkml.kernel.org/r/20171020143059.3291-5-brijesh.singh@amd.com
Diffstat (limited to 'arch/x86/realmode')
-rw-r--r--arch/x86/realmode/init.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
index ed84d3917a59..d10105825d57 100644
--- a/arch/x86/realmode/init.c
+++ b/arch/x86/realmode/init.c
@@ -64,9 +64,10 @@ static void __init setup_real_mode(void)
/*
* If SME is active, the trampoline area will need to be in
* decrypted memory in order to bring up other processors
- * successfully.
+ * successfully. This is not needed for SEV.
*/
- set_memory_decrypted((unsigned long)base, size >> PAGE_SHIFT);
+ if (sme_active())
+ set_memory_decrypted((unsigned long)base, size >> PAGE_SHIFT);
memcpy(base, real_mode_blob, size);