Commit 1799c1b8 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 

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2022-12-05 (i40e)

Michal clears XPS init flag on reset to allow for updated values to be
written.

Sylwester adds sleep to VF reset to resolve issue of VFs not getting
resources.

Przemyslaw rejects filters for raw IPv4 or IPv6 l4_4_bytes filters as they
 are not supported.

* '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  i40e: Disallow ip4 and ip6 l4_4_bytes
  i40e: Fix for VF MAC address 0
  i40e: Fix not setting default xps_cpus after reset
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 78a9ea43 d64aaf3f

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

+2 −10
Original line number Diff line number Diff line
@@ -4464,11 +4464,7 @@ static int i40e_check_fdir_input_set(struct i40e_vsi *vsi, 
			return -EOPNOTSUPP;



		/* First 4 bytes of L4 header */

		if (usr_ip4_spec->l4_4_bytes == htonl(0xFFFFFFFF))

			new_mask |= I40E_L4_SRC_MASK | I40E_L4_DST_MASK;

		else if (!usr_ip4_spec->l4_4_bytes)

			new_mask &= ~(I40E_L4_SRC_MASK | I40E_L4_DST_MASK);

		else

		if (usr_ip4_spec->l4_4_bytes)

			return -EOPNOTSUPP;



		/* Filtering on Type of Service is not supported. */
@@ -4507,11 +4503,7 @@ static int i40e_check_fdir_input_set(struct i40e_vsi *vsi, 
		else

			return -EOPNOTSUPP;



		if (usr_ip6_spec->l4_4_bytes == htonl(0xFFFFFFFF))

			new_mask |= I40E_L4_SRC_MASK | I40E_L4_DST_MASK;

		else if (!usr_ip6_spec->l4_4_bytes)

			new_mask &= ~(I40E_L4_SRC_MASK | I40E_L4_DST_MASK);

		else

		if (usr_ip6_spec->l4_4_bytes)

			return -EOPNOTSUPP;



		/* Filtering on Traffic class is not supported. */

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

+18 −1
Original line number Diff line number Diff line
@@ -10654,6 +10654,21 @@ static int i40e_rebuild_channels(struct i40e_vsi *vsi) 
	return 0;

}



/**

 * i40e_clean_xps_state - clean xps state for every tx_ring

 * @vsi: ptr to the VSI

 **/

static void i40e_clean_xps_state(struct i40e_vsi *vsi)

{

	int i;



	if (vsi->tx_rings)

		for (i = 0; i < vsi->num_queue_pairs; i++)

			if (vsi->tx_rings[i])

				clear_bit(__I40E_TX_XPS_INIT_DONE,

					  vsi->tx_rings[i]->state);

}



/**

 * i40e_prep_for_reset - prep for the core to reset

 * @pf: board private structure
@@ -10678,9 +10693,11 @@ static void i40e_prep_for_reset(struct i40e_pf *pf) 
	i40e_pf_quiesce_all_vsi(pf);



	for (v = 0; v < pf->num_alloc_vsi; v++) {

		if (pf->vsi[v])

		if (pf->vsi[v]) {

			i40e_clean_xps_state(pf->vsi[v]);

			pf->vsi[v]->seid = 0;

		}

	}



	i40e_shutdown_adminq(&pf->hw);

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

+2 −0
Original line number Diff line number Diff line
@@ -1578,6 +1578,7 @@ bool i40e_reset_vf(struct i40e_vf *vf, bool flr) 
	i40e_cleanup_reset_vf(vf);



	i40e_flush(hw);

	usleep_range(20000, 40000);

	clear_bit(I40E_VF_STATE_RESETTING, &vf->vf_states);



	return true;
@@ -1701,6 +1702,7 @@ bool i40e_reset_all_vfs(struct i40e_pf *pf, bool flr) 
	}



	i40e_flush(hw);

	usleep_range(20000, 40000);

	clear_bit(__I40E_VF_DISABLE, pf->state);



	return true;