patches for DPDK stable branches
 help / color / Atom feed
* [dpdk-stable] [PATCH v2] net/ice: fix link status recovery
@ 2019-11-05  5:09 Qiming Yang
  2019-11-08  5:54 ` [dpdk-stable] [dpdk-dev] " Ye Xiaolong
  2019-11-11  3:24 ` [dpdk-stable] [PATCH v3] " Qiming Yang
  0 siblings, 2 replies; 4+ messages in thread
From: Qiming Yang @ 2019-11-05  5:09 UTC (permalink / raw)
  To: dev; +Cc: wenzhuo.lu, paul.m.stillwell.jr, Qiming Yang, stable

This patch fix a kernel driver link status issue by recovering
link status when device stop.

Fixes: e6161345d8a9 ("net/ice: support link status change")
Cc: stable@dpdk.org

Signed-off-by: Qiming Yang <qiming.yang@intel.com>
---
 drivers/net/ice/ice_ethdev.c | 27 ++++++++++++++++++++++++++-
 drivers/net/ice/ice_ethdev.h |  1 +
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index d746758..212e1c7 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,26 @@ 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 +2740,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


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [dpdk-stable] [dpdk-dev] [PATCH v2] net/ice: fix link status recovery
  2019-11-05  5:09 [dpdk-stable] [PATCH v2] net/ice: fix link status recovery Qiming Yang
@ 2019-11-08  5:54 ` " Ye Xiaolong
  2019-11-11  3:24 ` [dpdk-stable] [PATCH v3] " Qiming Yang
  1 sibling, 0 replies; 4+ messages in thread
From: Ye Xiaolong @ 2019-11-08  5:54 UTC (permalink / raw)
  To: Qiming Yang; +Cc: dev, wenzhuo.lu, paul.m.stillwell.jr, stable

On 11/05, Qiming Yang wrote:
>This patch fix a kernel driver link status issue by recovering

s/fix/fixes

>link status when device stop.

s/stop/stops

>
>Fixes: e6161345d8a9 ("net/ice: support link status change")
>Cc: stable@dpdk.org
>
>Signed-off-by: Qiming Yang <qiming.yang@intel.com>
>---
> drivers/net/ice/ice_ethdev.c | 27 ++++++++++++++++++++++++++-
> drivers/net/ice/ice_ethdev.h |  1 +
> 2 files changed, 27 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
>index d746758..212e1c7 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,26 @@ ice_rxq_intr_setup(struct rte_eth_dev *dev)
> 	return 0;
> }
> 
>+static void ice_get_init_link_status(struct rte_eth_dev *dev)

Put the return type in a single line.


Thanks,
Xiaolong
>+{
>+	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 +2740,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
>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [dpdk-stable] [PATCH v3] net/ice: fix link status recovery
  2019-11-05  5:09 [dpdk-stable] [PATCH v2] net/ice: fix link status recovery Qiming Yang
  2019-11-08  5:54 ` [dpdk-stable] [dpdk-dev] " Ye Xiaolong
@ 2019-11-11  3:24 ` " Qiming Yang
  2019-11-12  1:16   ` Ye Xiaolong
  1 sibling, 1 reply; 4+ messages in thread
From: Qiming Yang @ 2019-11-11  3:24 UTC (permalink / raw)
  To: dev; +Cc: xiaolong.ye, Qiming Yang, 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 <qiming.yang@intel.com>
---
 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


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [dpdk-stable] [PATCH v3] net/ice: fix link status recovery
  2019-11-11  3:24 ` [dpdk-stable] [PATCH v3] " Qiming Yang
@ 2019-11-12  1:16   ` Ye Xiaolong
  0 siblings, 0 replies; 4+ messages in thread
From: Ye Xiaolong @ 2019-11-12  1:16 UTC (permalink / raw)
  To: Qiming Yang; +Cc: dev, stable

On 11/11, Qiming Yang wrote:
>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 <qiming.yang@intel.com>
>---
> drivers/net/ice/ice_ethdev.c | 28 +++++++++++++++++++++++++++-
> drivers/net/ice/ice_ethdev.h |  1 +
> 2 files changed, 28 insertions(+), 1 deletion(-)
>

Acked-by: Xiaolong Ye <xiaolong.ye@intel.com>

Applied to dpdk-next-net-intel. Thanks.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, back to index

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-05  5:09 [dpdk-stable] [PATCH v2] net/ice: fix link status recovery Qiming Yang
2019-11-08  5:54 ` [dpdk-stable] [dpdk-dev] " Ye Xiaolong
2019-11-11  3:24 ` [dpdk-stable] [PATCH v3] " Qiming Yang
2019-11-12  1:16   ` Ye Xiaolong

patches for DPDK stable branches

Archives are clonable:
	git clone --mirror http://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ http://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable


Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/ public-inbox