svn commit: r303561 - head/sys/dev/ntb/ntb_hw

[Alexander Motin]

Author: mav
Date: Sat Jul 30 21:06:59 2016
New Revision: 303561
URL: https://svnweb.freebsd.org/changeset/base/303561

Log:
  Wrap previous MSIX workaround into #ifndef EARLY_AP_STARTUP.
  
  With EARLY_AP_STARTUP we can successfully negotiate MSIX earlier.
  
  Requested by:	jhb@

Modified:
  head/sys/dev/ntb/ntb_hw/ntb_hw.c

Modified: head/sys/dev/ntb/ntb_hw/ntb_hw.c
==============================================================================
--- head/sys/dev/ntb/ntb_hw/ntb_hw.c	Sat Jul 30 20:39:39 2016	(r303560)
+++ head/sys/dev/ntb/ntb_hw/ntb_hw.c	Sat Jul 30 21:06:59 2016	(r303561)
@@ -2605,6 +2605,7 @@ intel_ntb_user_mw_to_idx(struct ntb_soft
 	return (uidx);
 }
 
+#ifndef EARLY_AP_STARTUP
 static int msix_ready;
 
 static void
@@ -2615,6 +2616,7 @@ intel_ntb_msix_ready(void *arg __unused)
 }
 SYSINIT(intel_ntb_msix_ready, SI_SUB_SMP, SI_ORDER_ANY,
     intel_ntb_msix_ready, NULL);
+#endif
 
 static void
 intel_ntb_exchange_msix(void *ctx)
@@ -2630,9 +2632,11 @@ intel_ntb_exchange_msix(void *ctx)
 	if (ntb->peer_msix_done)
 		goto msix_done;
 
+#ifndef EARLY_AP_STARTUP
 	/* Block MSIX negotiation until SMP started and IRQ reshuffled. */
 	if (!msix_ready)
 		goto reschedule;
+#endif
 
 	intel_ntb_get_msix_info(ntb);
 	for (i = 0; i < XEON_NONLINK_DB_MSIX_BITS; i++) {