diff options
| author | Thiago Jung Bauermann <bauerman@linux.ibm.com> | 2019-08-06 06:49:17 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-08-09 14:52:08 +0200 |
| commit | 284e21fab2cfcf90dacce565e0b12f29e5df00c1 (patch) | |
| tree | f3ff0d324d2c19857a4e842a1c7369e0421e1fc2 /arch/x86/include/asm/mem_encrypt.h | |
| parent | dma-mapping: Remove dma_check_mask() (diff) | |
| download | linux-284e21fab2cfcf90dacce565e0b12f29e5df00c1.tar.xz linux-284e21fab2cfcf90dacce565e0b12f29e5df00c1.zip | |
x86, s390/mm: Move sme_active() and sme_me_mask to x86-specific header
Now that generic code doesn't reference them, move sme_active() and
sme_me_mask to x86's <asm/mem_encrypt.h>.
Also remove the export for sme_active() since it's only used in files that
won't be built as modules. sme_me_mask on the other hand is used in
arch/x86/kvm/svm.c (via __sme_set() and __psp_pa()) which can be built as a
module so its export needs to stay.
Signed-off-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20190806044919.10622-5-bauerman@linux.ibm.com
Diffstat (limited to 'arch/x86/include/asm/mem_encrypt.h')
| -rw-r--r-- | arch/x86/include/asm/mem_encrypt.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/x86/include/asm/mem_encrypt.h b/arch/x86/include/asm/mem_encrypt.h index 0c196c47d621..848ce43b9040 100644 --- a/arch/x86/include/asm/mem_encrypt.h +++ b/arch/x86/include/asm/mem_encrypt.h @@ -92,6 +92,16 @@ early_set_memory_encrypted(unsigned long vaddr, unsigned long size) { return 0; extern char __start_bss_decrypted[], __end_bss_decrypted[], __start_bss_decrypted_unused[]; +static inline bool mem_encrypt_active(void) +{ + return sme_me_mask; +} + +static inline u64 sme_get_me_mask(void) +{ + return sme_me_mask; +} + #endif /* __ASSEMBLY__ */ #endif /* __X86_MEM_ENCRYPT_H__ */ |