From: Olivier Matz <olivier.matz@6wind.com>
To: dev@dpdk.org, jingjing.wu@intel.com, helin.zhang@intel.com
Cc: beilei.xing@intel.com, bruce.richardson@intel.com
Subject: [dpdk-dev] [PATCH] net/i40e: avoid PCI probing failure when using bogus sfp
Date: Thu, 15 Jun 2017 11:08:32 +0200 [thread overview]
Message-ID: <20170615090832.3049-1-olivier.matz@6wind.com> (raw)
In-Reply-To: <20170615110331.3c8ca067@glumotte.dev.6wind.com>
When a port is using a bogus SFP, the PCI probing returns an error,
preventing to register a portid.
To give a better chance to the applications to retry after the SFP is
changed, move this check in eth_i40e_dev_configure(), so that only a
port reconfiguration is needed to retry.
Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
drivers/net/i40e/i40e_ethdev.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index d3428b9c0..1f256d767 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -1142,11 +1142,8 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)
config_floating_veb(dev);
/* Clear PXE mode */
i40e_clear_pxe_mode(hw);
- ret = i40e_dev_sync_phy_type(hw);
- if (ret) {
- PMD_INIT_LOG(ERR, "Failed to sync phy type: %d", ret);
- goto err_sync_phy_type;
- }
+ i40e_dev_sync_phy_type(hw);
+
/*
* On X710, performance number is far from the expectation on recent
* firmware versions. The fix for this issue may not be integrated in
@@ -1331,7 +1328,6 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)
err_qp_pool_init:
err_parameter_init:
err_get_capabilities:
-err_sync_phy_type:
(void)i40e_shutdown_adminq(hw);
return ret;
@@ -1470,9 +1466,14 @@ i40e_dev_configure(struct rte_eth_dev *dev)
struct i40e_adapter *ad =
I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+ struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
enum rte_eth_rx_mq_mode mq_mode = dev->data->dev_conf.rxmode.mq_mode;
int i, ret;
+ ret = i40e_dev_sync_phy_type(hw);
+ if (ret)
+ return ret;
+
/* Initialize to TRUE. If any of Rx queues doesn't meet the
* bulk allocation or vector Rx preconditions we will reset it.
*/
@@ -9176,8 +9177,11 @@ i40e_dev_sync_phy_type(struct i40e_hw *hw)
status = i40e_aq_get_phy_capabilities(hw, false, true, &phy_ab,
NULL);
- if (status)
+ if (status) {
+ PMD_INIT_LOG(WARNING, "Failed to sync phy type: status=%d",
+ status);
return ret;
+ }
return 0;
}
--
2.11.0
next prev parent reply other threads:[~2017-06-15 9:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-08 9:29 [dpdk-dev] i40e: pci probe fails when using one " Olivier Matz
2017-06-08 10:01 ` Bruce Richardson
2017-06-08 10:13 ` Olivier Matz
2017-06-12 8:45 ` Xing, Beilei
2017-06-12 9:45 ` Olivier Matz
2017-06-12 15:53 ` Wu, Jingjing
2017-06-12 16:25 ` Wu, Jingjing
2017-06-12 16:23 ` Wu, Jingjing
2017-06-13 8:27 ` Olivier MATZ
2017-06-13 14:14 ` Wu, Jingjing
2017-06-15 9:03 ` Olivier MATZ
2017-06-15 9:08 ` Olivier Matz [this message]
2017-06-23 9:25 ` [dpdk-dev] [PATCH] net/i40e: avoid PCI probing failure when using " Wu, Jingjing
2017-06-23 10:11 ` Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170615090832.3049-1-olivier.matz@6wind.com \
--to=olivier.matz@6wind.com \
--cc=beilei.xing@intel.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=helin.zhang@intel.com \
--cc=jingjing.wu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).