ice: add a function to initialize vf entry

Some of the initialization code for Single Root IOV VFs will need to be
reused when we introduce Scalable IOV. Pull this code out into a new
ice_initialize_vf_entry helper function.

Co-developed-by: Harshitha Ramamurthy <harshitha.ramamurthy@intel.com>
Signed-off-by: Harshitha Ramamurthy <harshitha.ramamurthy@intel.com>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Marek Szlosek <marek.szlosek@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_sriov.c b/drivers/net/ethernet/intel/ice/ice_sriov.c
index 6ff29be974c5f694f946d742929f6c20342fd52e..6c07f661d44ced1fe720e60cc0c68d5ebf8eaf0b 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_sriov.c
+++ b/drivers/net/ethernet/intel/ice/ice_sriov.c
@@ -867,21 +867,9 @@ static int ice_create_vf_entries(struct ice_pf *pf, u16 num_vfs)
                /* set sriov vf ops for VFs created during SRIOV flow */
                vf->vf_ops = &ice_sriov_vf_ops;
 
-               vf->vf_sw_id = pf->first_sw;
-               /* assign default capabilities */
-               vf->spoofchk = true;
-               vf->num_vf_qs = pf->vfs.num_qps_per;
-               ice_vc_set_default_allowlist(vf);
-
-               /* ctrl_vsi_idx will be set to a valid value only when VF
-                * creates its first fdir rule.
-                */
-               ice_vf_ctrl_invalidate_vsi(vf);
-               ice_vf_fdir_init(vf);
+               ice_initialize_vf_entry(vf);
 
-               ice_virtchnl_set_dflt_ops(vf);
-
-               mutex_init(&vf->cfg_lock);
+               vf->vf_sw_id = pf->first_sw;
 
                hash_add_rcu(vfs->table, &vf->entry, vf_id);
        }

diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.c b/drivers/net/ethernet/intel/ice/ice_vf_lib.c
index 624c7de8b205ab945ad8d6c9f258ce2d1a5f85fe..b6fd1e85296881def4e52534c911c77720d1294d 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_vf_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.c
@@ -698,6 +698,32 @@ void ice_set_vf_state_qs_dis(struct ice_vf *vf)
 
 /* Private functions only accessed from other virtualization files */
 
+/**
+ * ice_initialize_vf_entry - Initialize a VF entry
+ * @vf: pointer to the VF structure
+ */
+void ice_initialize_vf_entry(struct ice_vf *vf)
+{
+       struct ice_pf *pf = vf->pf;
+       struct ice_vfs *vfs;
+
+       vfs = &pf->vfs;
+
+       /* 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);
+
+       /* ctrl_vsi_idx will be set to a valid value only when iAVF
+        * creates its first fdir rule.
+        */
+       ice_vf_ctrl_invalidate_vsi(vf);
+       ice_vf_fdir_init(vf);
+
+       mutex_init(&vf->cfg_lock);
+}
+
 /**
  * ice_dis_vf_qs - Disable the VF queues
  * @vf: pointer to the VF structure

diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib_private.h b/drivers/net/ethernet/intel/ice/ice_vf_lib_private.h
index a0f204746f4eb3c80cb4157ac2df48a551788810..552d1d02982da707eb649516fd404cbe3b3d1ee7 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_vf_lib_private.h
+++ b/drivers/net/ethernet/intel/ice/ice_vf_lib_private.h
@@ -23,6 +23,7 @@
 #warning "Only include ice_vf_lib_private.h in CONFIG_PCI_IOV virtualization files"
 #endif
 
+void ice_initialize_vf_entry(struct ice_vf *vf);
 void ice_dis_vf_qs(struct ice_vf *vf);
 int ice_check_vf_init(struct ice_vf *vf);
 enum virtchnl_status_code ice_err_to_virt_err(int err);