Kernel driver shows firmware version as hex but ice PMD shows as decimal. This patch fixes the issue to make consistent with kernel driver. Fixes: ac882a0eda69 ("net/ice/base: store NVM version in extracted format") Cc: stable@dpdk.org Signed-off-by: Shougang Wang <shougangx.wang@intel.com> --- drivers/net/ice/ice_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 8d435e889..88b8428b9 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -4388,7 +4388,7 @@ ice_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size) build = hw->nvm.orom.build; ret = snprintf(fw_version, fw_size, - "%d.%d 0x%08x %d.%d.%d", + "%x.%02x 0x%08x %d.%d.%d", hw->nvm.major_ver, hw->nvm.minor_ver, hw->nvm.eetrack, -- 2.17.1
> -----Original Message----- > From: Wang, ShougangX <shougangx.wang@intel.com> > Sent: Thursday, August 6, 2020 16:25 > To: dev@dpdk.org > Cc: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z > <qi.z.zhang@intel.com>; Wang, ShougangX <shougangx.wang@intel.com>; > stable@dpdk.org > Subject: [PATCH] net/ice: fix incorrect firmware version > > Kernel driver shows firmware version as hex but ice PMD shows as decimal. > This patch fixes the issue to make consistent with kernel driver. > > Fixes: ac882a0eda69 ("net/ice/base: store NVM version in extracted format") Fix line not correct, should be the code you fixed > Cc: stable@dpdk.org > > Signed-off-by: Shougang Wang <shougangx.wang@intel.com> > --- > drivers/net/ice/ice_ethdev.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c > index 8d435e889..88b8428b9 100644 > --- a/drivers/net/ice/ice_ethdev.c > +++ b/drivers/net/ice/ice_ethdev.c > @@ -4388,7 +4388,7 @@ ice_fw_version_get(struct rte_eth_dev *dev, char > *fw_version, size_t fw_size) > build = hw->nvm.orom.build; > > ret = snprintf(fw_version, fw_size, > - "%d.%d 0x%08x %d.%d.%d", > + "%x.%02x 0x%08x %d.%d.%d", > hw->nvm.major_ver, > hw->nvm.minor_ver, > hw->nvm.eetrack, > -- > 2.17.1
Kernel driver shows firmware version as hex but ice PMD shows as decimal. This patch fixes the issue to make consistent with kernel driver. Fixes: f9204d8a23c3 ("net/ice: fix firmware version result of ethtool") Cc: stable@dpdk.org Signed-off-by: Shougang Wang <shougangx.wang@intel.com> --- v2: corrected fixes version --- drivers/net/ice/ice_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 8d435e889..88b8428b9 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -4388,7 +4388,7 @@ ice_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size) build = hw->nvm.orom.build; ret = snprintf(fw_version, fw_size, - "%d.%d 0x%08x %d.%d.%d", + "%x.%02x 0x%08x %d.%d.%d", hw->nvm.major_ver, hw->nvm.minor_ver, hw->nvm.eetrack, -- 2.17.1
> -----Original Message-----
> From: Yang, Qiming <qiming.yang@intel.com>
> Sent: Thursday, August 6, 2020 5:16 PM
> To: Wang, ShougangX <shougangx.wang@intel.com>; dev@dpdk.org
> Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; stable@dpdk.org
> Subject: RE: [PATCH] net/ice: fix incorrect firmware version
>
>
>
> > -----Original Message-----
> > From: Wang, ShougangX <shougangx.wang@intel.com>
> > Sent: Thursday, August 6, 2020 16:25
> > To: dev@dpdk.org
> > Cc: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> > <qi.z.zhang@intel.com>; Wang, ShougangX <shougangx.wang@intel.com>;
> > stable@dpdk.org
> > Subject: [PATCH] net/ice: fix incorrect firmware version
> >
> > Kernel driver shows firmware version as hex but ice PMD shows as decimal.
> > This patch fixes the issue to make consistent with kernel driver.
> >
> > Fixes: ac882a0eda69 ("net/ice/base: store NVM version in extracted
> > format")
>
> Fix line not correct, should be the code you fixed
OK, I will correct it.
Thanks
Shougang
> -----Original Message-----
> From: Wang, ShougangX <shougangx.wang@intel.com>
> Sent: Thursday, August 6, 2020 18:28
> To: dev@dpdk.org
> Cc: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; Wang, ShougangX <shougangx.wang@intel.com>;
> stable@dpdk.org
> Subject: [PATCH v2] net/ice: fix incorrect firmware version
>
> Kernel driver shows firmware version as hex but ice PMD shows as decimal.
> This patch fixes the issue to make consistent with kernel driver.
>
> Fixes: f9204d8a23c3 ("net/ice: fix firmware version result of ethtool")
> Cc: stable@dpdk.org
>
> Signed-off-by: Shougang Wang <shougangx.wang@intel.com>
> ---
> v2:
> corrected fixes version
> ---
> drivers/net/ice/ice_ethdev.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
> index 8d435e889..88b8428b9 100644
> --- a/drivers/net/ice/ice_ethdev.c
> +++ b/drivers/net/ice/ice_ethdev.c
> @@ -4388,7 +4388,7 @@ ice_fw_version_get(struct rte_eth_dev *dev, char
> *fw_version, size_t fw_size)
> build = hw->nvm.orom.build;
>
> ret = snprintf(fw_version, fw_size,
> - "%d.%d 0x%08x %d.%d.%d",
> + "%x.%02x 0x%08x %d.%d.%d",
> hw->nvm.major_ver,
> hw->nvm.minor_ver,
> hw->nvm.eetrack,
> --
> 2.17.1
Acked-by: Qiming Yang <qiming.yang@intel.com>
Kernel driver shows firmware version as hex but ice PMD shows as decimal. This patch fixes the issue to make consistent with kernel driver. Fixes: f9204d8a23c3 ("net/ice: fix firmware version result of ethtool") Cc: stable@dpdk.org Signed-off-by: Shougang Wang <shougangx.wang@intel.com> Acked-by: Qiming Yang <qiming.yang@intel.com> --- v3: code rebase v2: corrected fixes version --- drivers/net/ice/ice_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index ca1f7d42e..4170a5446 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -4415,7 +4415,7 @@ ice_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size) build = hw->flash.orom.build; ret = snprintf(fw_version, fw_size, - "%d.%d 0x%08x %d.%d.%d", + "%x.%02x 0x%08x %d.%d.%d", hw->flash.nvm.major, hw->flash.nvm.minor, hw->flash.nvm.eetrack, -- 2.17.1
> -----Original Message-----
> From: Wang, ShougangX <shougangx.wang@intel.com>
> Sent: Friday, September 11, 2020 10:41 AM
> To: dev@dpdk.org
> Cc: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; Wang, ShougangX <shougangx.wang@intel.com>;
> stable@dpdk.org
> Subject: [PATCH v3] net/ice: fix incorrect firmware version
>
> Kernel driver shows firmware version as hex but ice PMD shows as decimal.
> This patch fixes the issue to make consistent with kernel driver.
>
> Fixes: f9204d8a23c3 ("net/ice: fix firmware version result of ethtool")
> Cc: stable@dpdk.org
>
> Signed-off-by: Shougang Wang <shougangx.wang@intel.com>
> Acked-by: Qiming Yang <qiming.yang@intel.com>
Applied to dpdk-next-net-intel.
Thanks
Qi