svn commit: r304373 - stable/11/sys/dev/ntb/ntb_hw

[Alexander Motin]

Author: mav
Date: Thu Aug 18 09:39:45 2016
New Revision: 304373
URL: https://svnweb.freebsd.org/changeset/base/304373

Log:
  MFC r303554, r303561:
  Block MSIX negotiation until SMP started and IRQ reshuffled.

Modified:
  stable/11/sys/dev/ntb/ntb_hw/ntb_hw.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/ntb/ntb_hw/ntb_hw.c
==============================================================================
--- stable/11/sys/dev/ntb/ntb_hw/ntb_hw.c	Thu Aug 18 09:38:01 2016	(r304372)
+++ stable/11/sys/dev/ntb/ntb_hw/ntb_hw.c	Thu Aug 18 09:39:45 2016	(r304373)
@@ -2605,6 +2605,19 @@ intel_ntb_user_mw_to_idx(struct ntb_soft
 	return (uidx);
 }
 
+#ifndef EARLY_AP_STARTUP
+static int msix_ready;
+
+static void
+intel_ntb_msix_ready(void *arg __unused)
+{
+
+	msix_ready = 1;
+}
+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)
 {
@@ -2619,6 +2632,12 @@ 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++) {
 		intel_ntb_peer_spad_write(ntb->device, NTB_MSIX_DATA0 + i,