net/ice: fix firmware version result of ethtool

Fix the drvinfo dumped firmware-version when using dpdk ethtool,
change it to the same result as Linux ethtool shown info.

Fixes: e31cb9a36298 ("net/ice: support FW version getting")

Signed-off-by: Leyi Rong <leyi.rong@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 0a81e04..5545f38 100644 (file)
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -2590,11 +2590,22 @@ static int
 ice_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size)
 {
        struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       u32 full_ver;
+       u8 ver, patch;
+       u16 build;
        int ret;
 
-       ret = snprintf(fw_version, fw_size, "%d.%d.%05d %d.%d",
-                      hw->fw_maj_ver, hw->fw_min_ver, hw->fw_build,
-                      hw->api_maj_ver, hw->api_min_ver);
+       full_ver = hw->nvm.oem_ver;
+       ver = (u8)(full_ver >> 24);
+       build = (u16)((full_ver >> 8) & 0xffff);
+       patch = (u8)(full_ver & 0xff);
+
+       ret = snprintf(fw_version, fw_size,
+                       "%d.%d%d 0x%08x %d.%d.%d",
+                       ((hw->nvm.ver >> 12) & 0xf),
+                       ((hw->nvm.ver >> 4) & 0xff),
+                       (hw->nvm.ver & 0xf), hw->nvm.eetrack,
+                       ver, build, patch);
 
        /* add the size of '\0' */
        ret += 1;