[dpdk-stable] patch 'raw/ifpga: fix device name format' has been queued to stable release 20.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.2

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

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/5c4358f054270a6b051391a23a2c9bec7085c693

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 5c4358f054270a6b051391a23a2c9bec7085c693 Mon Sep 17 00:00:00 2001
From: Wei Huang <wei.huang at intel.com>
Date: Wed, 28 Apr 2021 22:33:40 -0400
Subject: [PATCH] raw/ifpga: fix device name format
Cc: Luca Boccassi <bluca at debian.org>

[ upstream commit 978bb0b33f4d17f4bba38f271a8fd32cbb28d34c ]

The device name format used in ifpga_rawdev_create() was changed to
"IFPGA:%02x:%02x.%x", but the format used in ifpga_rawdev_destroy()
was left as "IFPGA:%x:%02x.%x", it should be changed synchronously.

To prevent further similar errors, macro "IFPGA_RAWDEV_NAME_FMT" is
defined to replace this format string.

Fixes: 9c006c45d0c5 ("raw/ifpga: scan PCIe BDF device tree")

Signed-off-by: Wei Huang <wei.huang at intel.com>
Acked-by: Tianfei Zhang <tianfei.zhang at intel.com>
Acked-by: Rosen Xu <rosen.xu at intel.com>
---
 drivers/raw/ifpga/ifpga_rawdev.c | 4 ++--
 drivers/raw/ifpga/ifpga_rawdev.h | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
index 27129b133e..4747090af1 100644
--- a/drivers/raw/ifpga/ifpga_rawdev.c
+++ b/drivers/raw/ifpga/ifpga_rawdev.c
@@ -1448,7 +1448,7 @@ ifpga_rawdev_create(struct rte_pci_device *pci_dev,
 	}
 
 	memset(name, 0, sizeof(name));
-	snprintf(name, RTE_RAWDEV_NAME_MAX_LEN, "IFPGA:%02x:%02x.%x",
+	snprintf(name, RTE_RAWDEV_NAME_MAX_LEN, IFPGA_RAWDEV_NAME_FMT,
 		pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function);
 
 	IFPGA_RAWDEV_PMD_INFO("Init %s on NUMA node %d", name, rte_socket_id());
@@ -1551,7 +1551,7 @@ ifpga_rawdev_destroy(struct rte_pci_device *pci_dev)
 	}
 
 	memset(name, 0, sizeof(name));
-	snprintf(name, RTE_RAWDEV_NAME_MAX_LEN, "IFPGA:%x:%02x.%x",
+	snprintf(name, RTE_RAWDEV_NAME_MAX_LEN, IFPGA_RAWDEV_NAME_FMT,
 		pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function);
 
 	IFPGA_RAWDEV_PMD_INFO("Closing %s on NUMA node %d",
diff --git a/drivers/raw/ifpga/ifpga_rawdev.h b/drivers/raw/ifpga/ifpga_rawdev.h
index 7754beb02b..5c3ecd35d6 100644
--- a/drivers/raw/ifpga/ifpga_rawdev.h
+++ b/drivers/raw/ifpga/ifpga_rawdev.h
@@ -7,6 +7,8 @@
 
 extern int ifpga_rawdev_logtype;
 
+#define IFPGA_RAWDEV_NAME_FMT "IFPGA:%02x:%02x.%x"
+
 #define IFPGA_RAWDEV_PMD_LOG(level, fmt, args...) \
 	rte_log(RTE_LOG_ ## level, ifpga_rawdev_logtype, "%s(): " fmt "\n", \
 				__func__, ##args)
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-06-12 06:53:58.149019000 +0800
+++ 0058-raw-ifpga-fix-device-name-format.patch	2021-06-12 06:53:56.290000000 +0800
@@ -1 +1 @@
-From 978bb0b33f4d17f4bba38f271a8fd32cbb28d34c Mon Sep 17 00:00:00 2001
+From 5c4358f054270a6b051391a23a2c9bec7085c693 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit 978bb0b33f4d17f4bba38f271a8fd32cbb28d34c ]
@@ -14 +16,0 @@
-Cc: stable at dpdk.org
@@ -20,4 +22,3 @@
- drivers/raw/ifpga/ifpga_rawdev.c  | 4 ++--
- drivers/raw/ifpga/ifpga_rawdev.h  | 2 ++
- drivers/raw/ifpga/rte_pmd_ifpga.c | 2 +-
- 3 files changed, 5 insertions(+), 3 deletions(-)
+ drivers/raw/ifpga/ifpga_rawdev.c | 4 ++--
+ drivers/raw/ifpga/ifpga_rawdev.h | 2 ++
+ 2 files changed, 4 insertions(+), 2 deletions(-)
@@ -26 +27 @@
-index f2551be821..7ccebfa3fa 100644
+index 27129b133e..4747090af1 100644
@@ -48 +49 @@
-index 9bbe9a4278..61c8366707 100644
+index 7754beb02b..5c3ecd35d6 100644
@@ -60,13 +60,0 @@
-diff --git a/drivers/raw/ifpga/rte_pmd_ifpga.c b/drivers/raw/ifpga/rte_pmd_ifpga.c
-index 6e23a2581a..23146432c2 100644
---- a/drivers/raw/ifpga/rte_pmd_ifpga.c
-+++ b/drivers/raw/ifpga/rte_pmd_ifpga.c
-@@ -34,7 +34,7 @@ rte_pmd_ifpga_get_dev_id(const char *pci_addr, uint16_t *dev_id)
- 		return -EINVAL;
- 	}
- 
--	snprintf(rdev_name, RTE_RAWDEV_NAME_MAX_LEN, "IFPGA:%02x:%02x.%x",
-+	snprintf(rdev_name, RTE_RAWDEV_NAME_MAX_LEN, IFPGA_RAWDEV_NAME_FMT,
- 		addr.bus, addr.devid, addr.function);
- 	rdev = rte_rawdev_pmd_get_named_dev(rdev_name);
- 	if (!rdev) {