[dpdk-stable] patch 'net/bnxt: fix FW version query' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/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 e428b51c180ef54098f846e4c81681965d2e4f2f Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajit.khaparde at broadcom.com>
Date: Wed, 6 May 2020 22:43:28 -0700
Subject: [PATCH] net/bnxt: fix FW version query

[ upstream commit cfa9e98d3c135e4f937265263feb7377330219f6 ]

bnxt_fw_version_get is not indicating the complete FW version.
Fix it to indicate complete version string.

Fixes: e2652b0a20a0 ("net/bnxt: support get FW version")

Signed-off-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
 drivers/net/bnxt/bnxt_ethdev.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index fe134108b6..c1e5dfa936 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -2171,10 +2171,11 @@ bnxt_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size)
 	uint8_t fw_major = (bp->fw_ver >> 24) & 0xff;
 	uint8_t fw_minor = (bp->fw_ver >> 16) & 0xff;
 	uint8_t fw_updt = (bp->fw_ver >> 8) & 0xff;
+	uint8_t fw_rsvd = bp->fw_ver & 0xff;
 	int ret;
 
-	ret = snprintf(fw_version, fw_size, "%d.%d.%d",
-			fw_major, fw_minor, fw_updt);
+	ret = snprintf(fw_version, fw_size, "%d.%d.%d.%d",
+			fw_major, fw_minor, fw_updt, fw_rsvd);
 
 	ret += 1; /* add the size of '\0' */
 	if (fw_size < (uint32_t)ret)
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:52.578226630 +0100
+++ 0196-net-bnxt-fix-FW-version-query.patch	2020-05-19 14:04:44.556654535 +0100
@@ -1,13 +1,14 @@
-From cfa9e98d3c135e4f937265263feb7377330219f6 Mon Sep 17 00:00:00 2001
+From e428b51c180ef54098f846e4c81681965d2e4f2f Mon Sep 17 00:00:00 2001
 From: Ajit Khaparde <ajit.khaparde at broadcom.com>
 Date: Wed, 6 May 2020 22:43:28 -0700
 Subject: [PATCH] net/bnxt: fix FW version query
 
+[ upstream commit cfa9e98d3c135e4f937265263feb7377330219f6 ]
+
 bnxt_fw_version_get is not indicating the complete FW version.
 Fix it to indicate complete version string.
 
 Fixes: e2652b0a20a0 ("net/bnxt: support get FW version")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
 ---
@@ -15,10 +16,10 @@
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
-index dab291c7ce..ee0550b324 100644
+index fe134108b6..c1e5dfa936 100644
 --- a/drivers/net/bnxt/bnxt_ethdev.c
 +++ b/drivers/net/bnxt/bnxt_ethdev.c
-@@ -2404,10 +2404,11 @@ bnxt_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size)
+@@ -2171,10 +2171,11 @@ bnxt_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size)
  	uint8_t fw_major = (bp->fw_ver >> 24) & 0xff;
  	uint8_t fw_minor = (bp->fw_ver >> 16) & 0xff;
  	uint8_t fw_updt = (bp->fw_ver >> 8) & 0xff;