NTB: Pull copy of soc_link_is_err out of recover_soc_link

Sponsored by:	EMC / Isilon Storage Division

diff --git a/sys/dev/ntb/ntb_hw/ntb_hw.c b/sys/dev/ntb/ntb_hw/ntb_hw.c
index e6bafd8ec92d683add1364352bccbf9f12357099..1f9ccc6f5b259dc369255743f594d85c7b8ee036 100644 (file)
--- a/sys/dev/ntb/ntb_hw/ntb_hw.c
+++ b/sys/dev/ntb/ntb_hw/ntb_hw.c
@@ -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);