Date: Tue, 20 Oct 2015 01:45:57 +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: r289609 - head/sys/dev/ntb/ntb_hw Message-ID: <201510200145.t9K1jv0h027375@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cem Date: Tue Oct 20 01:45:57 2015 New Revision: 289609 URL: https://svnweb.freebsd.org/changeset/base/289609 Log: NTB: Pull copy of soc_link_is_err out of recover_soc_link 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:45:48 2015 (r289608) +++ head/sys/dev/ntb/ntb_hw/ntb_hw.c Tue Oct 20 01:45:57 2015 (r289609) @@ -1759,12 +1759,7 @@ recover_soc_link(void *arg) status32 = arc4random() % SOC_LINK_RECOVERY_TIME; pause("Link", (SOC_LINK_RECOVERY_TIME + status32) * hz / 1000); - status32 = ntb_reg_read(4, SOC_LTSSMSTATEJMP_OFFSET); - if ((status32 & SOC_LTSSMSTATEJMP_FORCEDETECT) != 0) - goto retry; - - status32 = ntb_reg_read(4, SOC_IBSTERRRCRVSTS0_OFFSET); - if ((status32 & SOC_IBIST_ERR_OFLOW) != 0) + if (soc_link_is_err(ntb)) goto retry; status32 = ntb_reg_read(4, ntb->reg->ntb_ctl);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510200145.t9K1jv0h027375>