Date: Thu, 18 Aug 2016 11:03:21 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r304409 - stable/10/sys/dev/ntb/ntb_hw Message-ID: <201608181103.u7IB3LXr034950@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Thu Aug 18 11:03:21 2016 New Revision: 304409 URL: https://svnweb.freebsd.org/changeset/base/304409 Log: MFC r303554: Block MSIX negotiation until SMP started and IRQ reshuffled. 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:02:42 2016 (r304408) +++ stable/10/sys/dev/ntb/ntb_hw/ntb_hw.c Thu Aug 18 11:03:21 2016 (r304409) @@ -2625,6 +2625,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) { @@ -2639,6 +2650,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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608181103.u7IB3LXr034950>