diff mbox series

[v1] net/axgbe: add support for reading FW version

Message ID 20201119072607.5717-1-selwin.sebastian@amd.com (mailing list archive)
State Changes Requested, archived
Delegated to: Ferruh Yigit
Headers
Series [v1] net/axgbe: add support for reading FW version |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-testing warning Testing issues
ci/iol-intel-Functional fail Functional Testing issues
ci/Intel-compilation success Compilation OK
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/travis-robot success Travis build: passed

Commit Message

Sebastian, Selwin Nov. 19, 2020, 7:26 a.m. UTC 
  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     | 21 +++++++++++++++++++++
 drivers/net/axgbe/axgbe_rxtx.h     |  3 +++
 4 files changed, 26 insertions(+)

Comments

Sebastian, Selwin Nov. 19, 2020, 11:26 a.m. UTC | #1 
[AMD Official Use Only - Internal Distribution Only]

+Amar

-----Original Message-----
From: dev <dev-bounces@dpdk.org> On Behalf Of selwin.sebastian@amd.com
Sent: Thursday, November 19, 2020 12:56 PM
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v1] net/axgbe: add support for reading FW version

[CAUTION: External Email]

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     | 21 +++++++++++++++++++++
 drivers/net/axgbe/axgbe_rxtx.h     |  3 +++
 4 files changed, 26 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..227be33fa 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -571,6 +571,27 @@ 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;
+       char fw_ver[32];
+
+       pdata = (struct axgbe_port *)eth_dev->data->dev_private;
+       hw_feat = &pdata->hw_feat;
+
+       if (fw_version == NULL || fw_size <= 0)
+               return -EINVAL;
+
+       snprintf(fw_version, sizeof(fw_ver), "%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));
+
+       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,
--
2.17.1
Somalapuram, Amaranath Nov. 19, 2020, 11:35 a.m. UTC | #2 
-----Original Message-----
From: Sebastian, Selwin <Selwin.Sebastian@amd.com> 
Sent: Thursday, November 19, 2020 4:56 PM
To: Sebastian, Selwin <Selwin.Sebastian@amd.com>; dev@dpdk.org
Cc: Somalapuram, Amaranath <Amaranath.Somalapuram@amd.com>
Subject: RE: [dpdk-dev] [PATCH v1] net/axgbe: add support for reading FW version

[AMD Official Use Only - Internal Distribution Only]

+Amar

-----Original Message-----
From: dev <dev-bounces@dpdk.org> On Behalf Of selwin.sebastian@amd.com
Sent: Thursday, November 19, 2020 12:56 PM
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v1] net/axgbe: add support for reading FW version

[CAUTION: External Email]

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     | 21 +++++++++++++++++++++
 drivers/net/axgbe/axgbe_rxtx.h     |  3 +++
 4 files changed, 26 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..227be33fa 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -571,6 +571,27 @@ 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;
+       char fw_ver[32];
+
+       pdata = (struct axgbe_port *)eth_dev->data->dev_private;
+       hw_feat = &pdata->hw_feat;
+
+       if (fw_version == NULL || fw_size <= 0)
+               return -EINVAL;
+
+       snprintf(fw_version, sizeof(fw_ver), "%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));
+
+       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,
--
2.17.1

Acked-by: Amaranath Somalapuram <asomalap@amd.com>
Ferruh Yigit Dec. 9, 2020, 2:17 p.m. UTC | #3 
On 11/19/2020 7:26 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     | 21 +++++++++++++++++++++
>   drivers/net/axgbe/axgbe_rxtx.h     |  3 +++
>   4 files changed, 26 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..227be33fa 100644
> --- a/drivers/net/axgbe/axgbe_rxtx.c
> +++ b/drivers/net/axgbe/axgbe_rxtx.c
> @@ -571,6 +571,27 @@ 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;
> +	char fw_ver[32];

Is the 'fw_ver' variable not used at all?

> +
> +	pdata = (struct axgbe_port *)eth_dev->data->dev_private;
> +	hw_feat = &pdata->hw_feat;
> +
> +	if (fw_version == NULL || fw_size <= 0)
> +		return -EINVAL;
> +
> +	snprintf(fw_version, sizeof(fw_ver), "%d.%d.%d",

Shouldn't use 'fw_size' for size limit, instead of 'sizeof(fw_ver)'?

> +			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));
> +
> +	return 0;

if the fw version string doesn't fit into the provided buffer, this shouldn't 
ignored silently, according to the API, size of the non truncated string should 
be returned.

> +}
> +
diff mbox series

Patch

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..227be33fa 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -571,6 +571,27 @@  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;
+	char fw_ver[32];
+
+	pdata = (struct axgbe_port *)eth_dev->data->dev_private;
+	hw_feat = &pdata->hw_feat;
+
+	if (fw_version == NULL || fw_size <= 0)
+		return -EINVAL;
+
+	snprintf(fw_version, sizeof(fw_ver), "%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));
+
+	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,