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

Commit 2b642ca5 authored by Emil Tantilov's avatar Emil Tantilov Committed by Jeff Kirsher
Browse files

ixgbe: fix setting and reporting of advertised speeds 



Add the ability to set 100/F on x540.
Fix reporting of advertised modes by adding check for phy.autoneg_advertised

Signed-off-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
Tested-by: default avatarStephen Ko <stephen.s.ko@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent da74cd4a

drivers/net/ixgbe/ixgbe_ethtool.c

+20 −21
Original line number Diff line number Diff line
@@ -161,29 +161,25 @@ static int ixgbe_get_settings(struct net_device *netdev, 
		}



		ecmd->advertising = ADVERTISED_Autoneg;

		if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_100_FULL)

		if (hw->phy.autoneg_advertised) {

			if (hw->phy.autoneg_advertised &

			    IXGBE_LINK_SPEED_100_FULL)

				ecmd->advertising |= ADVERTISED_100baseT_Full;

		if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_10GB_FULL)

			if (hw->phy.autoneg_advertised &

			    IXGBE_LINK_SPEED_10GB_FULL)

				ecmd->advertising |= ADVERTISED_10000baseT_Full;

		if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_1GB_FULL)

			if (hw->phy.autoneg_advertised &

			    IXGBE_LINK_SPEED_1GB_FULL)

				ecmd->advertising |= ADVERTISED_1000baseT_Full;

		} else {

			/*

		 * It's possible that phy.autoneg_advertised may not be

		 * set yet.  If so display what the default would be -

		 * both 1G and 10G supported.

			 * Default advertised modes in case

			 * phy.autoneg_advertised isn't set.

			 */

		if (!(ecmd->advertising & (ADVERTISED_1000baseT_Full |

					   ADVERTISED_10000baseT_Full)))

			ecmd->advertising |= (ADVERTISED_10000baseT_Full |

					      ADVERTISED_1000baseT_Full);



		switch (hw->mac.type) {

		case ixgbe_mac_X540:

			if (!(ecmd->advertising & ADVERTISED_100baseT_Full))

				ecmd->advertising |= (ADVERTISED_100baseT_Full);

			break;

		default:

			break;

			if (hw->mac.type == ixgbe_mac_X540)

				ecmd->advertising |= ADVERTISED_100baseT_Full;

		}



		if (hw->phy.media_type == ixgbe_media_type_copper) {
@@ -336,6 +332,9 @@ static int ixgbe_set_settings(struct net_device *netdev, 
		if (ecmd->advertising & ADVERTISED_1000baseT_Full)

			advertised |= IXGBE_LINK_SPEED_1GB_FULL;



		if (ecmd->advertising & ADVERTISED_100baseT_Full)

			advertised |= IXGBE_LINK_SPEED_100_FULL;



		if (old == advertised)

			return err;

		/* this sets the link speed and restarts auto-neg */