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

Commit 1dc0eb75 authored by Tony Nguyen's avatar Tony Nguyen Committed by Jeff Kirsher
Browse files

ixgbe: Support 2.5Gb and 5Gb speed 



Though not advertised through ethtool, if the link partner advertises a
2.5Gb or 5Gb connection, and the adapter supports it, allow the speed to be
used.

Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: default avatarKrishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent b973154a

drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c

+3 −0
Original line number Diff line number Diff line
@@ -340,6 +340,9 @@ static int ixgbe_get_settings(struct net_device *netdev, 
		case IXGBE_LINK_SPEED_10GB_FULL:

			ethtool_cmd_speed_set(ecmd, SPEED_10000);

			break;

		case IXGBE_LINK_SPEED_5GB_FULL:

			ethtool_cmd_speed_set(ecmd, SPEED_5000);

			break;

		case IXGBE_LINK_SPEED_2_5GB_FULL:

			ethtool_cmd_speed_set(ecmd, SPEED_2500);

			break;

drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c

+7 −3
Original line number Diff line number Diff line
@@ -768,9 +768,7 @@ s32 ixgbe_setup_phy_link_speed_generic(struct ixgbe_hw *hw, 
				       ixgbe_link_speed speed,

				       bool autoneg_wait_to_complete)

{



	/*

	 * Clear autoneg_advertised and set new values based on input link

	/* Clear autoneg_advertised and set new values based on input link

	 * speed.

	 */

	hw->phy.autoneg_advertised = 0;
@@ -778,6 +776,12 @@ s32 ixgbe_setup_phy_link_speed_generic(struct ixgbe_hw *hw, 
	if (speed & IXGBE_LINK_SPEED_10GB_FULL)

		hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_10GB_FULL;



	if (speed & IXGBE_LINK_SPEED_5GB_FULL)

		hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_5GB_FULL;



	if (speed & IXGBE_LINK_SPEED_2_5GB_FULL)

		hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_2_5GB_FULL;



	if (speed & IXGBE_LINK_SPEED_1GB_FULL)

		hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_1GB_FULL;