From b6799dee301eea267675934a5ac89d56ce3c0349 Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Fri, 12 Feb 2010 14:47:12 +0000 Subject: [PATCH] --- yaml --- r: 184055 b: refs/heads/master c: 1061b7c56482310bbb8197045d51e2986afabfce h: refs/heads/master i: 184053: 17102422f7b1d5d806601b8bb47c08558bc56003 184051: 9599041466eb59a9a0e4525ad8b467d630ad1677 184047: ae6fc456195607e3f05fd52e4d604c28d8406a04 v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 8 ++++++-- trunk/drivers/net/tg3.h | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b0a7f0004bec..2763958c590b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c88734054e787542ea093b02120e324e92cad882 +refs/heads/master: 1061b7c56482310bbb8197045d51e2986afabfce diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index cb6967947c30..128126a87c34 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/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/trunk/drivers/net/tg3.h b/trunk/drivers/net/tg3.h index a8fb53aaf742..b4fd59623cfb 100644 --- a/trunk/drivers/net/tg3.h +++ b/trunk/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