Commit 5861e822 authored by David S. Miller's avatar David S. Miller
Browse files

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



Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2023-07-14 (i40e)

This series contains updates to i40e driver only.

Ivan Vecera adds waiting for VF to complete initialization on VF related
configuration callbacks.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 09c4a16d efb6f4a3

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

+38 −27
Original line number Diff line number Diff line
@@ -4304,6 +4304,38 @@ static int i40e_validate_vf(struct i40e_pf *pf, int vf_id) 
	return ret;

}



/**

 * i40e_check_vf_init_timeout

 * @vf: the virtual function

 *

 * Check that the VF's initialization was successfully done and if not

 * wait up to 300ms for its finish.

 *

 * Returns true when VF is initialized, false on timeout

 **/

static bool i40e_check_vf_init_timeout(struct i40e_vf *vf)

{

	int i;



	/* When the VF is resetting wait until it is done.

	 * It can take up to 200 milliseconds, but wait for

	 * up to 300 milliseconds to be safe.

	 */

	for (i = 0; i < 15; i++) {

		if (test_bit(I40E_VF_STATE_INIT, &vf->vf_states))

			return true;

		msleep(20);

	}



	if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {

		dev_err(&vf->pf->pdev->dev,

			"VF %d still in reset. Try again.\n", vf->vf_id);

		return false;

	}



	return true;

}



/**

 * i40e_ndo_set_vf_mac

 * @netdev: network interface device structure
@@ -4322,7 +4354,6 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) 
	int ret = 0;

	struct hlist_node *h;

	int bkt;

	u8 i;



	if (test_and_set_bit(__I40E_VIRTCHNL_OP_PENDING, pf->state)) {

		dev_warn(&pf->pdev->dev, "Unable to configure VFs, other operation is pending.\n");
@@ -4335,21 +4366,7 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) 
		goto error_param;



	vf = &pf->vf[vf_id];



	/* When the VF is resetting wait until it is done.

	 * It can take up to 200 milliseconds,

	 * but wait for up to 300 milliseconds to be safe.

	 * Acquire the VSI pointer only after the VF has been

	 * properly initialized.

	 */

	for (i = 0; i < 15; i++) {

		if (test_bit(I40E_VF_STATE_INIT, &vf->vf_states))

			break;

		msleep(20);

	}

	if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {

		dev_err(&pf->pdev->dev, "VF %d still in reset. Try again.\n",

			vf_id);

	if (!i40e_check_vf_init_timeout(vf)) {

		ret = -EAGAIN;

		goto error_param;

	}
@@ -4451,13 +4468,11 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, int vf_id, 
	}



	vf = &pf->vf[vf_id];

	vsi = pf->vsi[vf->lan_vsi_idx];

	if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {

		dev_err(&pf->pdev->dev, "VF %d still in reset. Try again.\n",

			vf_id);

	if (!i40e_check_vf_init_timeout(vf)) {

		ret = -EAGAIN;

		goto error_pvid;

	}

	vsi = pf->vsi[vf->lan_vsi_idx];



	if (le16_to_cpu(vsi->info.pvid) == vlanprio)

		/* duplicate request, so just return success */
@@ -4601,13 +4616,11 @@ int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int min_tx_rate, 
	}



	vf = &pf->vf[vf_id];

	vsi = pf->vsi[vf->lan_vsi_idx];

	if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {

		dev_err(&pf->pdev->dev, "VF %d still in reset. Try again.\n",

			vf_id);

	if (!i40e_check_vf_init_timeout(vf)) {

		ret = -EAGAIN;

		goto error;

	}

	vsi = pf->vsi[vf->lan_vsi_idx];



	ret = i40e_set_bw_limit(vsi, vsi->seid, max_tx_rate);

	if (ret)
@@ -4774,9 +4787,7 @@ int i40e_ndo_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool enable) 
	}



	vf = &(pf->vf[vf_id]);

	if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {

		dev_err(&pf->pdev->dev, "VF %d still in reset. Try again.\n",

			vf_id);

	if (!i40e_check_vf_init_timeout(vf)) {

		ret = -EAGAIN;

		goto out;

	}