[dpdk-stable] patch 'net/bnxt: fix resource qcaps with older FW' has been queued to LTS release 18.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.6

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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/65bcaa3d86eb230bb9b9f53762db52d5e847d00b

Thanks.

Kevin.

---
>From 65bcaa3d86eb230bb9b9f53762db52d5e847d00b Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajit.khaparde at broadcom.com>
Date: Mon, 18 Nov 2019 14:23:45 -0800
Subject: [PATCH] net/bnxt: fix resource qcaps with older FW

[ upstream commit 89a0deb866dc42ead92b79e6e7159622e1ab8490 ]

On some old versions of FW, bnxt_hwrm_func_resc_qcaps can return an
error. This is because the command was not implemented completely
in FW till the subsequent version. Ignore the error and continue with
the driver initialization.

Fixes: edafb57ba4a1 ("net/bnxt: fix VF resource allocation")

Signed-off-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur at broadcom.com>
---
 drivers/net/bnxt/bnxt_hwrm.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 614cd47c5..1f26fb499 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -612,5 +612,10 @@ int bnxt_hwrm_func_qcaps(struct bnxt *bp)
 	}
 
-	return rc;
+	/* On older FW,
+	 * bnxt_hwrm_func_resc_qcaps can fail and cause init failure.
+	 * But the error can be ignored. Return success.
+	 */
+
+	return 0;
 }
 
@@ -765,5 +770,5 @@ int bnxt_hwrm_func_resc_qcaps(struct bnxt *bp)
 	rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
 
-	HWRM_CHECK_RESULT();
+	HWRM_CHECK_RESULT_SILENT();
 
 	if (BNXT_VF(bp)) {
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-11 21:24:15.961935588 +0000
+++ 0041-net-bnxt-fix-resource-qcaps-with-older-FW.patch	2019-12-11 21:24:12.690650742 +0000
@@ -1 +1 @@
-From 89a0deb866dc42ead92b79e6e7159622e1ab8490 Mon Sep 17 00:00:00 2001
+From 65bcaa3d86eb230bb9b9f53762db52d5e847d00b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 89a0deb866dc42ead92b79e6e7159622e1ab8490 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 2cba007ea..1d3732eee 100644
+index 614cd47c5..1f26fb499 100644
@@ -24 +25 @@
-@@ -693,5 +693,10 @@ int bnxt_hwrm_func_qcaps(struct bnxt *bp)
+@@ -612,5 +612,10 @@ int bnxt_hwrm_func_qcaps(struct bnxt *bp)
@@ -36 +37 @@
-@@ -902,5 +907,5 @@ int bnxt_hwrm_func_resc_qcaps(struct bnxt *bp)
+@@ -765,5 +770,5 @@ int bnxt_hwrm_func_resc_qcaps(struct bnxt *bp)