Commit 3903c023 authored by Guo-Fu Tseng's avatar Guo-Fu Tseng Committed by David S. Miller

jme: Fix hardware action of full-duplex

Clear Transmit Timer/Retry setting while full-duplex.
Signed-off-by: default avatarGuo-Fu Tseng <cooldavid@cooldavid.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 51754572
...@@ -439,16 +439,14 @@ jme_check_link(struct net_device *netdev, int testonly) ...@@ -439,16 +439,14 @@ jme_check_link(struct net_device *netdev, int testonly)
if (phylink & PHY_LINK_DUPLEX) { if (phylink & PHY_LINK_DUPLEX) {
jwrite32(jme, JME_TXMCS, TXMCS_DEFAULT); jwrite32(jme, JME_TXMCS, TXMCS_DEFAULT);
jwrite32(jme, JME_TXTRHD, TXTRHD_FULLDUPLEX);
ghc |= GHC_DPX; ghc |= GHC_DPX;
} else { } else {
jwrite32(jme, JME_TXMCS, TXMCS_DEFAULT | jwrite32(jme, JME_TXMCS, TXMCS_DEFAULT |
TXMCS_BACKOFF | TXMCS_BACKOFF |
TXMCS_CARRIERSENSE | TXMCS_CARRIERSENSE |
TXMCS_COLLISION); TXMCS_COLLISION);
jwrite32(jme, JME_TXTRHD, TXTRHD_TXPEN | jwrite32(jme, JME_TXTRHD, TXTRHD_HALFDUPLEX);
((0x2000 << TXTRHD_TXP_SHIFT) & TXTRHD_TXP) |
TXTRHD_TXREN |
((8 << TXTRHD_TXRL_SHIFT) & TXTRHD_TXRL));
} }
gpreg1 = GPREG1_DEFAULT; gpreg1 = GPREG1_DEFAULT;
......
...@@ -658,6 +658,14 @@ enum jme_txtrhd_shifts { ...@@ -658,6 +658,14 @@ enum jme_txtrhd_shifts {
TXTRHD_TXRL_SHIFT = 0, TXTRHD_TXRL_SHIFT = 0,
}; };
enum jme_txtrhd_values {
TXTRHD_FULLDUPLEX = 0x00000000,
TXTRHD_HALFDUPLEX = TXTRHD_TXPEN |
((0x2000 << TXTRHD_TXP_SHIFT) & TXTRHD_TXP) |
TXTRHD_TXREN |
((8 << TXTRHD_TXRL_SHIFT) & TXTRHD_TXRL),
};
/* /*
* RX Control/Status Bits * RX Control/Status Bits
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment