From owner-svn-src-all@freebsd.org  Sat Jul 30 21:07:00 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C284ABA91B0;
 Sat, 30 Jul 2016 21:07:00 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 914851A86;
 Sat, 30 Jul 2016 21:07:00 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6UL6xcS008012;
 Sat, 30 Jul 2016 21:06:59 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6UL6x9Z008011;
 Sat, 30 Jul 2016 21:06:59 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201607302106.u6UL6x9Z008011@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 30 Jul 2016 21:06:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r303561 - head/sys/dev/ntb/ntb_hw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jul 2016 21:07:00 -0000

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++) {