[dpdk-stable] patch 'net/bnxt: use macro for PCI log format' has been queued to LTS release 18.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.7

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/20/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.

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/925656b9fea38136b8cd0e35825640c0c133fec4

Thanks.

Kevin.

---
>From 925656b9fea38136b8cd0e35825640c0c133fec4 Mon Sep 17 00:00:00 2001
From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Date: Thu, 16 Jan 2020 18:34:53 +0530
Subject: [PATCH] net/bnxt: use macro for PCI log format

[ upstream commit 537a053a79196db4999f7d956d00f822e95e9969 ]

Fixes: 19e6af01bb36 ("net/bnxt: support get/set EEPROM")

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

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index ed7f1f44b9..6d7c430030 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -2910,7 +2910,7 @@ bnxt_get_eeprom_length_op(struct rte_eth_dev *dev)
 	uint32_t entry_length;
 
-	PMD_DRV_LOG(INFO, "%04x:%02x:%02x:%02x\n",
-		bp->pdev->addr.domain, bp->pdev->addr.bus,
-		bp->pdev->addr.devid, bp->pdev->addr.function);
+	PMD_DRV_LOG(INFO, PCI_PRI_FMT "\n",
+		    bp->pdev->addr.domain, bp->pdev->addr.bus,
+		    bp->pdev->addr.devid, bp->pdev->addr.function);
 
 	rc = bnxt_hwrm_nvm_get_dir_info(bp, &dir_entries, &entry_length);
@@ -2929,8 +2929,8 @@ bnxt_get_eeprom_op(struct rte_eth_dev *dev,
 	uint32_t offset;
 
-	PMD_DRV_LOG(INFO, "%04x:%02x:%02x:%02x in_eeprom->offset = %d "
-		"len = %d\n", bp->pdev->addr.domain,
-		bp->pdev->addr.bus, bp->pdev->addr.devid,
-		bp->pdev->addr.function, in_eeprom->offset, in_eeprom->length);
+	PMD_DRV_LOG(INFO, PCI_PRI_FMT " in_eeprom->offset = %d len = %d\n",
+		    bp->pdev->addr.domain, bp->pdev->addr.bus,
+		    bp->pdev->addr.devid, bp->pdev->addr.function,
+		    in_eeprom->offset, in_eeprom->length);
 
 	if (in_eeprom->offset == 0) /* special offset value to get directory */
@@ -3000,8 +3000,8 @@ bnxt_set_eeprom_op(struct rte_eth_dev *dev,
 	uint16_t type, ext, ordinal, attr;
 
-	PMD_DRV_LOG(INFO, "%04x:%02x:%02x:%02x in_eeprom->offset = %d "
-		"len = %d\n", bp->pdev->addr.domain,
-		bp->pdev->addr.bus, bp->pdev->addr.devid,
-		bp->pdev->addr.function, in_eeprom->offset, in_eeprom->length);
+	PMD_DRV_LOG(INFO, PCI_PRI_FMT " in_eeprom->offset = %d len = %d\n",
+		    bp->pdev->addr.domain, bp->pdev->addr.bus,
+		    bp->pdev->addr.devid, bp->pdev->addr.function,
+		    in_eeprom->offset, in_eeprom->length);
 
 	if (!BNXT_PF(bp)) {
-- 
2.21.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-14 17:02:37.929448169 +0000
+++ 0016-net-bnxt-use-macro-for-PCI-log-format.patch	2020-02-14 17:02:36.948408001 +0000
@@ -1 +1 @@
-From 537a053a79196db4999f7d956d00f822e95e9969 Mon Sep 17 00:00:00 2001
+From 925656b9fea38136b8cd0e35825640c0c133fec4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 537a053a79196db4999f7d956d00f822e95e9969 ]
+
@@ -7 +8,0 @@
-Cc: stable at dpdk.org
@@ -16 +17 @@
-index 26614186f5..ba3f0a7d96 100644
+index ed7f1f44b9..6d7c430030 100644
@@ -19,2 +20,2 @@
-@@ -3594,7 +3594,7 @@ bnxt_get_eeprom_length_op(struct rte_eth_dev *dev)
- 		return rc;
+@@ -2910,7 +2910,7 @@ bnxt_get_eeprom_length_op(struct rte_eth_dev *dev)
+ 	uint32_t entry_length;
@@ -30,2 +31,2 @@
-@@ -3618,8 +3618,8 @@ bnxt_get_eeprom_op(struct rte_eth_dev *dev,
- 		return rc;
+@@ -2929,8 +2929,8 @@ bnxt_get_eeprom_op(struct rte_eth_dev *dev,
+ 	uint32_t offset;
@@ -43,2 +44,2 @@
-@@ -3694,8 +3694,8 @@ bnxt_set_eeprom_op(struct rte_eth_dev *dev,
- 		return rc;
+@@ -3000,8 +3000,8 @@ bnxt_set_eeprom_op(struct rte_eth_dev *dev,
+ 	uint16_t type, ext, ordinal, attr;