2718976ddc
Uprev i40e to version 2.10.19.30 i40evf gets replaced by iavf version 3.7.61.20 The iavf driver supports both fortville and columbiaville, so they decided to rename from i40evf to something more generic. We get to drop the patch which polls for coming out of reset as it was incorporated upstream. The Intel FPGA Programmable Acceleration Card N3000 contains dual Intel XL710 NICs and an FPGA for acceleration purposes. This driver upgrade is required to support those NICs. Change-Id: Ifbec94bcc00a8cce9fe97bf0eb41556b8bd3e592 Story: 2006740 Task: 37542 Depends-On: https://review.opendev.org/#/c/695061 Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
65 lines
2.4 KiB
Diff
65 lines
2.4 KiB
Diff
From 40b257ecf5d36abf14a4ef98fc2e44dba7100fea Mon Sep 17 00:00:00 2001
|
|
Message-Id: <40b257ecf5d36abf14a4ef98fc2e44dba7100fea.1572295393.git.Jim.Somerville@windriver.com>
|
|
In-Reply-To: <b8c666367cd98a2b0033c043f6f206abd8e238a6.1572295393.git.Jim.Somerville@windriver.com>
|
|
References: <b8c666367cd98a2b0033c043f6f206abd8e238a6.1572295393.git.Jim.Somerville@windriver.com>
|
|
From: Jim Somerville <Jim.Somerville@windriver.com>
|
|
Date: Mon, 26 Mar 2018 11:03:47 -0400
|
|
Subject: [PATCH 2/2] i40e add more debug info for VFs still in reset
|
|
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
---
|
|
src/i40e_virtchnl_pf.c | 16 ++++++++--------
|
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/src/i40e_virtchnl_pf.c b/src/i40e_virtchnl_pf.c
|
|
index 21b4606..dfb9568 100644
|
|
--- a/src/i40e_virtchnl_pf.c
|
|
+++ b/src/i40e_virtchnl_pf.c
|
|
@@ -4363,8 +4363,8 @@ static int i40e_set_vf_mac(struct i40e_vf *vf, struct i40e_vsi *vsi,
|
|
msleep(20);
|
|
}
|
|
if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {
|
|
- dev_err(&pf->pdev->dev, "VF %d still in reset. Try again.\n",
|
|
- vf->vf_id);
|
|
+ dev_err(&pf->pdev->dev, "%s: VF %d still in reset. Try again.\n",
|
|
+ __func__, vf->vf_id);
|
|
ret = -EAGAIN;
|
|
goto error_param;
|
|
}
|
|
@@ -4522,8 +4522,8 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev,
|
|
vf = &pf->vf[vf_id];
|
|
vsi = pf->vsi[vf->lan_vsi_idx];
|
|
if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {
|
|
- dev_err(&pf->pdev->dev, "VF %d still in reset. Try again.\n",
|
|
- vf_id);
|
|
+ dev_err(&pf->pdev->dev, "%s: VF %d still in reset. Try again.\n",
|
|
+ __func__, vf_id);
|
|
ret = -EAGAIN;
|
|
goto error_pvid;
|
|
}
|
|
@@ -4678,8 +4678,8 @@ int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int max_tx_rate)
|
|
vf = &pf->vf[vf_id];
|
|
vsi = pf->vsi[vf->lan_vsi_idx];
|
|
if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {
|
|
- dev_err(&pf->pdev->dev, "VF %d still in reset. Try again.\n",
|
|
- vf_id);
|
|
+ dev_err(&pf->pdev->dev, "%s: VF %d still in reset. Try again.\n",
|
|
+ __func__, vf_id);
|
|
ret = -EAGAIN;
|
|
goto error;
|
|
}
|
|
@@ -4881,8 +4881,8 @@ int i40e_ndo_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool enable)
|
|
|
|
vf = &(pf->vf[vf_id]);
|
|
if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {
|
|
- dev_err(&pf->pdev->dev, "VF %d still in reset. Try again.\n",
|
|
- vf_id);
|
|
+ dev_err(&pf->pdev->dev, "%s: VF %d still in reset. Try again.\n",
|
|
+ __func__, vf_id);
|
|
ret = -EAGAIN;
|
|
goto out;
|
|
}
|
|
--
|
|
1.8.3.1
|
|
|