564fd5ddb8
It is for CentOS 7.6 support Depends-On: https://review.openstack.org/627739 Story: 2004521 Task: 28532 Change-Id: I6a008dfa28a51316f2e2138213fb9b803f357ce8 Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
From 25b521f58b33bf070c0b31d077333c13c3ad25e8 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <25b521f58b33bf070c0b31d077333c13c3ad25e8.1528830095.git.Jim.Somerville@windriver.com>
|
|
In-Reply-To: <412fdc8c0d51500e42e76e788ece3ca7dd260ced.1528830095.git.Jim.Somerville@windriver.com>
|
|
References: <412fdc8c0d51500e42e76e788ece3ca7dd260ced.1528830095.git.Jim.Somerville@windriver.com>
|
|
From: Jim Somerville <Jim.Somerville@windriver.com>
|
|
Date: Mon, 2 Apr 2018 15:35:12 -0400
|
|
Subject: [PATCH 3/3] ndo_get_vf_config poll for out of vf reset
|
|
|
|
Same solution as 028daf80117376b22909becd9720daaefdfceff4 from the
|
|
net-next tree as supplied by Intel, but we apply it to
|
|
ndo_get_vf_config instead.
|
|
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
---
|
|
src/i40e_virtchnl_pf.c | 11 +++++++++++
|
|
1 file changed, 11 insertions(+)
|
|
|
|
diff --git a/src/i40e_virtchnl_pf.c b/src/i40e_virtchnl_pf.c
|
|
index da29fc3..d5935d6 100644
|
|
--- a/src/i40e_virtchnl_pf.c
|
|
+++ b/src/i40e_virtchnl_pf.c
|
|
@@ -4829,6 +4829,7 @@ int i40e_ndo_get_vf_config(struct net_device *netdev,
|
|
struct i40e_pf *pf = vsi->back;
|
|
struct i40e_vf *vf;
|
|
int ret = 0;
|
|
+ u8 i;
|
|
|
|
if (test_and_set_bit(__I40E_VIRTCHNL_OP_PENDING, pf->state)) {
|
|
dev_warn(&pf->pdev->dev, "Unable to configure VFs, other operation is pending.\n");
|
|
@@ -4843,6 +4844,16 @@ int i40e_ndo_get_vf_config(struct net_device *netdev,
|
|
vf = &pf->vf[vf_id];
|
|
/* first vsi is always the LAN vsi */
|
|
vsi = pf->vsi[vf->lan_vsi_idx];
|
|
+
|
|
+ /* When the VF is resetting wait until it is done.
|
|
+ * It can take up to 200 milliseconds,
|
|
+ * but wait for up to 300 milliseconds to be safe.
|
|
+ */
|
|
+ for (i = 0; i < 15; i++) {
|
|
+ if (test_bit(I40E_VF_STATE_INIT, &vf->vf_states))
|
|
+ break;
|
|
+ msleep(20);
|
|
+ }
|
|
if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {
|
|
dev_err(&pf->pdev->dev, "%s: VF %d still in reset. Try again.\n",
|
|
__func__, vf_id);
|
|
--
|
|
1.8.3.1
|
|
|