2 files changed, 9 insertions, 2 deletions

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index cb6967947c30..128126a87c34 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -10822,8 +10822,12 @@ static int tg3_run_loopback(struct tg3 *tp, int loopback_mode)
 
                 mac_mode = tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK;
                 if (tp->tg3_flags3 & TG3_FLG3_PHY_IS_FET) {
-                        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
-                                tg3_writephy(tp, MII_TG3_FET_PTEST, 0x1800);
+                        tg3_writephy(tp, MII_TG3_FET_PTEST,
+                                     MII_TG3_FET_PTEST_FRC_TX_LINK |
+                                     MII_TG3_FET_PTEST_FRC_TX_LOCK);
+                        /* The write needs to be flushed for the AC131 */
+                        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5785)
+                                tg3_readphy(tp, MII_TG3_FET_PTEST, &val);
                         mac_mode |= MAC_MODE_PORT_MODE_MII;
                 } else
                         mac_mode |= MAC_MODE_PORT_MODE_GMII;
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index a8fb53aaf742..b4fd59623cfb 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2112,6 +2112,9 @@
 
 /* Fast Ethernet Tranceiver definitions */
 #define MII_TG3_FET_PTEST               0x17
+#define  MII_TG3_FET_PTEST_FRC_TX_LINK  0x1000
+#define  MII_TG3_FET_PTEST_FRC_TX_LOCK  0x0800
+
 #define MII_TG3_FET_TEST                0x1f
 #define  MII_TG3_FET_SHADOW_EN          0x0080