Commit c22f7dac authored by Jacob Keller's avatar Jacob Keller Committed by Tony Nguyen
Browse files

ice: set vf->num_msix in ice_initialize_vf_entry() 



Commit fe1c5ca2 ("ice: implement num_msix field per VF") updated the
driver to allow for per-VF MSI-X configuration. The initial defaults were
set in ice_create_vf_entries(). This logic is better placed in
ice_initialize_vf_entry(). Indeed, that function already sets
vf->num_vf_qs, as well as initializes the allow list via calling
ice_vc_set_default_allowlist().

Move this logic into ice_initialize_vf_entry(). This makes the code clear,
and ensures that these VF fields will be initialized properly for both
SR-IOV VFs and the upcoming Scalable IOV VFs.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarRafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent ae67389c

drivers/net/ethernet/intel/ice/ice_sriov.c

+0 −5
Original line number Diff line number Diff line
@@ -831,11 +831,6 @@ static int ice_create_vf_entries(struct ice_pf *pf, u16 num_vfs) 


		pci_dev_get(vfdev);



		/* set default number of MSI-X */

		vf->num_msix = pf->vfs.num_msix_per;

		vf->num_vf_qs = pf->vfs.num_qps_per;

		ice_vc_set_default_allowlist(vf);



		hash_add_rcu(vfs->table, &vf->entry, vf_id);

	}

drivers/net/ethernet/intel/ice/ice_vf_lib.c

+4 −1
Original line number Diff line number Diff line
@@ -992,10 +992,13 @@ void ice_initialize_vf_entry(struct ice_vf *vf) 


	/* assign default capabilities */

	vf->spoofchk = true;

	vf->num_vf_qs = vfs->num_qps_per;

	ice_vc_set_default_allowlist(vf);

	ice_virtchnl_set_dflt_ops(vf);



	/* set default number of MSI-X */

	vf->num_msix = vfs->num_msix_per;

	vf->num_vf_qs = vfs->num_qps_per;



	/* ctrl_vsi_idx will be set to a valid value only when iAVF

	 * creates its first fdir rule.

	 */