Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 369d742d authored by Auke Kok's avatar Auke Kok Committed by Jeff Garzik
Browse files

e1000e: don't poke PHY registers to retreive link status 



Apparently poking the link status registers when autonegotiation
is running on the PHY might botch the PHY link on 80003es2lan
devices. While this is a very rare condition we can completely
avoid it alltogether by just using the MAC link bits to provide
the proper information to ethtool.

Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent e265522c

drivers/net/e1000e/ethtool.c

+21 −10
Original line number Original line Diff line number Diff line
@@ -110,6 +110,7 @@ static int e1000_get_settings(struct net_device *netdev, 
{

{

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_hw *hw = &adapter->hw;

	struct e1000_hw *hw = &adapter->hw;

	u32 status;





	if (hw->media_type == e1000_media_type_copper) {

	if (hw->media_type == e1000_media_type_copper) {
@@ -147,16 +148,16 @@ static int e1000_get_settings(struct net_device *netdev, 
		ecmd->transceiver = XCVR_EXTERNAL;

		ecmd->transceiver = XCVR_EXTERNAL;

	}

	}





	if (er32(STATUS) & E1000_STATUS_LU) {

	status = er32(STATUS);



	if (status & E1000_STATUS_LU) {

		adapter->hw.mac.ops.get_link_up_info(hw, &adapter->link_speed,

		if (status & E1000_STATUS_SPEED_1000)

						  &adapter->link_duplex);

			ecmd->speed = 1000;

		ecmd->speed = adapter->link_speed;

		else if (status & E1000_STATUS_SPEED_100)



			ecmd->speed = 100;

		/* unfortunately FULL_DUPLEX != DUPLEX_FULL

		else

		 *	  and HALF_DUPLEX != DUPLEX_HALF */

			ecmd->speed = 10;





		if (adapter->link_duplex == FULL_DUPLEX)

		if (status & E1000_STATUS_FD)

			ecmd->duplex = DUPLEX_FULL;

			ecmd->duplex = DUPLEX_FULL;

		else

		else

			ecmd->duplex = DUPLEX_HALF;

			ecmd->duplex = DUPLEX_HALF;
@@ -170,6 +171,16 @@ static int e1000_get_settings(struct net_device *netdev, 
	return 0;

	return 0;

}

}





static u32 e1000_get_link(struct net_device *netdev)

{

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_hw *hw = &adapter->hw;

	u32 status;

	

	status = er32(STATUS);

	return (status & E1000_STATUS_LU);

}



static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx)

static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx)

{

{

	struct e1000_mac_info *mac = &adapter->hw.mac;

	struct e1000_mac_info *mac = &adapter->hw.mac;
@@ -1751,7 +1762,7 @@ static const struct ethtool_ops e1000_ethtool_ops = { 
	.get_msglevel		= e1000_get_msglevel,

	.get_msglevel		= e1000_get_msglevel,

	.set_msglevel		= e1000_set_msglevel,

	.set_msglevel		= e1000_set_msglevel,

	.nway_reset		= e1000_nway_reset,

	.nway_reset		= e1000_nway_reset,

	.get_link		= ethtool_op_get_link,

	.get_link		= e1000_get_link,

	.get_eeprom_len		= e1000_get_eeprom_len,

	.get_eeprom_len		= e1000_get_eeprom_len,

	.get_eeprom		= e1000_get_eeprom,

	.get_eeprom		= e1000_get_eeprom,

	.set_eeprom		= e1000_set_eeprom,

	.set_eeprom		= e1000_set_eeprom,