mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 14:14:37 +00:00
jme: Fix hardware action of full-duplex
Clear Transmit Timer/Retry setting while full-duplex. Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
5175457237
commit
3903c02357
2 changed files with 10 additions and 4 deletions
|
@ -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 {
|
||||||
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
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in a new issue