提交 569a5df8 编写于 作者: M Michael Chan 提交者: David S. Miller

[TG3]: Use constant for PHY register 0x1e.

Signed-off-by: NMichael Chan <mchan@broadcom.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 5129724a
...@@ -6594,8 +6594,9 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) ...@@ -6594,8 +6594,9 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
u32 tmp; u32 tmp;
/* Clear CRC stats. */ /* Clear CRC stats. */
if (!tg3_readphy(tp, 0x1e, &tmp)) { if (!tg3_readphy(tp, MII_TG3_TEST1, &tmp)) {
tg3_writephy(tp, 0x1e, tmp | 0x8000); tg3_writephy(tp, MII_TG3_TEST1,
tmp | MII_TG3_TEST1_CRC_EN);
tg3_readphy(tp, 0x14, &tmp); tg3_readphy(tp, 0x14, &tmp);
} }
} }
...@@ -7419,8 +7420,9 @@ static unsigned long calc_crc_errors(struct tg3 *tp) ...@@ -7419,8 +7420,9 @@ static unsigned long calc_crc_errors(struct tg3 *tp)
u32 val; u32 val;
spin_lock_bh(&tp->lock); spin_lock_bh(&tp->lock);
if (!tg3_readphy(tp, 0x1e, &val)) { if (!tg3_readphy(tp, MII_TG3_TEST1, &val)) {
tg3_writephy(tp, 0x1e, val | 0x8000); tg3_writephy(tp, MII_TG3_TEST1,
val | MII_TG3_TEST1_CRC_EN);
tg3_readphy(tp, 0x14, &val); tg3_readphy(tp, 0x14, &val);
} else } else
val = 0; val = 0;
......
...@@ -1660,6 +1660,7 @@ ...@@ -1660,6 +1660,7 @@
#define MII_TG3_TEST1 0x1e #define MII_TG3_TEST1 0x1e
#define MII_TG3_TEST1_TRIM_EN 0x0010 #define MII_TG3_TEST1_TRIM_EN 0x0010
#define MII_TG3_TEST1_CRC_EN 0x8000
/* There are two ways to manage the TX descriptors on the tigon3. /* There are two ways to manage the TX descriptors on the tigon3.
* Either the descriptors are in host DMA'able memory, or they * Either the descriptors are in host DMA'able memory, or they
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册