summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiaoyun Li <xiaoyun.li@intel.com>2017-08-04 23:50:06 +0800
committerYuanhan Liu <yliu@fridaylinux.org>2017-08-29 14:55:38 +0800
commit849a7581b8426633617aa773d58b13c6b4150c03 (patch)
treeffaafcc63fc41a686e4d615c709a5e29e9ff531d
parent88dc28f17582befcf173824ec0b98db4bcd2dd90 (diff)
downloaddpdk-stable-849a7581b8426633617aa773d58b13c6b4150c03.zip
dpdk-stable-849a7581b8426633617aa773d58b13c6b4150c03.tar.gz
dpdk-stable-849a7581b8426633617aa773d58b13c6b4150c03.tar.xz
net/i40e: revert fix of PF notify when VF not up
[ upstream commit f0adeebde0eff52674f28c4dd240030381c391e9 ] This reverts commit 035a8cf88f010c82de3040c895c801ce0849b065. Don't send messages to inactive VF will cause DPDK PF failing to send messages to kernel VF. With this revert, this issue will be solved. Fixes: 035a8cf88f01 ("net/i40e: fix PF notify when VF is not up") Signed-off-by: Xiaoyun Li <xiaoyun.li@intel.com> Acked-by: Beilei Xing <beilei.xing@intel.com>
-rw-r--r--drivers/net/i40e/i40e_pf.c28
1 files changed, 12 insertions, 16 deletions
diff --git a/drivers/net/i40e/i40e_pf.c b/drivers/net/i40e/i40e_pf.c
index 65d93a8..2011461 100644
--- a/drivers/net/i40e/i40e_pf.c
+++ b/drivers/net/i40e/i40e_pf.c
@@ -152,21 +152,20 @@ i40e_pf_host_vf_reset(struct i40e_pf_vf *vf, bool do_hw_reset)
val |= I40E_VPGEN_VFRTRIG_VFSWR_MASK;
I40E_WRITE_REG(hw, I40E_VPGEN_VFRTRIG(vf_id), val);
I40E_WRITE_FLUSH(hw);
+ }
#define VFRESET_MAX_WAIT_CNT 100
- /* Wait until VF reset is done */
- for (i = 0; i < VFRESET_MAX_WAIT_CNT; i++) {
- rte_delay_us(10);
- val = I40E_READ_REG(hw, I40E_VPGEN_VFRSTAT(vf_id));
- if (val & I40E_VPGEN_VFRSTAT_VFRD_MASK)
- break;
- }
+ /* Wait until VF reset is done */
+ for (i = 0; i < VFRESET_MAX_WAIT_CNT; i++) {
+ rte_delay_us(10);
+ val = I40E_READ_REG(hw, I40E_VPGEN_VFRSTAT(vf_id));
+ if (val & I40E_VPGEN_VFRSTAT_VFRD_MASK)
+ break;
+ }
- if (i >= VFRESET_MAX_WAIT_CNT) {
- PMD_DRV_LOG(ERR, "VF reset timeout");
- return -ETIMEDOUT;
- }
- vf->state = I40E_VF_ACTIVE;
+ if (i >= VFRESET_MAX_WAIT_CNT) {
+ PMD_DRV_LOG(ERR, "VF reset timeout");
+ return -ETIMEDOUT;
}
/* This is not first time to do reset, do cleanup job first */
if (vf->vsi) {
@@ -262,10 +261,7 @@ i40e_pf_host_send_msg_to_vf(struct i40e_pf_vf *vf,
{
struct i40e_hw *hw = I40E_PF_TO_HW(vf->pf);
uint16_t abs_vf_id = hw->func_caps.vf_base_id + vf->vf_idx;
- int ret = I40E_ERR_ADMIN_QUEUE_ERROR;
-
- if (vf->state == I40E_VF_INACTIVE)
- return ret;
+ int ret;
ret = i40e_aq_send_msg_to_vf(hw, abs_vf_id, opcode, retval,
msg, msglen, NULL);