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

[Konstantin Belousov]

Author: kib
Date: Thu May 26 09:09:11 2016
New Revision: 300722
URL: https://svnweb.freebsd.org/changeset/base/300722

Log:
  Only calibrate ICR read loop when not in x2APIC mode.  Run-time
  switching between LAPIC modes is not supported, and there is no need
  to wait for IPI ack in x2APIC mode.  So the calibrated delay is only
  needed for !x2APIC.
  
  This saves around a second of boot time on the real hardware for
  x2APIC.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: head/sys/x86/x86/local_apic.c
==============================================================================
--- head/sys/x86/x86/local_apic.c	Thu May 26 09:04:14 2016	(r300721)
+++ head/sys/x86/x86/local_apic.c	Thu May 26 09:09:11 2016	(r300722)
@@ -525,19 +525,21 @@ native_lapic_init(vm_paddr_t addr)
 	 */
 	KASSERT((cpu_feature & CPUID_TSC) != 0 && tsc_freq != 0,
 	    ("TSC not initialized"));
-	r = rdtsc();
-	for (rx = 0; rx < LOOPS; rx++) {
-		(void)lapic_read_icr_lo();
-		ia32_pause();
-	}
-	r = rdtsc() - r;
-	r1 = tsc_freq * LOOPS;
-	r2 = r * 1000000;
-	lapic_ipi_wait_mult = r1 >= r2 ? r1 / r2 : 1;
-	if (bootverbose) {
-		printf("LAPIC: ipi_wait() us multiplier %ju (r %ju tsc %ju)\n",
-		    (uintmax_t)lapic_ipi_wait_mult, (uintmax_t)r,
-		    (uintmax_t)tsc_freq);
+	if (!x2apic_mode) {
+		r = rdtsc();
+		for (rx = 0; rx < LOOPS; rx++) {
+			(void)lapic_read_icr_lo();
+			ia32_pause();
+		}
+		r = rdtsc() - r;
+		r1 = tsc_freq * LOOPS;
+		r2 = r * 1000000;
+		lapic_ipi_wait_mult = r1 >= r2 ? r1 / r2 : 1;
+		if (bootverbose) {
+			printf("LAPIC: ipi_wait() us multiplier %ju (r %ju "
+			    "tsc %ju)\n", (uintmax_t)lapic_ipi_wait_mult,
+			    (uintmax_t)r, (uintmax_t)tsc_freq);
+		}
 	}
 #undef LOOPS
 #endif /* SMP */