Commit 0969402f authored by Czeslaw Zagorski's avatar Czeslaw Zagorski Committed by Jeff Kirsher
Browse files

i40e: Update visual effect for advertised FEC mode. 



Updates visual effect for advertised mode after setting desired mode.
The mode appears in advertised FEC mode correctly, when ethtool
interface command is called. Without this commit advertised FEC
is displayed regardless of the settings as "None BaseR RS".

Signed-off-by: default avatarCzeslaw Zagorski <czeslawx.zagorski@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 6db60322

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

+35 −28
Original line number Diff line number Diff line
@@ -710,6 +710,35 @@ static void i40e_phy_type_to_ethtool(struct i40e_pf *pf, 
	}

}



/**

 * i40e_get_settings_link_up_fec - Get the FEC mode encoding from mask

 * @req_fec_info: mask request FEC info

 * @ks: ethtool ksettings to fill in

 **/

static void i40e_get_settings_link_up_fec(u8 req_fec_info,

					  struct ethtool_link_ksettings *ks)

{

	ethtool_link_ksettings_add_link_mode(ks, supported, FEC_NONE);

	ethtool_link_ksettings_add_link_mode(ks, supported, FEC_RS);

	ethtool_link_ksettings_add_link_mode(ks, supported, FEC_BASER);



	if (I40E_AQ_SET_FEC_REQUEST_RS & req_fec_info) {

		ethtool_link_ksettings_add_link_mode(ks, advertising, FEC_RS);

	} else if (I40E_AQ_SET_FEC_REQUEST_KR & req_fec_info) {

		ethtool_link_ksettings_add_link_mode(ks, advertising,

						     FEC_BASER);

	} else {

		ethtool_link_ksettings_add_link_mode(ks, advertising,

						     FEC_NONE);

		if (I40E_AQ_SET_FEC_AUTO & req_fec_info) {

			ethtool_link_ksettings_add_link_mode(ks, advertising,

							     FEC_RS);

			ethtool_link_ksettings_add_link_mode(ks, advertising,

							     FEC_BASER);

		}

	}

}



/**

 * i40e_get_settings_link_up - Get the Link settings for when link is up

 * @hw: hw structure
@@ -769,13 +798,7 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, 
						     25000baseSR_Full);

		ethtool_link_ksettings_add_link_mode(ks, advertising,

						     25000baseSR_Full);

		ethtool_link_ksettings_add_link_mode(ks, supported, FEC_NONE);

		ethtool_link_ksettings_add_link_mode(ks, supported, FEC_RS);

		ethtool_link_ksettings_add_link_mode(ks, supported, FEC_BASER);

		ethtool_link_ksettings_add_link_mode(ks, advertising, FEC_NONE);

		ethtool_link_ksettings_add_link_mode(ks, advertising, FEC_RS);

		ethtool_link_ksettings_add_link_mode(ks, advertising,

						     FEC_BASER);

		i40e_get_settings_link_up_fec(hw_link_info->req_fec_info, ks);

		ethtool_link_ksettings_add_link_mode(ks, supported,

						     10000baseSR_Full);

		ethtool_link_ksettings_add_link_mode(ks, advertising,
@@ -892,9 +915,6 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, 
						     40000baseKR4_Full);

		ethtool_link_ksettings_add_link_mode(ks, supported,

						     25000baseKR_Full);

		ethtool_link_ksettings_add_link_mode(ks, supported, FEC_NONE);

		ethtool_link_ksettings_add_link_mode(ks, supported, FEC_RS);

		ethtool_link_ksettings_add_link_mode(ks, supported, FEC_BASER);

		ethtool_link_ksettings_add_link_mode(ks, supported,

						     20000baseKR2_Full);

		ethtool_link_ksettings_add_link_mode(ks, supported,
@@ -908,10 +928,7 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, 
						     40000baseKR4_Full);

		ethtool_link_ksettings_add_link_mode(ks, advertising,

						     25000baseKR_Full);

		ethtool_link_ksettings_add_link_mode(ks, advertising, FEC_NONE);

		ethtool_link_ksettings_add_link_mode(ks, advertising, FEC_RS);

		ethtool_link_ksettings_add_link_mode(ks, advertising,

						     FEC_BASER);

		i40e_get_settings_link_up_fec(hw_link_info->req_fec_info, ks);

		ethtool_link_ksettings_add_link_mode(ks, advertising,

						     20000baseKR2_Full);

		ethtool_link_ksettings_add_link_mode(ks, advertising,
@@ -929,13 +946,8 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, 
						     25000baseCR_Full);

		ethtool_link_ksettings_add_link_mode(ks, advertising,

						     25000baseCR_Full);

		ethtool_link_ksettings_add_link_mode(ks, supported, FEC_NONE);

		ethtool_link_ksettings_add_link_mode(ks, supported, FEC_RS);

		ethtool_link_ksettings_add_link_mode(ks, supported, FEC_BASER);

		ethtool_link_ksettings_add_link_mode(ks, advertising, FEC_NONE);

		ethtool_link_ksettings_add_link_mode(ks, advertising, FEC_RS);

		ethtool_link_ksettings_add_link_mode(ks, advertising,

						     FEC_BASER);

		i40e_get_settings_link_up_fec(hw_link_info->req_fec_info, ks);



		break;

	case I40E_PHY_TYPE_25GBASE_AOC:

	case I40E_PHY_TYPE_25GBASE_ACC:
@@ -945,13 +957,8 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, 
						     25000baseCR_Full);

		ethtool_link_ksettings_add_link_mode(ks, advertising,

						     25000baseCR_Full);

		ethtool_link_ksettings_add_link_mode(ks, supported, FEC_NONE);

		ethtool_link_ksettings_add_link_mode(ks, supported, FEC_RS);

		ethtool_link_ksettings_add_link_mode(ks, supported, FEC_BASER);

		ethtool_link_ksettings_add_link_mode(ks, advertising, FEC_NONE);

		ethtool_link_ksettings_add_link_mode(ks, advertising, FEC_RS);

		ethtool_link_ksettings_add_link_mode(ks, advertising,

						     FEC_BASER);

		i40e_get_settings_link_up_fec(hw_link_info->req_fec_info, ks);



		ethtool_link_ksettings_add_link_mode(ks, supported,

						     10000baseCR_Full);

		ethtool_link_ksettings_add_link_mode(ks, advertising,

CRA Git | Maintained and supported by SUSTech CRA and CCSE