svn commit: r355589 - head/sys/x86/x86

[Scott Long]

Author: scottl
Date: Tue Dec 10 18:57:39 2019
New Revision: 355589
URL: https://svnweb.freebsd.org/changeset/base/355589

Log:
  Fix the TAA state machine to do the right thing when the TAA
  migitation is available in microcode and the operator has set
  the sysctl to automatic mode.
  
  Reported by:	Coverity
  CID: 1408334
  
  MFC after:	3 days
  Sponsored by:	Intel

Modified:
  head/sys/x86/x86/cpu_machdep.c

Modified: head/sys/x86/x86/cpu_machdep.c
==============================================================================
--- head/sys/x86/x86/cpu_machdep.c	Tue Dec 10 18:50:50 2019	(r355588)
+++ head/sys/x86/x86/cpu_machdep.c	Tue Dec 10 18:57:39 2019	(r355589)
@@ -1254,8 +1254,7 @@ x86_taa_recalculate(void)
 	/* Check to see what mitigation options the CPU gives us */
 	if (cpu_ia32_arch_caps & IA32_ARCH_CAP_TAA_NO) {
 		/* CPU is not suseptible to TAA */
-		taa_need = TAA_NONE;
-		taa_state = TAA_TAA_UC;
+		taa_need = TAA_TAA_UC;
 	} else if (cpu_ia32_arch_caps & IA32_ARCH_CAP_TSX_CTRL) {
 		/*
 		 * CPU can turn off TSX.  This is the next best option