]> www.infradead.org Git - users/hch/misc.git/commitdiff
x86/sgx: Use ENCLS mnemonic in <kernel/cpu/sgx/encls.h>
authorUros Bizjak <ubizjak@gmail.com>
Mon, 16 Jun 2025 08:56:30 +0000 (10:56 +0200)
committerBorislav Petkov (AMD) <bp@alien8.de>
Mon, 25 Aug 2025 15:28:43 +0000 (17:28 +0200)
Current minimum required version of binutils is 2.30, which supports ENCLS
instruction mnemonic.

Replace the byte-wise specification of ENCLS with this proper mnemonic.

No functional change intended.

Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Link: https://lore.kernel.org/20250616085716.158942-1-ubizjak@gmail.com
arch/x86/kernel/cpu/sgx/encls.h

index 99004b02e2eda9e40bc3e46607e2172a0bd1c440..42a088a337c5fca87a01c8e28fdd002e5376488d 100644 (file)
@@ -68,7 +68,7 @@ static inline bool encls_failed(int ret)
        ({                                                      \
        int ret;                                                \
        asm volatile(                                           \
-       "1: .byte 0x0f, 0x01, 0xcf;\n\t"                        \
+       "1: encls\n"                                            \
        "2:\n"                                                  \
        _ASM_EXTABLE_TYPE(1b, 2b, EX_TYPE_FAULT_SGX)            \
        : "=a"(ret)                                             \
@@ -111,8 +111,8 @@ static inline bool encls_failed(int ret)
        ({                                                      \
        int ret;                                                \
        asm volatile(                                           \
-       "1: .byte 0x0f, 0x01, 0xcf;\n\t"                        \
-       "   xor %%eax,%%eax;\n"                                 \
+       "1: encls\n\t"                                          \
+       "xor %%eax,%%eax\n"                                     \
        "2:\n"                                                  \
        _ASM_EXTABLE_TYPE(1b, 2b, EX_TYPE_FAULT_SGX)            \
        : "=a"(ret), "=b"(rbx_out)                              \