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

Commit 4e8186b6 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

e1000e: implement MDI/MDI-X control 



Some users report issues with link failing when connected to certain
switches.  This gives the user the ability to control the MDI state
from the driver, allowing users to work around some improperly
behaving switches.

Forcing in this driver is for now only allowed when auto-neg is
enabled.

This is in regards to the related ethtool app patch and
bugzilla.kernel.org bug 11998

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
CC: bruce.w.allan@intel.com
CC: n.poppelier@xs4all.nl
CC: bastien@durel.org
CC: jsveiga@it.eng.br
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent c819bbd5

drivers/net/ethernet/intel/e1000e/ethtool.c

+39 −2
Original line number Diff line number Diff line
@@ -199,6 +199,11 @@ static int e1000_get_settings(struct net_device *netdev, 
	else

		ecmd->eth_tp_mdix = ETH_TP_MDI_INVALID;



	if (hw->phy.mdix == AUTO_ALL_MODES)

		ecmd->eth_tp_mdix_ctrl = ETH_TP_MDI_AUTO;

	else

		ecmd->eth_tp_mdix_ctrl = hw->phy.mdix;



	return 0;

}
@@ -241,6 +246,10 @@ static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u32 spd, u8 dplx) 
	default:

		goto err_inval;

	}



	/* clear MDI, MDI(-X) override is only allowed when autoneg enabled */

	adapter->hw.phy.mdix = AUTO_ALL_MODES;



	return 0;



err_inval:
@@ -264,6 +273,22 @@ static int e1000_set_settings(struct net_device *netdev, 
		return -EINVAL;

	}



	/*

	 * MDI setting is only allowed when autoneg enabled because

	 * some hardware doesn't allow MDI setting when speed or

	 * duplex is forced.

	 */

	if (ecmd->eth_tp_mdix_ctrl) {

		if (hw->phy.media_type != e1000_media_type_copper)

			return -EOPNOTSUPP;



		if ((ecmd->eth_tp_mdix_ctrl != ETH_TP_MDI_AUTO) &&

		    (ecmd->autoneg != AUTONEG_ENABLE)) {

			e_err("forcing MDI/MDI-X state is not supported when link speed and/or duplex are forced\n");

			return -EINVAL;

		}

	}



	while (test_and_set_bit(__E1000_RESETTING, &adapter->state))

		usleep_range(1000, 2000);
@@ -282,20 +307,32 @@ static int e1000_set_settings(struct net_device *netdev, 
			hw->fc.requested_mode = e1000_fc_default;

	} else {

		u32 speed = ethtool_cmd_speed(ecmd);

		/* calling this overrides forced MDI setting */

		if (e1000_set_spd_dplx(adapter, speed, ecmd->duplex)) {

			clear_bit(__E1000_RESETTING, &adapter->state);

			return -EINVAL;

		}

	}



	/* MDI-X => 2; MDI => 1; Auto => 3 */

	if (ecmd->eth_tp_mdix_ctrl) {

		/*

		 * fix up the value for auto (3 => 0) as zero is mapped

		 * internally to auto

		 */

		if (ecmd->eth_tp_mdix_ctrl == ETH_TP_MDI_AUTO)

			hw->phy.mdix = AUTO_ALL_MODES;

		else

			hw->phy.mdix = ecmd->eth_tp_mdix_ctrl;

	}



	/* reset the link */



	if (netif_running(adapter->netdev)) {

		e1000e_down(adapter);

		e1000e_up(adapter);

	} else {

	} else

		e1000e_reset(adapter);

	}



	clear_bit(__E1000_RESETTING, &adapter->state);

	return 0;