From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 43EFCA0A0E for ; Thu, 29 Apr 2021 04:35:33 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3564F4003E; Thu, 29 Apr 2021 04:35:33 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id B03B74003E; Thu, 29 Apr 2021 04:35:31 +0200 (CEST) IronPort-SDR: 0mtueFsNuS4vGaPdepb21ewGZYeSqNK+HXXBGFmhy9oJN9dmsTC8/jwbSLUCAeZ4UXZKLMJlIt PNabqr5G+JgQ== X-IronPort-AV: E=McAfee;i="6200,9189,9968"; a="184379290" X-IronPort-AV: E=Sophos;i="5.82,258,1613462400"; d="scan'208";a="184379290" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2021 19:35:30 -0700 IronPort-SDR: zuC5V2gxwlYqRDDc/p8GaW/BoVBZQY8KE5W6ZM/5I5wa7L5ag5C+LRJqb6FLOCHn7AzSCPyb7e SlmGJmhkvraA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,258,1613462400"; d="scan'208";a="458513372" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.238.175.107]) by fmsmga002.fm.intel.com with ESMTP; 28 Apr 2021 19:35:28 -0700 From: Wei Huang To: dev@dpdk.org, rosen.xu@intel.com, qi.z.zhang@intel.com Cc: stable@dpdk.org, tianfei.zhang@intel.com, ferruh.yigit@intel.com, Wei Huang Date: Wed, 28 Apr 2021 22:33:40 -0400 Message-Id: <20210429023340.39835-1-wei.huang@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <92007> References: <92007> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH v2] raw/ifpga: fix ifpga device name format X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 --- 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(-) 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.29.2