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

ice: Pull common tasks into ice_vf_post_vsi_rebuild 



The Single Root IOV implementation of .post_vsi_rebuild performs some tasks
that will ultimately need to be shared with the Scalable IOV implementation
such as rebuilding the host configuration.

Refactor by introducing a new wrapper function, ice_vf_post_vsi_rebuild
which performs the tasks that will be shared between SR-IOV and Scalable
IOV. Move the ice_vf_rebuild_host_cfg and ice_vf_set_initialized calls into
this wrapper. Then call the implementation specific post_vsi_rebuild
handler afterwards.

This ensures that we will properly re-initialize filters and expected
settings for both SR-IOV and Scalable IOV.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarMarek Szlosek <marek.szlosek@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 1efee073

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

+0 −2
Original line number Diff line number Diff line
@@ -816,8 +816,6 @@ static int ice_sriov_vsi_rebuild(struct ice_vf *vf) 
 */

static void ice_sriov_post_vsi_rebuild(struct ice_vf *vf)

{

	ice_vf_rebuild_host_cfg(vf);

	ice_vf_set_initialized(vf);

	ice_ena_vf_mappings(vf);

	wr32(&vf->pf->hw, VFGEN_RSTAT(vf->vf_id), VIRTCHNL_VFR_VFACTIVE);

}

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

+17 −2
Original line number Diff line number Diff line
@@ -270,6 +270,21 @@ static int ice_vf_rebuild_vsi(struct ice_vf *vf) 
	return 0;

}



/**

 * ice_vf_post_vsi_rebuild - Reset tasks that occur after VSI rebuild

 * @vf: the VF being reset

 *

 * Perform reset tasks which must occur after the VSI has been re-created or

 * rebuilt during a VF reset.

 */

static void ice_vf_post_vsi_rebuild(struct ice_vf *vf)

{

	ice_vf_rebuild_host_cfg(vf);

	ice_vf_set_initialized(vf);



	vf->vf_ops->post_vsi_rebuild(vf);

}



/**

 * ice_is_any_vf_in_unicast_promisc - check if any VF(s)

 * are in unicast promiscuous mode
@@ -495,7 +510,7 @@ void ice_reset_all_vfs(struct ice_pf *pf) 


		ice_vf_pre_vsi_rebuild(vf);

		ice_vf_rebuild_vsi(vf);

		vf->vf_ops->post_vsi_rebuild(vf);

		ice_vf_post_vsi_rebuild(vf);



		mutex_unlock(&vf->cfg_lock);

	}
@@ -646,7 +661,7 @@ int ice_reset_vf(struct ice_vf *vf, u32 flags) 
		goto out_unlock;

	}



	vf->vf_ops->post_vsi_rebuild(vf);

	ice_vf_post_vsi_rebuild(vf);

	vsi = ice_get_vf_vsi(vf);

	if (WARN_ON(!vsi)) {

		err = -EINVAL;