[src/trunk]: src/sys/arch/x86/x86 Revert 1.112 "Disable x86 in-kernel AES tem...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/49005b7ecd5a
branches:  trunk
changeset: 936182:49005b7ecd5a
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Jul 20 16:45:41 2020 +0000

description:
Revert 1.112 "Disable x86 in-kernel AES temporarily."

The bug in fpu_kern_enter motivating this appears to have been fixed.

diffstat:

 sys/arch/x86/x86/identcpu.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r 692dcb3555ee -r 49005b7ecd5a sys/arch/x86/x86/identcpu.c
--- a/sys/arch/x86/x86/identcpu.c       Mon Jul 20 16:43:03 2020 +0000
+++ b/sys/arch/x86/x86/identcpu.c       Mon Jul 20 16:45:41 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: identcpu.c,v 1.112 2020/07/20 15:11:29 riastradh Exp $ */
+/*     $NetBSD: identcpu.c,v 1.113 2020/07/20 16:45:41 riastradh Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.112 2020/07/20 15:11:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.113 2020/07/20 16:45:41 riastradh Exp $");
 
 #include "opt_xen.h"
 
@@ -1007,17 +1007,17 @@
                 * disabled temporarily while we diagnose the bug.
                 */
 #ifdef __x86_64__      /* not yet implemented on i386 */
-               if (0 & cpu_feature[1] & CPUID2_AES)
+               if (cpu_feature[1] & CPUID2_AES)
                        aes_md_init(&aes_ni_impl);
                else
 #endif
-               if (0 & cpu_feature[4] & CPUID_VIA_HAS_ACE)
+               if (cpu_feature[4] & CPUID_VIA_HAS_ACE)
                        aes_md_init(&aes_via_impl);
-               else if (0 & i386_has_sse && i386_has_sse2 &&
+               else if (i386_has_sse && i386_has_sse2 &&
                    (cpu_feature[1] & CPUID2_SSE3) &&
                    (cpu_feature[1] & CPUID2_SSSE3))
                        aes_md_init(&aes_ssse3_impl);
-               else if (0 & i386_has_sse && i386_has_sse2)
+               else if (i386_has_sse && i386_has_sse2)
                        aes_md_init(&aes_sse2_impl);
        } else {
                /*