Commit e4d4a272 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue 

Nguyen, Anthony L says:

====================
Intel Wired LAN Driver Updates 2021-05-07

This series contains updates to i40e driver only.

Magnus fixes XDP by adding and correcting checks that were caused by a
previous commit which introduced a new variable but did not account for
it in all paths.

Yunjian Wang adds a return in an error path to prevent reading a freed
pointer.

Jaroslaw forces link reset when changing FEC so that changes take
affect.

Mateusz fixes PHY types for 2.5G and 5G as there is a differentiation on
PHY identifiers based on operation.

Arkadiusz removes filtering of LLDP frames for software DCB as this is
preventing them from being properly transmitted.

* '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  i40e: Remove LLDP frame filters
  i40e: Fix PHY type identifiers for 2.5G and 5G adapters
  i40e: fix the restart auto-negotiation after FEC modified
  i40e: Fix use-after-free in i40e_client_subtask()
  i40e: fix broken XDP support
====================

Link: https://lore.kernel.org/r/20210507164151.2878147-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 7d18dbdd 8085a36d

drivers/net/ethernet/intel/i40e/i40e.h

+0 −1
Original line number Diff line number Diff line
@@ -1144,7 +1144,6 @@ static inline bool i40e_is_sw_dcb(struct i40e_pf *pf) 
	return !!(pf->flags & I40E_FLAG_DISABLE_FW_LLDP);

}



void i40e_set_lldp_forwarding(struct i40e_pf *pf, bool enable);

#ifdef CONFIG_I40E_DCB

void i40e_dcbnl_flush_apps(struct i40e_pf *pf,

			   struct i40e_dcbx_config *old_cfg,

drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h

+4 −2
Original line number Diff line number Diff line
@@ -1566,8 +1566,10 @@ enum i40e_aq_phy_type { 
	I40E_PHY_TYPE_25GBASE_LR		= 0x22,

	I40E_PHY_TYPE_25GBASE_AOC		= 0x23,

	I40E_PHY_TYPE_25GBASE_ACC		= 0x24,

	I40E_PHY_TYPE_2_5GBASE_T		= 0x30,

	I40E_PHY_TYPE_5GBASE_T			= 0x31,

	I40E_PHY_TYPE_2_5GBASE_T		= 0x26,

	I40E_PHY_TYPE_5GBASE_T			= 0x27,

	I40E_PHY_TYPE_2_5GBASE_T_LINK_STATUS	= 0x30,

	I40E_PHY_TYPE_5GBASE_T_LINK_STATUS	= 0x31,

	I40E_PHY_TYPE_MAX,

	I40E_PHY_TYPE_NOT_SUPPORTED_HIGH_TEMP	= 0xFD,

	I40E_PHY_TYPE_EMPTY			= 0xFE,

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

+1 −0
Original line number Diff line number Diff line
@@ -375,6 +375,7 @@ void i40e_client_subtask(struct i40e_pf *pf) 
				clear_bit(__I40E_CLIENT_INSTANCE_OPENED,

					  &cdev->state);

				i40e_client_del_instance(pf);

				return;

			}

		}

	}

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

+2 −2
Original line number Diff line number Diff line
@@ -1154,8 +1154,8 @@ static enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw) 
		break;

	case I40E_PHY_TYPE_100BASE_TX:

	case I40E_PHY_TYPE_1000BASE_T:

	case I40E_PHY_TYPE_2_5GBASE_T:

	case I40E_PHY_TYPE_5GBASE_T:

	case I40E_PHY_TYPE_2_5GBASE_T_LINK_STATUS:

	case I40E_PHY_TYPE_5GBASE_T_LINK_STATUS:

	case I40E_PHY_TYPE_10GBASE_T:

		media = I40E_MEDIA_TYPE_BASET;

		break;

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

+4 −4
Original line number Diff line number Diff line
@@ -841,8 +841,8 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, 
							     10000baseT_Full);

		break;

	case I40E_PHY_TYPE_10GBASE_T:

	case I40E_PHY_TYPE_5GBASE_T:

	case I40E_PHY_TYPE_2_5GBASE_T:

	case I40E_PHY_TYPE_5GBASE_T_LINK_STATUS:

	case I40E_PHY_TYPE_2_5GBASE_T_LINK_STATUS:

	case I40E_PHY_TYPE_1000BASE_T:

	case I40E_PHY_TYPE_100BASE_TX:

		ethtool_link_ksettings_add_link_mode(ks, supported, Autoneg);
@@ -1409,7 +1409,8 @@ static int i40e_set_fec_cfg(struct net_device *netdev, u8 fec_cfg) 


		memset(&config, 0, sizeof(config));

		config.phy_type = abilities.phy_type;

		config.abilities = abilities.abilities;

		config.abilities = abilities.abilities |

				   I40E_AQ_PHY_ENABLE_ATOMIC_LINK;

		config.phy_type_ext = abilities.phy_type_ext;

		config.link_speed = abilities.link_speed;

		config.eee_capability = abilities.eee_capability;
@@ -5281,7 +5282,6 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags) 
			i40e_aq_cfg_lldp_mib_change_event(&pf->hw, false, NULL);

			i40e_aq_stop_lldp(&pf->hw, true, false, NULL);

		} else {

			i40e_set_lldp_forwarding(pf, false);

			status = i40e_aq_start_lldp(&pf->hw, false, NULL);

			if (status) {

				adq_err = pf->hw.aq.asq_last_status;