leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ice: Rename VF function ice_vc_dis_vf to match its behavior

Browse Source 
ice_vc_dis_vf() tells iavf that it's going to perform a reset
and then performs a software reset. This is misleading based on
the function name because the VF does not get disabled. So fix
this by changing the name to ice_vc_reset_vf().

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>
This commit is contained in:
Brett Creeley 2019-10-09 07:09:52 -07:00 committed by Jeff Kirsher
parent 133f4883f9
commit ff010eca05
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
View File

@ -1496,12 +1496,10 @@ void ice_process_vflr_event(struct ice_pf *pf)
} }
/** /**
* ice_vc_dis_vf - Disable a given VF via SW reset * ice_vc_reset_vf - Perform software reset on the VF after informing the AVF
* @vf: pointer to the VF info * @vf: pointer to the VF info
*
* Disable the VF through a SW reset
*/ */
static void ice_vc_dis_vf(struct ice_vf *vf) static void ice_vc_reset_vf(struct ice_vf *vf)
{ {
ice_vc_notify_vf_reset(vf); ice_vc_notify_vf_reset(vf);
ice_reset_vf(vf, false); ice_reset_vf(vf, false);
@ -2541,7 +2539,7 @@ static int ice_vc_request_qs_msg(struct ice_vf *vf, u8 *msg)
} else { } else {
/* request is successful, then reset VF */ /* request is successful, then reset VF */
vf->num_req_qs = req_queues; vf->num_req_qs = req_queues;
ice_vc_dis_vf(vf); ice_vc_reset_vf(vf);
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"VF %d granted request of %u queues.\n", "VF %d granted request of %u queues.\n",
vf->vf_id, req_queues); vf->vf_id, req_queues);
@ -3168,7 +3166,7 @@ int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)
"MAC on VF %d set to %pM. VF driver will be reinitialized\n", "MAC on VF %d set to %pM. VF driver will be reinitialized\n",
vf_id, mac); vf_id, mac);
ice_vc_dis_vf(vf); ice_vc_reset_vf(vf);
return ret; return ret;
} }
@ -3204,7 +3202,7 @@ int ice_set_vf_trust(struct net_device *netdev, int vf_id, bool trusted)
return 0; return 0;
vf->trusted = trusted; vf->trusted = trusted;
ice_vc_dis_vf(vf); ice_vc_reset_vf(vf);
dev_info(&pf->pdev->dev, "VF %u is now %strusted\n", dev_info(&pf->pdev->dev, "VF %u is now %strusted\n",
vf_id, trusted ? "" : "un"); vf_id, trusted ? "" : "un");