Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f5e33b6 authored by Ashish Shah's avatar Ashish Shah Committed by Jeff Kirsher
Browse files

i40e: set num_queue_pairs to num configured by VF 



Change vsi->num_queue_pairs to equal the number that are configured
by the VF. This, in turn, limits the number of queues that are
enable/disabled. This fixes the mismatched case for when a VF configures
fewer queues than is allocated to it by the PF.

Change other sections to use alloc_queue_pairs as warranted.

Change-ID: I0de1b55c9084e7be6acc818da8569f12128a82c2
Signed-off-by: default avatarAshish Shah <ashish.n.shah@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent c1d11cef

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

+8 −5
Original line number Original line Diff line number Diff line
@@ -73,7 +73,7 @@ static inline bool i40e_vc_isvalid_queue_id(struct i40e_vf *vf, u8 vsi_id, 
{

{

	struct i40e_pf *pf = vf->pf;

	struct i40e_pf *pf = vf->pf;





	return qid < pf->vsi[vsi_id]->num_queue_pairs;

	return qid < pf->vsi[vsi_id]->alloc_queue_pairs;

}

}





/**

/**
@@ -469,7 +469,7 @@ static void i40e_enable_vf_mappings(struct i40e_vf *vf) 
	wr32(hw, I40E_VPLAN_MAPENA(vf->vf_id), reg);

	wr32(hw, I40E_VPLAN_MAPENA(vf->vf_id), reg);





	/* map PF queues to VF queues */

	/* map PF queues to VF queues */

	for (j = 0; j < pf->vsi[vf->lan_vsi_index]->num_queue_pairs; j++) {

	for (j = 0; j < pf->vsi[vf->lan_vsi_index]->alloc_queue_pairs; j++) {

		u16 qid = i40e_vc_get_pf_queue_id(vf, vf->lan_vsi_index, j);

		u16 qid = i40e_vc_get_pf_queue_id(vf, vf->lan_vsi_index, j);

		reg = (qid & I40E_VPLAN_QTABLE_QINDEX_MASK);

		reg = (qid & I40E_VPLAN_QTABLE_QINDEX_MASK);

		wr32(hw, I40E_VPLAN_QTABLE(total_queue_pairs, vf->vf_id), reg);

		wr32(hw, I40E_VPLAN_QTABLE(total_queue_pairs, vf->vf_id), reg);
@@ -478,7 +478,7 @@ static void i40e_enable_vf_mappings(struct i40e_vf *vf) 




	/* map PF queues to VSI */

	/* map PF queues to VSI */

	for (j = 0; j < 7; j++) {

	for (j = 0; j < 7; j++) {

		if (j * 2 >= pf->vsi[vf->lan_vsi_index]->num_queue_pairs) {

		if (j * 2 >= pf->vsi[vf->lan_vsi_index]->alloc_queue_pairs) {

			reg = 0x07FF07FF;	/* unused */

			reg = 0x07FF07FF;	/* unused */

		} else {

		} else {

			u16 qid = i40e_vc_get_pf_queue_id(vf, vf->lan_vsi_index,

			u16 qid = i40e_vc_get_pf_queue_id(vf, vf->lan_vsi_index,
@@ -585,7 +585,7 @@ static int i40e_alloc_vf_res(struct i40e_vf *vf) 
	ret = i40e_alloc_vsi_res(vf, I40E_VSI_SRIOV);

	ret = i40e_alloc_vsi_res(vf, I40E_VSI_SRIOV);

	if (ret)

	if (ret)

		goto error_alloc;

		goto error_alloc;

	total_queue_pairs += pf->vsi[vf->lan_vsi_index]->num_queue_pairs;

	total_queue_pairs += pf->vsi[vf->lan_vsi_index]->alloc_queue_pairs;

	set_bit(I40E_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps);

	set_bit(I40E_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps);





	/* store the total qps number for the runtime

	/* store the total qps number for the runtime
@@ -1124,7 +1124,7 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf) 
		vfres->vsi_res[i].vsi_id = vf->lan_vsi_index;

		vfres->vsi_res[i].vsi_id = vf->lan_vsi_index;

		vfres->vsi_res[i].vsi_type = I40E_VSI_SRIOV;

		vfres->vsi_res[i].vsi_type = I40E_VSI_SRIOV;

		vfres->vsi_res[i].num_queue_pairs =

		vfres->vsi_res[i].num_queue_pairs =

		    pf->vsi[vf->lan_vsi_index]->num_queue_pairs;

		    pf->vsi[vf->lan_vsi_index]->alloc_queue_pairs;

		memcpy(vfres->vsi_res[i].default_mac_addr,

		memcpy(vfres->vsi_res[i].default_mac_addr,

		       vf->default_lan_addr.addr, ETH_ALEN);

		       vf->default_lan_addr.addr, ETH_ALEN);

		i++;

		i++;
@@ -1210,6 +1210,7 @@ static int i40e_vc_config_queues_msg(struct i40e_vf *vf, u8 *msg, u16 msglen) 
	struct i40e_virtchnl_vsi_queue_config_info *qci =

	struct i40e_virtchnl_vsi_queue_config_info *qci =

	    (struct i40e_virtchnl_vsi_queue_config_info *)msg;

	    (struct i40e_virtchnl_vsi_queue_config_info *)msg;

	struct i40e_virtchnl_queue_pair_info *qpi;

	struct i40e_virtchnl_queue_pair_info *qpi;

	struct i40e_pf *pf = vf->pf;

	u16 vsi_id, vsi_queue_id;

	u16 vsi_id, vsi_queue_id;

	i40e_status aq_ret = 0;

	i40e_status aq_ret = 0;

	int i;

	int i;
@@ -1243,6 +1244,8 @@ static int i40e_vc_config_queues_msg(struct i40e_vf *vf, u8 *msg, u16 msglen) 
			goto error_param;

			goto error_param;

		}

		}

	}

	}

	/* set vsi num_queue_pairs in use to num configured by vf */

	pf->vsi[vf->lan_vsi_index]->num_queue_pairs = qci->num_queue_pairs;





error_param:

error_param:

	/* send the response to the vf */

	/* send the response to the vf */