From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5D054A04B6 for ; Mon, 11 Nov 2019 04:32:53 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2CDF629C6; Mon, 11 Nov 2019 04:32:53 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 2E201DE3; Mon, 11 Nov 2019 04:32:49 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Nov 2019 19:32:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,291,1569308400"; d="scan'208";a="234329789" Received: from dpdk-qiming2.sh.intel.com ([10.67.119.101]) by fmsmga002.fm.intel.com with ESMTP; 10 Nov 2019 19:32:47 -0800 From: Qiming Yang To: dev@dpdk.org Cc: xiaolong.ye@intel.com, Qiming Yang , stable@dpdk.org Date: Mon, 11 Nov 2019 11:24:24 +0800 Message-Id: <20191111032424.824-1-qiming.yang@intel.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191105050900.30836-1-qiming.yang@intel.com> References: <20191105050900.30836-1-qiming.yang@intel.com> Subject: [dpdk-stable] [PATCH v3] net/ice: fix link status recovery X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" This patch fixes a kernel driver link status issue by recovering link status when device stops. Fixes: e6161345d8a9 ("net/ice: support link status change") Cc: stable@dpdk.org Signed-off-by: Qiming Yang --- drivers/net/ice/ice_ethdev.c | 28 +++++++++++++++++++++++++++- drivers/net/ice/ice_ethdev.h | 1 + 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index d746758..14ca5e6 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -2277,7 +2277,10 @@ ice_dev_stop(struct rte_eth_dev *dev) /* Clear all queues and release mbufs */ ice_clear_queues(dev); - ice_dev_set_link_down(dev); + if (pf->init_link_status) + ice_dev_set_link_up(dev); + else + ice_dev_set_link_down(dev); /* Clean datapath event and queue/vec mapping */ rte_intr_efd_disable(intr_handle); @@ -2648,6 +2651,27 @@ ice_rxq_intr_setup(struct rte_eth_dev *dev) return 0; } +static void +ice_get_init_link_status(struct rte_eth_dev *dev) +{ + struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private); + bool enable_lse = dev->data->dev_conf.intr_conf.lsc ? true : false; + struct ice_link_status link_status; + int ret; + + ret = ice_aq_get_link_info(hw->port_info, enable_lse, + &link_status, NULL); + if (ret != ICE_SUCCESS) { + PMD_DRV_LOG(ERR, "Failed to get link info"); + pf->init_link_status = false; + return; + } + + if (link_status.link_info & ICE_AQ_LINK_UP) + pf->init_link_status = true; +} + static int ice_dev_start(struct rte_eth_dev *dev) { @@ -2717,6 +2741,8 @@ ice_dev_start(struct rte_eth_dev *dev) if (ret != ICE_SUCCESS) PMD_DRV_LOG(WARNING, "Fail to set phy mask"); + ice_get_init_link_status(dev); + ice_dev_set_link_up(dev); /* Call get_link_info aq commond to enable/disable LSE */ diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index de67e59..27db4e7 100644 --- a/drivers/net/ice/ice_ethdev.h +++ b/drivers/net/ice/ice_ethdev.h @@ -369,6 +369,7 @@ struct ice_pf { struct ice_parser_list rss_parser_list; struct ice_parser_list perm_parser_list; struct ice_parser_list dist_parser_list; + bool init_link_status; }; #define ICE_MAX_QUEUE_NUM 2048 -- 2.9.5