From: Zerun Fu <zerun...@corigine.com>
The original logic try to get the NSP resource every time the application
call 'rte_eth_dev_fw_version_get()' interface, there are chances the NSP
resource busy and fail to get it. And because the local string variables
not initialized, there will be out of range problem when it fail to get
the NSP resource.
Fix this by initializing the local string variables and storing the
firmware version string once we get it.
Fixes: 128c8ad951bf ("net/nfp: support getting firmware version")
Cc: sta...@dpdk.org
Signed-off-by: Zerun Fu <zerun...@corigine.com>
Reviewed-by: Chaoyong He <chaoyong...@corigine.com>
Reviewed-by: Long Wu <long...@corigine.com>
Reviewed-by: Peng Zhang <peng.zh...@corigine.com>
---
drivers/net/nfp/nfp_net_common.c | 26 ++++++++++++++++++--------
drivers/net/nfp/nfp_net_common.h | 6 ++++++
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index a6573ed45c..84893e2d73 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -193,9 +193,6 @@ nfp_net_notify_port_speed(struct nfp_net_hw *hw,
nfp_net_link_speed_rte2nfp(link->link_speed));
}
-/* The length of firmware version string */
-#define FW_VER_LEN 32
-
/**
* Reconfigure the firmware of VF configure
*
@@ -2274,11 +2271,11 @@ nfp_net_firmware_version_get(struct rte_eth_dev *dev,
size_t fw_size)
{
struct nfp_net_hw *hw;
- char mip_name[FW_VER_LEN];
- char app_name[FW_VER_LEN];
- char nsp_version[FW_VER_LEN];
- char vnic_version[FW_VER_LEN];
struct nfp_net_hw_priv *hw_priv;
+ char app_name[FW_VER_LEN] = {0};
+ char mip_name[FW_VER_LEN] = {0};
+ char nsp_version[FW_VER_LEN] = {0};
+ char vnic_version[FW_VER_LEN] = {0};
if (fw_size < FW_VER_LEN)
return FW_VER_LEN;
@@ -2286,6 +2283,11 @@ nfp_net_firmware_version_get(struct rte_eth_dev *dev,
hw = nfp_net_get_hw(dev);
hw_priv = dev->process_private;
+ if (hw->fw_version[0] != 0) {
+ snprintf(fw_version, FW_VER_LEN, "%s", hw->fw_version);
+ return 0;
+ }
+
if (!rte_eth_dev_is_repr(dev)) {
snprintf(vnic_version, FW_VER_LEN, "%d.%d.%d.%d",
hw->ver.extend, hw->ver.class,
@@ -2298,8 +2300,16 @@ nfp_net_firmware_version_get(struct rte_eth_dev *dev,
nfp_net_get_mip_name(hw_priv, mip_name);
nfp_net_get_app_name(hw_priv, app_name);
- snprintf(fw_version, FW_VER_LEN, "%s %s %s %s",
+ if (nsp_version[0] == 0 || mip_name[0] == 0) {
+ snprintf(fw_version, FW_VER_LEN, "%s %s %s %s",
vnic_version, nsp_version, mip_name, app_name);
+ return 0;
+ }
+
+ snprintf(hw->fw_version, FW_VER_LEN, "%s %s %s %s",
+ vnic_version, nsp_version, mip_name, app_name);
+
+ snprintf(fw_version, FW_VER_LEN, "%s", hw->fw_version);
return 0;
}
diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h
index 6c739891be..3c4d305b01 100644
--- a/drivers/net/nfp/nfp_net_common.h
+++ b/drivers/net/nfp/nfp_net_common.h
@@ -50,6 +50,9 @@
RTE_ETH_RSS_NONFRAG_IPV6_UDP | \
RTE_ETH_RSS_NONFRAG_IPV6_SCTP)
+/* The length of firmware version string */
+#define FW_VER_LEN 32
+
/*
* Each PF has corresponding word to beat:
* Offset | Usage
@@ -255,6 +258,9 @@ struct nfp_net_hw {
/** Used for rte_flow of CoreNIC firmware */
struct nfp_net_priv *priv;
+
+ /** Used for firmware version */
+ char fw_version[FW_VER_LEN];
};
static inline uint32_t
--
2.39.1
