From patchwork Thu Jun 15 09:08:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Matz X-Patchwork-Id: 25343 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 7FA3B2BC3; Thu, 15 Jun 2017 11:08:19 +0200 (CEST) Received: from proxy.6wind.com (host.76.145.23.62.rev.coltfrance.com [62.23.145.76]) by dpdk.org (Postfix) with ESMTP id 1968C2BB9 for ; Thu, 15 Jun 2017 11:08:17 +0200 (CEST) Received: from glumotte.dev.6wind.com (unknown [10.16.0.195]) by proxy.6wind.com (Postfix) with ESMTP id BC3A68FB35; Thu, 15 Jun 2017 11:08:04 +0200 (CEST) From: Olivier Matz To: dev@dpdk.org, jingjing.wu@intel.com, helin.zhang@intel.com Cc: beilei.xing@intel.com, bruce.richardson@intel.com Date: Thu, 15 Jun 2017 11:08:32 +0200 Message-Id: <20170615090832.3049-1-olivier.matz@6wind.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170615110331.3c8ca067@glumotte.dev.6wind.com> References: <20170615110331.3c8ca067@glumotte.dev.6wind.com> Subject: [dpdk-dev] [PATCH] net/i40e: avoid PCI probing failure when using bogus sfp X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 Acked-by: Jingjing Wu --- 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; }