Date: Tue, 20 Oct 2015 01:46:15 +0000 (UTC) From: "Conrad E. Meyer" <cem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r289611 - head/sys/dev/ntb/ntb_hw Message-ID: <201510200146.t9K1kF9O027501@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cem Date: Tue Oct 20 01:46:14 2015 New Revision: 289611 URL: https://svnweb.freebsd.org/changeset/base/289611 Log: NTB: MFV 5ae0beb6: Enable link for Intel root port mode in probe We skip actually bringing up Rootport/Transparent configurations, so most of this doesn't apply. Original Linux commit log: Link training should be enabled in the driver probe for root port mode. We should not have to wait for transport to be loaded for this to happen. Otherwise the ntb device will not show up on the transparent bridge side of the link. Authored by: Dave Jiang Obtained from: Linux (Dual BSD/GPL driver) Sponsored by: EMC / Isilon Storage Division 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 Tue Oct 20 01:46:05 2015 (r289610) +++ head/sys/dev/ntb/ntb_hw/ntb_hw.c Tue Oct 20 01:46:14 2015 (r289611) @@ -1481,8 +1481,11 @@ static inline bool link_is_up(struct ntb_softc *ntb) { - if (ntb->type == NTB_XEON) + if (ntb->type == NTB_XEON) { + if (ntb->conn_type == NTB_CONN_TRANSPARENT) + return (true); return ((ntb->lnk_sta & NTB_LINK_STATUS_ACTIVE) != 0); + } KASSERT(ntb->type == NTB_SOC, ("ntb type")); return ((ntb->ntb_ctl & SOC_CNTL_LINK_DOWN) == 0);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510200146.t9K1kF9O027501>