Module Name: src
Committed By: riastradh
Date: Mon Jul 20 16:45:41 UTC 2020
Modified Files:
src/sys/arch/x86/x86: identcpu.c
Log Message:
Revert 1.112 "Disable x86 in-kernel AES temporarily."
The bug in fpu_kern_enter motivating this appears to have been fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/x86/x86/identcpu.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/arch/x86/x86/identcpu.c
diff -u src/sys/arch/x86/x86/identcpu.c:1.112 src/sys/arch/x86/x86/identcpu.c:1.113
--- src/sys/arch/x86/x86/identcpu.c:1.112 Mon Jul 20 15:11:29 2020
+++ src/sys/arch/x86/x86/identcpu.c Mon Jul 20 16:45:41 2020
@@ -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 @@ cpu_probe(struct cpu_info *ci)
* 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 {
/*
