ice: Add function to set trust mode bit on reset
authorBrett Creeley <brett.creeley@intel.com>
Sat, 16 May 2020 00:51:12 +0000 (17:51 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Thu, 28 May 2020 23:07:21 +0000 (16:07 -0700)
As the title says, use a function to set trust mode bit on reset.

Signed-off-by: Brett Creeley <brett.creeley@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c

index 92a442e..4005a4c 100644 (file)
@@ -611,6 +611,18 @@ ice_alloc_vsi_res_exit:
 }
 
 /**
+ * ice_vf_set_host_trust_cfg - set trust setting based on pre-reset value
+ * @vf: VF to configure trust setting for
+ */
+static void ice_vf_set_host_trust_cfg(struct ice_vf *vf)
+{
+       if (vf->trusted)
+               set_bit(ICE_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps);
+       else
+               clear_bit(ICE_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps);
+}
+
+/**
  * ice_alloc_vf_res - Allocate VF resources
  * @vf: pointer to the VF structure
  */
@@ -635,10 +647,7 @@ static int ice_alloc_vf_res(struct ice_vf *vf)
        if (status)
                goto ice_alloc_vf_res_exit;
 
-       if (vf->trusted)
-               set_bit(ICE_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps);
-       else
-               clear_bit(ICE_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps);
+       ice_vf_set_host_trust_cfg(vf);
 
        /* VF is now completely initialized */
        set_bit(ICE_VF_STATE_INIT, vf->vf_states);