diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-05-21 17:51:58 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-05-30 18:07:28 +0200 |
| commit | 8d9c45ad72a61aa0e634a7f708de6a8f5f705294 (patch) | |
| tree | e7cb171b4882eeaa1920d71df0b0280be63eb49b /src/crypto/chacha20poly1305.h | |
| parent | 1398093d14a6b1b4064f3dd5513ec67c38683193 (diff) | |
chacha20poly1305: add NEON versions for ARM and ARM64
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'src/crypto/chacha20poly1305.h')
| -rw-r--r-- | src/crypto/chacha20poly1305.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/crypto/chacha20poly1305.h b/src/crypto/chacha20poly1305.h index b881c82..89701e4 100644 --- a/src/crypto/chacha20poly1305.h +++ b/src/crypto/chacha20poly1305.h @@ -42,28 +42,42 @@ bool __must_check xchacha20poly1305_decrypt(u8 *dst, const u8 *src, const size_t const u8 nonce[XCHACHA20POLY1305_NONCELEN], const u8 key[CHACHA20POLY1305_KEYLEN]); -#ifdef CONFIG_X86_64 +#if defined(CONFIG_X86_64) #include <linux/version.h> #include <asm/fpu/api.h> #include <asm/simd.h> +#elif IS_ENABLED(CONFIG_KERNEL_MODE_NEON) +#include <asm/neon.h> +#include <asm/simd.h> #endif static inline bool chacha20poly1305_init_simd(void) { bool have_simd = false; -#ifdef CONFIG_X86_64 +#if defined(CONFIG_X86_64) have_simd = irq_fpu_usable(); if (have_simd) kernel_fpu_begin(); +#elif IS_ENABLED(CONFIG_KERNEL_MODE_NEON) +#if defined(CONFIG_ARM64) + have_simd = true; /* ARM64 supports NEON in any context. */ +#elif defined(CONFIG_ARM) + have_simd = may_use_simd(); /* ARM doesn't support NEON in interrupt context. */ +#endif + if (have_simd) + kernel_neon_begin(); #endif return have_simd; } static inline void chacha20poly1305_deinit_simd(bool was_on) { -#ifdef CONFIG_X86_64 +#if defined(CONFIG_X86_64) if (was_on) kernel_fpu_end(); +#elif IS_ENABLED(CONFIG_KERNEL_MODE_NEON) + if (was_on) + kernel_neon_end(); #endif } |