* [dpdk-dev] [PATCH] net/ice: fix firmware-version in the drvinfo result of ethtool
@ 2019-01-10 5:22 Leyi Rong
2019-01-10 12:08 ` Zhang, Qi Z
0 siblings, 1 reply; 2+ messages in thread
From: Leyi Rong @ 2019-01-10 5:22 UTC (permalink / raw)
To: Qiming Yang, Wenzhuo Lu; +Cc: dev, Leyi Rong
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>
---
drivers/net/ice/ice_ethdev.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 0a81e04..5545f38 100644
--- 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;
--
2.7.4
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [dpdk-dev] [PATCH] net/ice: fix firmware-version in the drvinfo result of ethtool
2019-01-10 5:22 [dpdk-dev] [PATCH] net/ice: fix firmware-version in the drvinfo result of ethtool Leyi Rong
@ 2019-01-10 12:08 ` Zhang, Qi Z
0 siblings, 0 replies; 2+ messages in thread
From: Zhang, Qi Z @ 2019-01-10 12:08 UTC (permalink / raw)
To: Rong, Leyi, Yang, Qiming, Lu, Wenzhuo; +Cc: dev, Rong, Leyi
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Leyi Rong
> Sent: Thursday, January 10, 2019 1:22 PM
> To: Yang, Qiming <qiming.yang@intel.com>; Lu, Wenzhuo
> <wenzhuo.lu@intel.com>
> Cc: dev@dpdk.org; Rong, Leyi <leyi.rong@intel.com>
> Subject: [dpdk-dev] [PATCH] net/ice: fix firmware-version in the drvinfo 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>
Applied to dpdk-next-net-intel.
Thanks
Qi
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-10 12:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-10 5:22 [dpdk-dev] [PATCH] net/ice: fix firmware-version in the drvinfo result of ethtool Leyi Rong
2019-01-10 12:08 ` Zhang, Qi Z
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).