d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/i40e: clear VF reset flags after reset

Browse Source 
The reset flags vf->vf_reset and vf->pend_msg are set when VF received
VIRTCHNL_EVENT_RESET_IMPENDING. So after resetting done, these flags
should be cleared.

Fixes: 8cacf78469a7 ("net/i40e: fix VF initialization error")
Cc: stable@dpdk.org

Signed-off-by: Zhirun Yan <zhirun.yan@intel.com>
Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
This commit is contained in:
Zhirun Yan 2018-12-13 15:46:45 +00:00 committed by Ferruh Yigit
parent b2cb71e95e
commit 0eaa1f8c75
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/i40e/i40e_ethdev_vf.c
View File

@ -1080,9 +1080,11 @@ i40evf_enable_irq0(struct i40e_hw *hw)
}
static int
i40evf_check_vf_reset_done(struct i40e_hw *hw)
i40evf_check_vf_reset_done(struct rte_eth_dev *dev)
{
int i, reset;
struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
for (i = 0; i < MAX_RESET_WAIT_CNT; i++) {
reset = I40E_READ_REG(hw, I40E_VFGEN_RSTAT) &
@ -1097,12 +1099,16 @@ i40evf_check_vf_reset_done(struct i40e_hw *hw)
if (i >= MAX_RESET_WAIT_CNT)
return -1;
vf->vf_reset = false;
vf->pend_msg &= ~PFMSG_RESET_IMPENDING;
return 0;
}
static int
i40evf_reset_vf(struct i40e_hw *hw)
i40evf_reset_vf(struct rte_eth_dev *dev)
{
int ret;
struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
if (i40e_vf_reset(hw) != I40E_SUCCESS) {
PMD_INIT_LOG(ERR, "Reset VF NIC failed");
@ -1119,7 +1125,7 @@ i40evf_reset_vf(struct i40e_hw *hw)
*/
rte_delay_ms(200);
ret = i40evf_check_vf_reset_done(hw);
ret = i40evf_check_vf_reset_done(dev);
if (ret) {
PMD_INIT_LOG(ERR, "VF is still resetting");
return ret;
@ -1145,7 +1151,7 @@ i40evf_init_vf(struct rte_eth_dev *dev)
goto err;
}
err = i40evf_check_vf_reset_done(hw);
err = i40evf_check_vf_reset_done(dev);
if (err)
goto err;
@ -1157,7 +1163,7 @@ i40evf_init_vf(struct rte_eth_dev *dev)
}
/* Reset VF and wait until it's complete */
if (i40evf_reset_vf(hw)) {
if (i40evf_reset_vf(dev)) {
PMD_INIT_LOG(ERR, "reset NIC failed");
goto err_aq;
}
@ -2257,7 +2263,7 @@ i40evf_dev_close(struct rte_eth_dev *dev)
i40evf_dev_promiscuous_disable(dev);
i40evf_dev_allmulticast_disable(dev);
i40evf_reset_vf(hw);
i40evf_reset_vf(dev);
i40e_shutdown_adminq(hw);
i40evf_disable_irq0(hw);
rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev);