[dpdk-stable] patch 'net/bnxt: remove excess log messages' has been queued to LTS release 16.11.9

[Luca Boccassi]

Hi,

FYI, your patch has been queued to LTS release 16.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/17/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Luca Boccassi

---
>From 4f2b1c7cbe65b129120f3502cb09a87a1d2bc560 Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajit.khaparde at broadcom.com>
Date: Fri, 28 Sep 2018 19:00:05 -0700
Subject: [PATCH] net/bnxt: remove excess log messages

[ upstream commit 6f93b2aa2da8a1b0d1c5149e88b6428ac00296a5 ]

When the firmware version and the driver HWRM version do not match,
we are logging some messages. These messages unnecessarily clutter
the logs and can add to the noise. We are logging the HWRM version
and the firmware version anyway. The difference in version numbers
can be gleaned from that. Removing the remaining log messages.

Fixes: 804e746c7b73 ("net/bnxt: add hardware resource manager init code")

Signed-off-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
 drivers/net/bnxt/bnxt_hwrm.c | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index b86a7e227f..a644fb9c91 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -381,7 +381,6 @@ int bnxt_hwrm_ver_get(struct bnxt *bp)
 	int rc = 0;
 	struct hwrm_ver_get_input req = {.req_type = 0 };
 	struct hwrm_ver_get_output *resp = bp->hwrm_cmd_resp_addr;
-	uint32_t my_version;
 	uint32_t fw_version;
 	uint16_t max_resp_len;
 	char type[RTE_MEMZONE_NAMESIZE];
@@ -407,10 +406,6 @@ int bnxt_hwrm_ver_get(struct bnxt *bp)
 	RTE_LOG(INFO, PMD, "Driver HWRM version: %d.%d.%d\n",
 		HWRM_VERSION_MAJOR, HWRM_VERSION_MINOR, HWRM_VERSION_UPDATE);
 
-	my_version = HWRM_VERSION_MAJOR << 16;
-	my_version |= HWRM_VERSION_MINOR << 8;
-	my_version |= HWRM_VERSION_UPDATE;
-
 	fw_version = resp->hwrm_intf_maj << 16;
 	fw_version |= resp->hwrm_intf_min << 8;
 	fw_version |= resp->hwrm_intf_upd;
@@ -421,21 +416,6 @@ int bnxt_hwrm_ver_get(struct bnxt *bp)
 		goto error;
 	}
 
-	if (my_version != fw_version) {
-		RTE_LOG(INFO, PMD, "BNXT Driver/HWRM API mismatch.\n");
-		if (my_version < fw_version) {
-			RTE_LOG(INFO, PMD,
-				"Firmware API version is newer than driver.\n");
-			RTE_LOG(INFO, PMD,
-				"The driver may be missing features.\n");
-		} else {
-			RTE_LOG(INFO, PMD,
-				"Firmware API version is older than driver.\n");
-			RTE_LOG(INFO, PMD,
-				"Not all driver features may be functional.\n");
-		}
-	}
-
 	if (bp->max_req_len > resp->max_req_win_len) {
 		RTE_LOG(ERR, PMD, "Unsupported request length\n");
 		rc = -EINVAL;
-- 
2.19.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-10-15 12:48:35.040780720 +0100
+++ 0017-net-bnxt-remove-excess-log-messages.patch	2018-10-15 12:48:34.581096017 +0100
@@ -1,8 +1,10 @@
-From 6f93b2aa2da8a1b0d1c5149e88b6428ac00296a5 Mon Sep 17 00:00:00 2001
+From 4f2b1c7cbe65b129120f3502cb09a87a1d2bc560 Mon Sep 17 00:00:00 2001
 From: Ajit Khaparde <ajit.khaparde at broadcom.com>
 Date: Fri, 28 Sep 2018 19:00:05 -0700
 Subject: [PATCH] net/bnxt: remove excess log messages
 
+[ upstream commit 6f93b2aa2da8a1b0d1c5149e88b6428ac00296a5 ]
+
 When the firmware version and the driver HWRM version do not match,
 we are logging some messages. These messages unnecessarily clutter
 the logs and can add to the noise. We are logging the HWRM version
@@ -10,7 +12,6 @@
 can be gleaned from that. Removing the remaining log messages.
 
 Fixes: 804e746c7b73 ("net/bnxt: add hardware resource manager init code")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
 ---
@@ -18,10 +19,10 @@
  1 file changed, 20 deletions(-)
 
 diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
-index 38698e214c..76e443ec18 100644
+index b86a7e227f..a644fb9c91 100644
 --- a/drivers/net/bnxt/bnxt_hwrm.c
 +++ b/drivers/net/bnxt/bnxt_hwrm.c
-@@ -789,7 +789,6 @@ int bnxt_hwrm_ver_get(struct bnxt *bp)
+@@ -381,7 +381,6 @@ int bnxt_hwrm_ver_get(struct bnxt *bp)
  	int rc = 0;
  	struct hwrm_ver_get_input req = {.req_type = 0 };
  	struct hwrm_ver_get_output *resp = bp->hwrm_cmd_resp_addr;
@@ -29,38 +30,38 @@
  	uint32_t fw_version;
  	uint16_t max_resp_len;
  	char type[RTE_MEMZONE_NAMESIZE];
-@@ -817,10 +816,6 @@ int bnxt_hwrm_ver_get(struct bnxt *bp)
- 	PMD_DRV_LOG(INFO, "Driver HWRM version: %d.%d.%d\n",
+@@ -407,10 +406,6 @@ int bnxt_hwrm_ver_get(struct bnxt *bp)
+ 	RTE_LOG(INFO, PMD, "Driver HWRM version: %d.%d.%d\n",
  		HWRM_VERSION_MAJOR, HWRM_VERSION_MINOR, HWRM_VERSION_UPDATE);
  
 -	my_version = HWRM_VERSION_MAJOR << 16;
 -	my_version |= HWRM_VERSION_MINOR << 8;
 -	my_version |= HWRM_VERSION_UPDATE;
 -
- 	fw_version = resp->hwrm_intf_maj_8b << 16;
- 	fw_version |= resp->hwrm_intf_min_8b << 8;
- 	fw_version |= resp->hwrm_intf_upd_8b;
-@@ -832,21 +827,6 @@ int bnxt_hwrm_ver_get(struct bnxt *bp)
+ 	fw_version = resp->hwrm_intf_maj << 16;
+ 	fw_version |= resp->hwrm_intf_min << 8;
+ 	fw_version |= resp->hwrm_intf_upd;
+@@ -421,21 +416,6 @@ int bnxt_hwrm_ver_get(struct bnxt *bp)
  		goto error;
  	}
  
 -	if (my_version != fw_version) {
--		PMD_DRV_LOG(INFO, "BNXT Driver/HWRM API mismatch.\n");
+-		RTE_LOG(INFO, PMD, "BNXT Driver/HWRM API mismatch.\n");
 -		if (my_version < fw_version) {
--			PMD_DRV_LOG(INFO,
+-			RTE_LOG(INFO, PMD,
 -				"Firmware API version is newer than driver.\n");
--			PMD_DRV_LOG(INFO,
+-			RTE_LOG(INFO, PMD,
 -				"The driver may be missing features.\n");
 -		} else {
--			PMD_DRV_LOG(INFO,
+-			RTE_LOG(INFO, PMD,
 -				"Firmware API version is older than driver.\n");
--			PMD_DRV_LOG(INFO,
+-			RTE_LOG(INFO, PMD,
 -				"Not all driver features may be functional.\n");
 -		}
 -	}
 -
  	if (bp->max_req_len > resp->max_req_win_len) {
- 		PMD_DRV_LOG(ERR, "Unsupported request length\n");
+ 		RTE_LOG(ERR, PMD, "Unsupported request length\n");
  		rc = -EINVAL;
 -- 
 2.19.1