aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0047-x86-mm-Include-SEV-for-encryption-memory-attribute-c.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0047-x86-mm-Include-SEV-for-encryption-memory-attribute-c.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0047-x86-mm-Include-SEV-for-encryption-memory-attribute-c.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0047-x86-mm-Include-SEV-for-encryption-memory-attribute-c.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0047-x86-mm-Include-SEV-for-encryption-memory-attribute-c.patch
new file mode 100644
index 00000000..620faa8d
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0047-x86-mm-Include-SEV-for-encryption-memory-attribute-c.patch
@@ -0,0 +1,47 @@
+From ff57f938f629f70bce162adee6ee007315a4e4e2 Mon Sep 17 00:00:00 2001
+From: Tom Lendacky <thomas.lendacky@amd.com>
+Date: Fri, 20 Oct 2017 09:30:48 -0500
+Subject: [PATCH 47/95] x86/mm: Include SEV for encryption memory attribute
+ changes
+
+The current code checks only for sme_active() when determining whether
+to perform the encryption attribute change. Include sev_active() in this
+check so that memory attribute changes can occur under SME and SEV.
+
+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: John Ogness <john.ogness@linutronix.de>
+Cc: kvm@vger.kernel.org
+Cc: Matt Fleming <matt@codeblueprint.co.uk>
+Cc: Borislav Petkov <bp@alien8.de>
+Cc: Andy Lutomirski <luto@kernel.org>
+Cc: Dan Williams <dan.j.williams@intel.com>
+Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
+Link: https://lkml.kernel.org/r/20171020143059.3291-7-brijesh.singh@amd.com
+Signed-off-by: Sudheesh Mavila <sudheesh.mavila@amd.com>
+---
+ arch/x86/mm/pageattr.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
+index 464f53d..be517db 100644
+--- a/arch/x86/mm/pageattr.c
++++ b/arch/x86/mm/pageattr.c
+@@ -1783,8 +1783,8 @@ static int __set_memory_enc_dec(unsigned long addr, int numpages, bool enc)
+ unsigned long start;
+ int ret;
+
+- /* Nothing to do if the SME is not active */
+- if (!sme_active())
++ /* Nothing to do if memory encryption is not active */
++ if (!mem_encrypt_active())
+ return 0;
+
+ /* Should not be working on unaligned addresses */
+--
+2.7.4
+