Author: mav
Date: Sat Jul 30 15:56:36 2016
New Revision: 303554
URL: https://svnweb.freebsd.org/changeset/base/303554

Log:
  Block MSIX negotiation until SMP started and IRQ reshuffled.

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 15:51:16 2016        
(r303553)
+++ head/sys/dev/ntb/ntb_hw/ntb_hw.c    Sat Jul 30 15:56:36 2016        
(r303554)
@@ -2605,6 +2605,17 @@ intel_ntb_user_mw_to_idx(struct ntb_soft
        return (uidx);
 }
 
+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);
+
 static void
 intel_ntb_exchange_msix(void *ctx)
 {
@@ -2619,6 +2630,10 @@ intel_ntb_exchange_msix(void *ctx)
        if (ntb->peer_msix_done)
                goto msix_done;
 
+       /* Block MSIX negotiation until SMP started and IRQ reshuffled. */
+       if (!msix_ready)
+               goto reschedule;
+
        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,
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to