Module Name: src
Committed By: jmcneill
Date: Sat Oct 10 08:24:10 UTC 2020
Modified Files:
src/sys/crypto/aes/arch/arm: aes_neon_impl.c
src/sys/crypto/chacha/arch/arm: chacha_neon_impl.c
Log Message:
Fix detection of NEON features. ID_AA64PFR0_EL1_ADV_SIMD_NONE means SIMD
is not available, and any other value means it is.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/crypto/aes/arch/arm/aes_neon_impl.c
cvs rdiff -u -r1.1 -r1.2 src/sys/crypto/chacha/arch/arm/chacha_neon_impl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/crypto/aes/arch/arm/aes_neon_impl.c
diff -u src/sys/crypto/aes/arch/arm/aes_neon_impl.c:1.4 src/sys/crypto/aes/arch/arm/aes_neon_impl.c:1.5
--- src/sys/crypto/aes/arch/arm/aes_neon_impl.c:1.4 Sat Jul 25 22:36:06 2020
+++ src/sys/crypto/aes/arch/arm/aes_neon_impl.c Sat Oct 10 08:24:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: aes_neon_impl.c,v 1.4 2020/07/25 22:36:06 riastradh Exp $ */
+/* $NetBSD: aes_neon_impl.c,v 1.5 2020/10/10 08:24:10 jmcneill Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: aes_neon_impl.c,v 1.4 2020/07/25 22:36:06 riastradh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: aes_neon_impl.c,v 1.5 2020/10/10 08:24:10 jmcneill Exp $");
#include <sys/types.h>
#include <sys/proc.h>
@@ -200,10 +200,10 @@ aes_neon_probe(void)
return -1;
#endif
switch (__SHIFTOUT(id->ac_aa64pfr0, ID_AA64PFR0_EL1_ADVSIMD)) {
- case ID_AA64PFR0_EL1_ADV_SIMD_IMPL:
- break;
- default:
+ case ID_AA64PFR0_EL1_ADV_SIMD_NONE:
return -1;
+ default:
+ break;
}
#else
#ifdef _KERNEL
Index: src/sys/crypto/chacha/arch/arm/chacha_neon_impl.c
diff -u src/sys/crypto/chacha/arch/arm/chacha_neon_impl.c:1.1 src/sys/crypto/chacha/arch/arm/chacha_neon_impl.c:1.2
--- src/sys/crypto/chacha/arch/arm/chacha_neon_impl.c:1.1 Sat Jul 25 22:51:57 2020
+++ src/sys/crypto/chacha/arch/arm/chacha_neon_impl.c Sat Oct 10 08:24:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: chacha_neon_impl.c,v 1.1 2020/07/25 22:51:57 riastradh Exp $ */
+/* $NetBSD: chacha_neon_impl.c,v 1.2 2020/10/10 08:24:10 jmcneill Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: chacha_neon_impl.c,v 1.1 2020/07/25 22:51:57 riastradh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: chacha_neon_impl.c,v 1.2 2020/10/10 08:24:10 jmcneill Exp $");
#include "chacha_neon.h"
@@ -147,10 +147,10 @@ chacha_probe_neon(void)
return -1;
#endif
switch (__SHIFTOUT(id->ac_aa64pfr0, ID_AA64PFR0_EL1_ADVSIMD)) {
- case ID_AA64PFR0_EL1_ADV_SIMD_IMPL:
- break;
- default:
+ case ID_AA64PFR0_EL1_ADV_SIMD_NONE:
return -1;
+ default:
+ break;
}
#else
#ifdef _KERNEL
