Author: mav
Date: Thu Aug 18 11:09:43 2016
New Revision: 304410
URL: https://svnweb.freebsd.org/changeset/base/304410
Log:
MFC r303561: Wrap previous MSIX workaround into #ifndef EARLY_AP_STARTUP.
With EARLY_AP_STARTUP we can successfully negotiate MSIX earlier.
Modified:
stable/10/sys/dev/ntb/ntb_hw/ntb_hw.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/ntb/ntb_hw/ntb_hw.c
==============================================================================
--- stable/10/sys/dev/ntb/ntb_hw/ntb_hw.c Thu Aug 18 11:03:21 2016
(r304409)
+++ stable/10/sys/dev/ntb/ntb_hw/ntb_hw.c Thu Aug 18 11:09:43 2016
(r304410)
@@ -2625,6 +2625,7 @@ intel_ntb_user_mw_to_idx(struct ntb_soft
return (uidx);
}
+#ifndef EARLY_AP_STARTUP
static int msix_ready;
static void
@@ -2635,6 +2636,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)
@@ -2650,9 +2652,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++) {
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
