|
@@ -15,6 +15,7 @@
|
|
|
#include <linux/mm.h>
|
|
|
#include <linux/dma-mapping.h>
|
|
|
#include <linux/swiotlb.h>
|
|
|
+#include <linux/mem_encrypt.h>
|
|
|
|
|
|
#include <asm/tlbflush.h>
|
|
|
#include <asm/fixmap.h>
|
|
@@ -23,6 +24,13 @@
|
|
|
#include <asm/set_memory.h>
|
|
|
#include <asm/cacheflush.h>
|
|
|
#include <asm/sections.h>
|
|
|
+#include <asm/processor-flags.h>
|
|
|
+#include <asm/msr.h>
|
|
|
+#include <asm/cmdline.h>
|
|
|
+
|
|
|
+static char sme_cmdline_arg[] __initdata = "mem_encrypt";
|
|
|
+static char sme_cmdline_on[] __initdata = "on";
|
|
|
+static char sme_cmdline_off[] __initdata = "off";
|
|
|
|
|
|
/*
|
|
|
* Since SME related variables are set early in the boot process they must
|
|
@@ -190,6 +198,8 @@ void __init mem_encrypt_init(void)
|
|
|
|
|
|
/* Call into SWIOTLB to update the SWIOTLB DMA buffers */
|
|
|
swiotlb_update_mem_attributes();
|
|
|
+
|
|
|
+ pr_info("AMD Secure Memory Encryption (SME) active\n");
|
|
|
}
|
|
|
|
|
|
void swiotlb_set_mem_attributes(void *vaddr, unsigned long size)
|
|
@@ -513,6 +523,71 @@ void __init sme_encrypt_kernel(void)
|
|
|
native_write_cr3(__native_read_cr3());
|
|
|
}
|
|
|
|
|
|
-void __init sme_enable(void)
|
|
|
+void __init __nostackprotector sme_enable(struct boot_params *bp)
|
|
|
{
|
|
|
+ const char *cmdline_ptr, *cmdline_arg, *cmdline_on, *cmdline_off;
|
|
|
+ unsigned int eax, ebx, ecx, edx;
|
|
|
+ bool active_by_default;
|
|
|
+ unsigned long me_mask;
|
|
|
+ char buffer[16];
|
|
|
+ u64 msr;
|
|
|
+
|
|
|
+ /* Check for the SME support leaf */
|
|
|
+ eax = 0x80000000;
|
|
|
+ ecx = 0;
|
|
|
+ native_cpuid(&eax, &ebx, &ecx, &edx);
|
|
|
+ if (eax < 0x8000001f)
|
|
|
+ return;
|
|
|
+
|
|
|
+ /*
|
|
|
+ * Check for the SME feature:
|
|
|
+ * CPUID Fn8000_001F[EAX] - Bit 0
|
|
|
+ * Secure Memory Encryption support
|
|
|
+ * CPUID Fn8000_001F[EBX] - Bits 5:0
|
|
|
+ * Pagetable bit position used to indicate encryption
|
|
|
+ */
|
|
|
+ eax = 0x8000001f;
|
|
|
+ ecx = 0;
|
|
|
+ native_cpuid(&eax, &ebx, &ecx, &edx);
|
|
|
+ if (!(eax & 1))
|
|
|
+ return;
|
|
|
+
|
|
|
+ me_mask = 1UL << (ebx & 0x3f);
|
|
|
+
|
|
|
+ /* Check if SME is enabled */
|
|
|
+ msr = __rdmsr(MSR_K8_SYSCFG);
|
|
|
+ if (!(msr & MSR_K8_SYSCFG_MEM_ENCRYPT))
|
|
|
+ return;
|
|
|
+
|
|
|
+ /*
|
|
|
+ * Fixups have not been applied to phys_base yet and we're running
|
|
|
+ * identity mapped, so we must obtain the address to the SME command
|
|
|
+ * line argument data using rip-relative addressing.
|
|
|
+ */
|
|
|
+ asm ("lea sme_cmdline_arg(%%rip), %0"
|
|
|
+ : "=r" (cmdline_arg)
|
|
|
+ : "p" (sme_cmdline_arg));
|
|
|
+ asm ("lea sme_cmdline_on(%%rip), %0"
|
|
|
+ : "=r" (cmdline_on)
|
|
|
+ : "p" (sme_cmdline_on));
|
|
|
+ asm ("lea sme_cmdline_off(%%rip), %0"
|
|
|
+ : "=r" (cmdline_off)
|
|
|
+ : "p" (sme_cmdline_off));
|
|
|
+
|
|
|
+ if (IS_ENABLED(CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT))
|
|
|
+ active_by_default = true;
|
|
|
+ else
|
|
|
+ active_by_default = false;
|
|
|
+
|
|
|
+ cmdline_ptr = (const char *)((u64)bp->hdr.cmd_line_ptr |
|
|
|
+ ((u64)bp->ext_cmd_line_ptr << 32));
|
|
|
+
|
|
|
+ cmdline_find_option(cmdline_ptr, cmdline_arg, buffer, sizeof(buffer));
|
|
|
+
|
|
|
+ if (!strncmp(buffer, cmdline_on, sizeof(buffer)))
|
|
|
+ sme_me_mask = me_mask;
|
|
|
+ else if (!strncmp(buffer, cmdline_off, sizeof(buffer)))
|
|
|
+ sme_me_mask = 0;
|
|
|
+ else
|
|
|
+ sme_me_mask = active_by_default ? me_mask : 0;
|
|
|
}
|