From 978bb0b33f4d17f4bba38f271a8fd32cbb28d34c Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Wed, 28 Apr 2021 22:33:40 -0400 Subject: [PATCH] raw/ifpga: fix 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: stable@dpdk.org Signed-off-by: Wei Huang Acked-by: Tianfei Zhang Acked-by: Rosen Xu --- 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(-) diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c index f2551be821..7ccebfa3fa 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 9bbe9a4278..61c8366707 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) 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) { -- 2.20.1