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

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

drivers/net/jme.c

+2 −4
Original line number Diff line number Diff line
@@ -439,16 +439,14 @@ jme_check_link(struct net_device *netdev, int testonly) 


		if (phylink & PHY_LINK_DUPLEX) {

			jwrite32(jme, JME_TXMCS, TXMCS_DEFAULT);

			jwrite32(jme, JME_TXTRHD, TXTRHD_FULLDUPLEX);

			ghc |= GHC_DPX;

		} else {

			jwrite32(jme, JME_TXMCS, TXMCS_DEFAULT |

						TXMCS_BACKOFF |

						TXMCS_CARRIERSENSE |

						TXMCS_COLLISION);

			jwrite32(jme, JME_TXTRHD, TXTRHD_TXPEN |

				((0x2000 << TXTRHD_TXP_SHIFT) & TXTRHD_TXP) |

				TXTRHD_TXREN |

				((8 << TXTRHD_TXRL_SHIFT) & TXTRHD_TXRL));

			jwrite32(jme, JME_TXTRHD, TXTRHD_HALFDUPLEX);

		}



		gpreg1 = GPREG1_DEFAULT;

drivers/net/jme.h

+8 −0
Original line number Diff line number Diff line
@@ -658,6 +658,14 @@ enum jme_txtrhd_shifts { 
	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

 */