raw/ifpga: fix ifpga device name format

PATCH Applied Wei Huang 2 participants 2 messages Apr 29, 2021

Share & tools

Wei Huang

author

2021-04-29 02:35 UTC #0 lore raw

PATCH v2 1/1 raw/ifpga: fix ifpga device name format

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")

Cc [email protected]

Signed-off-by Wei Huang <[email protected]>

Acked-by Tianfei Zhang <[email protected]>

Acked-by Rosen Xu <[email protected]>

---
v2: define a macro to replace the format string

---
 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 +2 -2

index f2551be821..7ccebfa3fa 100644
@@ -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",

drivers/raw/ifpga/ifpga_rawdev.h +2 -0

index 9bbe9a4278..61c8366707 100644
@@ -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)

drivers/raw/ifpga/rte_pmd_ifpga.c +1 -1

index 6e23a2581a..23146432c2 100644
@@ -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) {

Signature · 1 line

2.29.2

Zhang, Qi Z

Applied

2021-04-29 08:23 UTC #1 lore raw

Quoted 17 lines

-----Original Message-----
From: Huang, Wei <[email protected]>
Sent: Thursday, April 29, 2021 10:34 AM
To: [email protected]; Xu, Rosen <[email protected]>; Zhang, Qi Z <[email protected]>
Cc: [email protected]; Zhang, Tianfei <[email protected]>; Yigit, Ferruh <[email protected]>; Huang, Wei <[email protected]>
Subject: [PATCH v2] raw/ifpga: fix ifpga device name format
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.

Quoted 7 lines

Fixes 9c006c45d0c5 ("raw/ifpga: scan PCIe BDF device tree")
Cc [email protected]
Signed-off-by Wei Huang <[email protected]>
Acked-by Tianfei Zhang <[email protected]>
Acked-by Rosen Xu <[email protected]>
---

Applied to dpdk-next-net-intel.

Thanks
Qi