Re: [dpdk-dev] [PATCH v2] net/axgbe: add support for reading FW version

[Ferruh Yigit <ferruh.yigit@intel.com>]

On 12/29/2020 7:09 AM, selwin.sebastian@amd.com wrote:
> From: Selwin Sebastian <selwin.sebastian@amd.com>
> 
> Added support for fw_version_get API
> 
> Signed-off-by: Selwin Sebastian <selwin.sebastian@amd.com>
> ---
>   doc/guides/nics/features/axgbe.ini |  1 +
>   drivers/net/axgbe/axgbe_ethdev.c   |  1 +
>   drivers/net/axgbe/axgbe_rxtx.c     | 25 +++++++++++++++++++++++++
>   drivers/net/axgbe/axgbe_rxtx.h     |  3 +++
>   4 files changed, 30 insertions(+)
> 
> diff --git a/doc/guides/nics/features/axgbe.ini b/doc/guides/nics/features/axgbe.ini
> index 34df0d1ee..3adc5639f 100644
> --- a/doc/guides/nics/features/axgbe.ini
> +++ b/doc/guides/nics/features/axgbe.ini
> @@ -17,6 +17,7 @@ CRC offload          = Y
>   L3 checksum offload  = Y
>   L4 checksum offload  = Y
>   Basic stats          = Y
> +FW version           = Y
>   Linux UIO            = Y
>   x86-32               = Y
>   x86-64               = Y
> diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c
> index cfe6aba73..1982c6a8e 100644
> --- a/drivers/net/axgbe/axgbe_ethdev.c
> +++ b/drivers/net/axgbe/axgbe_ethdev.c
> @@ -257,6 +257,7 @@ static const struct eth_dev_ops axgbe_eth_dev_ops = {
>   	.timesync_adjust_time         = axgbe_timesync_adjust_time,
>   	.timesync_read_time           = axgbe_timesync_read_time,
>   	.timesync_write_time          = axgbe_timesync_write_time,
> +	.fw_version_get			= axgbe_dev_fw_version_get,
>   };
>   
>   static int axgbe_phy_reset(struct axgbe_port *pdata)
> diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
> index 032e3cebc..3298a294e 100644
> --- a/drivers/net/axgbe/axgbe_rxtx.c
> +++ b/drivers/net/axgbe/axgbe_rxtx.c
> @@ -571,6 +571,31 @@ int axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
>   	return 0;
>   }
>   
> +int axgbe_dev_fw_version_get(struct rte_eth_dev *eth_dev,
> +		char *fw_version, size_t fw_size)
> +{
> +	struct axgbe_port *pdata;
> +	struct axgbe_hw_features *hw_feat;
> +	int ret;
> +
> +	pdata = (struct axgbe_port *)eth_dev->data->dev_private;
> +	hw_feat = &pdata->hw_feat;
> +
> +	if (fw_version == NULL || fw_size <= 0)

'size_t' can't be negative, no need to compare '< 0' case.

> +		return -EINVAL;
> +
> +	ret = snprintf(fw_version, fw_size, "%d.%d.%d",
> +			AXGMAC_GET_BITS(hw_feat->version, MAC_VR, USERVER),
> +			AXGMAC_GET_BITS(hw_feat->version, MAC_VR, DEVID),
> +			AXGMAC_GET_BITS(hw_feat->version, MAC_VR, SNPSVER));
> +	ret += 1; /* add the size of '\0' */
> +

'snprintf' can return error, which should be taken into account.

> +	if (fw_size < (u32)ret)

instead of casting to 'u32', can cast to 'size_t' which is the type of the 
'fw_size'.

> +		return ret;
> +	else
> +		return 0;
> +}
> +
>   static void axgbe_txq_prepare_tx_stop(struct axgbe_port *pdata,
>   				      unsigned int queue)
>   {
> diff --git a/drivers/net/axgbe/axgbe_rxtx.h b/drivers/net/axgbe/axgbe_rxtx.h
> index f2fbe9299..c2b11bb0e 100644
> --- a/drivers/net/axgbe/axgbe_rxtx.h
> +++ b/drivers/net/axgbe/axgbe_rxtx.h
> @@ -162,6 +162,9 @@ void axgbe_dev_disable_tx(struct rte_eth_dev *dev);
>   int axgbe_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id);
>   int axgbe_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id);
>   
> +int axgbe_dev_fw_version_get(struct rte_eth_dev *eth_dev,
> +			char *fw_version, size_t fw_size);
> +
>   uint16_t axgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
>   			 uint16_t nb_pkts);
>   uint16_t axgbe_xmit_pkts_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
>