[dpdk-stable] patch 'net/bnxt: fix port stop on error recovery failure' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/19/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 403641055b702973adbcecc2c199f12c5428b737 Mon Sep 17 00:00:00 2001
From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Date: Thu, 6 Feb 2020 22:03:12 +0530
Subject: [PATCH] net/bnxt: fix port stop on error recovery failure

[ upstream commit e5acec69294891c3bdd18c2a8177de74fb435c2d ]

During live FW upgrade or error recovery, if restoring the filter
settings fail after port start, driver invokes bnxt_uninit_resources()
only. Fix it to invoke bnxt_dev_stop_op() first before calling
bnxt_uninit_resources().

Fixes: df6cd7c1f73a ("net/bnxt: handle reset notify async event from FW")

Signed-off-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur at broadcom.com>
Reviewed-by: Rahul Gupta <rahul.gupta at broadcom.com>
---
 drivers/net/bnxt/bnxt_ethdev.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index f123c823e3..9ac63fd6d1 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -3856,15 +3856,17 @@ static void bnxt_dev_recover(void *arg)
 	rc = bnxt_dev_start_op(bp->eth_dev);
 	if (rc) {
 		PMD_DRV_LOG(ERR, "Failed to start port after reset\n");
-		goto err;
+		goto err_start;
 	}
 
 	rc = bnxt_restore_filters(bp);
 	if (rc)
-		goto err;
+		goto err_start;
 
 	PMD_DRV_LOG(INFO, "Recovered from FW reset\n");
 	return;
+err_start:
+	bnxt_dev_stop_op(bp->eth_dev);
 err:
 	bp->flags |= BNXT_FLAG_FATAL_ERROR;
 	bnxt_uninit_resources(bp, false);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-17 17:00:15.885606197 +0000
+++ 0020-net-bnxt-fix-port-stop-on-error-recovery-failure.patch	2020-02-17 17:00:15.307950455 +0000
@@ -1,15 +1,16 @@
-From e5acec69294891c3bdd18c2a8177de74fb435c2d Mon Sep 17 00:00:00 2001
+From 403641055b702973adbcecc2c199f12c5428b737 Mon Sep 17 00:00:00 2001
 From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
 Date: Thu, 6 Feb 2020 22:03:12 +0530
 Subject: [PATCH] net/bnxt: fix port stop on error recovery failure
 
+[ upstream commit e5acec69294891c3bdd18c2a8177de74fb435c2d ]
+
 During live FW upgrade or error recovery, if restoring the filter
 settings fail after port start, driver invokes bnxt_uninit_resources()
 only. Fix it to invoke bnxt_dev_stop_op() first before calling
 bnxt_uninit_resources().
 
 Fixes: df6cd7c1f73a ("net/bnxt: handle reset notify async event from FW")
-Cc: stable at dpdk.org
 
 Signed-off-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
 Reviewed-by: Somnath Kotur <somnath.kotur at broadcom.com>
@@ -19,10 +20,10 @@
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
-index 7147cc8fe2..3c40f4b599 100644
+index f123c823e3..9ac63fd6d1 100644
 --- a/drivers/net/bnxt/bnxt_ethdev.c
 +++ b/drivers/net/bnxt/bnxt_ethdev.c
-@@ -4022,15 +4022,17 @@ static void bnxt_dev_recover(void *arg)
+@@ -3856,15 +3856,17 @@ static void bnxt_dev_recover(void *arg)
  	rc = bnxt_dev_start_op(bp->eth_dev);
  	if (rc) {
  		PMD_DRV_LOG(ERR, "Failed to start port after reset\n");