Commit 5cd349c3 authored by Paul Greenwalt's avatar Paul Greenwalt Committed by Tony Nguyen
Browse files

ice: report supported and advertised autoneg using PHY capabilities 



Ethtool incorrectly reported supported and advertised auto-negotiation
settings for a backplane PHY image which did not support auto-negotiation.
This can occur when using media or PHY type for reporting ethtool
supported and advertised auto-negotiation settings.

Remove setting supported and advertised auto-negotiation settings based
on PHY type in ice_phy_type_to_ethtool(), and MAC type in
ice_get_link_ksettings().

Ethtool supported and advertised auto-negotiation settings should be
based on the PHY image using the AQ command get PHY capabilities with
media. Add setting supported and advertised auto-negotiation settings
based get PHY capabilities with media in ice_get_link_ksettings().

Fixes: 48cb27f2 ("ice: Implement handlers for ethtool PHY/link operations")
Signed-off-by: default avatarPaul Greenwalt <paul.greenwalt@intel.com>
Tested-by: default avatarTony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent c7ee6ce1

drivers/net/ethernet/intel/ice/ice_ethtool.c

+6 −45
Original line number Diff line number Diff line
@@ -1773,49 +1773,6 @@ ice_phy_type_to_ethtool(struct net_device *netdev, 
		ice_ethtool_advertise_link_mode(ICE_AQ_LINK_SPEED_100GB,

						100000baseKR4_Full);

	}



	/* Autoneg PHY types */

	if (phy_types_low & ICE_PHY_TYPE_LOW_100BASE_TX ||

	    phy_types_low & ICE_PHY_TYPE_LOW_1000BASE_T ||

	    phy_types_low & ICE_PHY_TYPE_LOW_1000BASE_KX ||

	    phy_types_low & ICE_PHY_TYPE_LOW_2500BASE_T ||

	    phy_types_low & ICE_PHY_TYPE_LOW_2500BASE_KX ||

	    phy_types_low & ICE_PHY_TYPE_LOW_5GBASE_T ||

	    phy_types_low & ICE_PHY_TYPE_LOW_5GBASE_KR ||

	    phy_types_low & ICE_PHY_TYPE_LOW_10GBASE_T ||

	    phy_types_low & ICE_PHY_TYPE_LOW_10GBASE_KR_CR1 ||

	    phy_types_low & ICE_PHY_TYPE_LOW_25GBASE_T ||

	    phy_types_low & ICE_PHY_TYPE_LOW_25GBASE_CR ||

	    phy_types_low & ICE_PHY_TYPE_LOW_25GBASE_CR_S ||

	    phy_types_low & ICE_PHY_TYPE_LOW_25GBASE_CR1 ||

	    phy_types_low & ICE_PHY_TYPE_LOW_25GBASE_KR ||

	    phy_types_low & ICE_PHY_TYPE_LOW_25GBASE_KR_S ||

	    phy_types_low & ICE_PHY_TYPE_LOW_25GBASE_KR1 ||

	    phy_types_low & ICE_PHY_TYPE_LOW_40GBASE_CR4 ||

	    phy_types_low & ICE_PHY_TYPE_LOW_40GBASE_KR4) {

		ethtool_link_ksettings_add_link_mode(ks, supported,

						     Autoneg);

		ethtool_link_ksettings_add_link_mode(ks, advertising,

						     Autoneg);

	}

	if (phy_types_low & ICE_PHY_TYPE_LOW_50GBASE_CR2 ||

	    phy_types_low & ICE_PHY_TYPE_LOW_50GBASE_KR2 ||

	    phy_types_low & ICE_PHY_TYPE_LOW_50GBASE_CP ||

	    phy_types_low & ICE_PHY_TYPE_LOW_50GBASE_KR_PAM4) {

		ethtool_link_ksettings_add_link_mode(ks, supported,

						     Autoneg);

		ethtool_link_ksettings_add_link_mode(ks, advertising,

						     Autoneg);

	}

	if (phy_types_low & ICE_PHY_TYPE_LOW_100GBASE_CR4 ||

	    phy_types_low & ICE_PHY_TYPE_LOW_100GBASE_KR4 ||

	    phy_types_low & ICE_PHY_TYPE_LOW_100GBASE_KR_PAM4 ||

	    phy_types_low & ICE_PHY_TYPE_LOW_100GBASE_CP2) {

		ethtool_link_ksettings_add_link_mode(ks, supported,

						     Autoneg);

		ethtool_link_ksettings_add_link_mode(ks, advertising,

						     Autoneg);

	}

}



#define TEST_SET_BITS_TIMEOUT	50
@@ -1972,9 +1929,7 @@ ice_get_link_ksettings(struct net_device *netdev, 
		ks->base.port = PORT_TP;

		break;

	case ICE_MEDIA_BACKPLANE:

		ethtool_link_ksettings_add_link_mode(ks, supported, Autoneg);

		ethtool_link_ksettings_add_link_mode(ks, supported, Backplane);

		ethtool_link_ksettings_add_link_mode(ks, advertising, Autoneg);

		ethtool_link_ksettings_add_link_mode(ks, advertising,

						     Backplane);

		ks->base.port = PORT_NONE;
@@ -2049,6 +2004,12 @@ ice_get_link_ksettings(struct net_device *netdev, 
	if (caps->link_fec_options & ICE_AQC_PHY_FEC_25G_RS_CLAUSE91_EN)

		ethtool_link_ksettings_add_link_mode(ks, supported, FEC_RS);



	/* Set supported and advertised autoneg */

	if (ice_is_phy_caps_an_enabled(caps)) {

		ethtool_link_ksettings_add_link_mode(ks, supported, Autoneg);

		ethtool_link_ksettings_add_link_mode(ks, advertising, Autoneg);

	}



done:

	kfree(caps);

	return err;