patch 'net/bnxt: recheck FW readiness if in reset process' has been queued to stable release 19.11.13

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.13

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/09/22. 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.

Queued patches are on a temporary branch at:
https://github.com/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/66aae5fff0ee89ddf472eab7990fb5071f13afd2

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 66aae5fff0ee89ddf472eab7990fb5071f13afd2 Mon Sep 17 00:00:00 2001
From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Date: Wed, 27 Apr 2022 20:28:19 +0530
Subject: [PATCH] net/bnxt: recheck FW readiness if in reset process

[ upstream commit 5591bb92ced3a841398eec4444f593a22b1ca6ea ]

If Firmware is still in reset process and returns the error
HWRM_ERR_CODE_HOT_RESET_PROGRESS, retry VER_GET command.
We have to do it in bnxt_handle_if_change_status().

Fixes: 0b533591238f ("net/bnxt: inform firmware about IF state changes")

Signed-off-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur at broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
 drivers/net/bnxt/bnxt_ethdev.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index f51812f148..2acde85e96 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -133,6 +133,7 @@ static int bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev);
 static void bnxt_cancel_fw_health_check(struct bnxt *bp);
 static int bnxt_restore_vlan_filters(struct bnxt *bp);
 static void bnxt_dev_recover(void *arg);
+static int bnxt_check_fw_ready(struct bnxt *bp);
 
 int is_bnxt_in_error(struct bnxt *bp)
 {
@@ -888,6 +889,11 @@ static int bnxt_handle_if_change_status(struct bnxt *bp)
 
 	/* clear fatal flag so that re-init happens */
 	bp->flags &= ~BNXT_FLAG_FATAL_ERROR;
+
+	rc = bnxt_check_fw_ready(bp);
+	if (rc)
+		return rc;
+
 	rc = bnxt_init_resources(bp, true);
 
 	bp->flags &= ~BNXT_FLAG_IF_CHANGE_HOT_FW_RESET_DONE;
@@ -4301,7 +4307,7 @@ static int bnxt_restore_filters(struct bnxt *bp)
 
 static int bnxt_check_fw_ready(struct bnxt *bp)
 {
-	int timeout = bp->fw_reset_max_msecs;
+	int timeout = bp->fw_reset_max_msecs ? : BNXT_MAX_FW_RESET_TIMEOUT;
 	int rc = 0;
 
 	do {
-- 
2.37.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-07-07 09:54:12.197940246 +0200
+++ 0023-net-bnxt-recheck-FW-readiness-if-in-reset-process.patch	2022-07-07 09:54:10.837823826 +0200
@@ -1 +1 @@
-From 5591bb92ced3a841398eec4444f593a22b1ca6ea Mon Sep 17 00:00:00 2001
+From 66aae5fff0ee89ddf472eab7990fb5071f13afd2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5591bb92ced3a841398eec4444f593a22b1ca6ea ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 69f1117ffa..abcb534af6 100644
+index f51812f148..2acde85e96 100644
@@ -24 +25,3 @@
-@@ -177,6 +177,7 @@ static int bnxt_restore_vlan_filters(struct bnxt *bp);
+@@ -133,6 +133,7 @@ static int bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev);
+ static void bnxt_cancel_fw_health_check(struct bnxt *bp);
+ static int bnxt_restore_vlan_filters(struct bnxt *bp);
@@ -26,2 +28,0 @@
- static void bnxt_free_error_recovery_info(struct bnxt *bp);
- static void bnxt_free_rep_info(struct bnxt *bp);
@@ -32 +33 @@
-@@ -1350,6 +1351,11 @@ static int bnxt_handle_if_change_status(struct bnxt *bp)
+@@ -888,6 +889,11 @@ static int bnxt_handle_if_change_status(struct bnxt *bp)
@@ -44 +45 @@
-@@ -4324,7 +4330,7 @@ static int bnxt_restore_filters(struct bnxt *bp)
+@@ -4301,7 +4307,7 @@ static int bnxt_restore_filters(struct bnxt *bp)