Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/crypto Fix detection of NEON features. ID_AA64PFR0_EL1_A...



details:   https://anonhg.NetBSD.org/src/rev/9f8bcf6f60f5
branches:  trunk
changeset: 955735:9f8bcf6f60f5
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Oct 10 08:24:10 2020 +0000

description:
Fix detection of NEON features. ID_AA64PFR0_EL1_ADV_SIMD_NONE means SIMD
is not available, and any other value means it is.

diffstat:

 sys/crypto/aes/arch/arm/aes_neon_impl.c       |  10 +++++-----
 sys/crypto/chacha/arch/arm/chacha_neon_impl.c |  10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (64 lines):

diff -r 0c357616214e -r 9f8bcf6f60f5 sys/crypto/aes/arch/arm/aes_neon_impl.c
--- a/sys/crypto/aes/arch/arm/aes_neon_impl.c   Sat Oct 10 08:22:57 2020 +0000
+++ b/sys/crypto/aes/arch/arm/aes_neon_impl.c   Sat Oct 10 08:24:10 2020 +0000
@@ -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 @@
                return -1;
 #endif
        switch (__SHIFTOUT(id->ac_aa64pfr0, ID_AA64PFR0_EL1_ADVSIMD)) {
-       case ID_AA64PFR0_EL1_ADV_SIMD_IMPL:
+       case ID_AA64PFR0_EL1_ADV_SIMD_NONE:
+               return -1;
+       default:
                break;
-       default:
-               return -1;
        }
 #else
 #ifdef _KERNEL
diff -r 0c357616214e -r 9f8bcf6f60f5 sys/crypto/chacha/arch/arm/chacha_neon_impl.c
--- a/sys/crypto/chacha/arch/arm/chacha_neon_impl.c     Sat Oct 10 08:22:57 2020 +0000
+++ b/sys/crypto/chacha/arch/arm/chacha_neon_impl.c     Sat Oct 10 08:24:10 2020 +0000
@@ -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 @@
                return -1;
 #endif
        switch (__SHIFTOUT(id->ac_aa64pfr0, ID_AA64PFR0_EL1_ADVSIMD)) {
-       case ID_AA64PFR0_EL1_ADV_SIMD_IMPL:
+       case ID_AA64PFR0_EL1_ADV_SIMD_NONE:
+               return -1;
+       default:
                break;
-       default:
-               return -1;
        }
 #else
 #ifdef _KERNEL



Home | Main Index | Thread Index | Old Index