svn commit: r309483 - stable/11/sys/x86/x86

[Konstantin Belousov]

Author: kib
Date: Sat Dec  3 17:10:04 2016
New Revision: 309483
URL: https://svnweb.freebsd.org/changeset/base/309483

Log:
  MFC r309189:
  Fix automatic eventtimer hardware selection when ARAT is not implemented,
  and do not ignore TSCDLT.

Modified:
  stable/11/sys/x86/x86/local_apic.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/x86/x86/local_apic.c
==============================================================================
--- stable/11/sys/x86/x86/local_apic.c	Sat Dec  3 16:52:40 2016	(r309482)
+++ stable/11/sys/x86/x86/local_apic.c	Sat Dec  3 17:10:04 2016	(r309483)
@@ -478,8 +478,9 @@ native_lapic_init(vm_paddr_t addr)
 		lapic_et.et_quality = 600;
 		if (!arat) {
 			lapic_et.et_flags |= ET_FLAGS_C3STOP;
-			lapic_et.et_quality -= 200;
-		} else if ((cpu_feature & CPUID_TSC) != 0 &&
+			lapic_et.et_quality = 100;
+		}
+		if ((cpu_feature & CPUID_TSC) != 0 &&
 		    (cpu_feature2 & CPUID2_TSCDLT) != 0 &&
 		    tsc_is_invariant && tsc_freq != 0) {
 			lapic_timer_tsc_deadline = 1;