aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/crypto/zinc/curve25519/curve25519-arm-glue.h
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2018-09-23 03:53:35 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2018-09-23 17:05:23 +0200
commit3ff3990849b8650bec8ca388697744fbe2a5495a (patch)
treee652f0154a5e78e6e91c3f55dac8fb4cd1c3fe21 /src/crypto/zinc/curve25519/curve25519-arm-glue.h
parentcrypto: flatten out makefile (diff)
downloadwireguard-monolithic-historical-3ff3990849b8650bec8ca388697744fbe2a5495a.tar.xz
wireguard-monolithic-historical-3ff3990849b8650bec8ca388697744fbe2a5495a.zip
crypto-arm: rework KERNEL_MODE_NEON handling again
Diffstat (limited to 'src/crypto/zinc/curve25519/curve25519-arm-glue.h')
-rw-r--r--src/crypto/zinc/curve25519/curve25519-arm-glue.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/crypto/zinc/curve25519/curve25519-arm-glue.h b/src/crypto/zinc/curve25519/curve25519-arm-glue.h
index e9496b0..6b20931 100644
--- a/src/crypto/zinc/curve25519/curve25519-arm-glue.h
+++ b/src/crypto/zinc/curve25519/curve25519-arm-glue.h
@@ -7,12 +7,7 @@
#include <asm/neon.h>
#include <asm/simd.h>
-#define ARM_USE_NEON (defined(CONFIG_KERNEL_MODE_NEON) && \
- (defined(CONFIG_ARM64) || \
- (defined(__LINUX_ARM_ARCH__) && \
- __LINUX_ARM_ARCH__ == 7)))
-
-#if ARM_USE_NEON
+#if defined(CONFIG_KERNEL_MODE_NEON)
asmlinkage void curve25519_neon(u8 mypublic[CURVE25519_POINT_SIZE],
const u8 secret[CURVE25519_POINT_SIZE],
const u8 basepoint[CURVE25519_POINT_SIZE]);
@@ -29,7 +24,7 @@ static inline bool curve25519_arch(u8 mypublic[CURVE25519_POINT_SIZE],
const u8 secret[CURVE25519_POINT_SIZE],
const u8 basepoint[CURVE25519_POINT_SIZE])
{
-#if ARM_USE_NEON
+#if defined(CONFIG_KERNEL_MODE_NEON)
if (curve25519_use_neon && may_use_simd()) {
kernel_neon_begin();
curve25519_neon(mypublic, secret, basepoint);