net/axgbe: add support for reading FW version
PATCH 1/1 net/axgbe: add support for reading FW version
From: Selwin Sebastian <[email protected]>
Added support for fw_version_get API
--- 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(+)
doc/guides/nics/features/axgbe.ini +1 -0
@@ -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
drivers/net/axgbe/axgbe_ethdev.c +1 -0
@@ -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)
drivers/net/axgbe/axgbe_rxtx.c +21 -0
@@ -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) {
drivers/net/axgbe/axgbe_rxtx.h +3 -0
@@ -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,
Signature · 1 line
2.17.1
[AMD Official Use Only - Internal Distribution Only]
+Amar
-----Original Message-----
From: dev <[email protected]> On Behalf Of [email protected]
Sent: Thursday, November 19, 2020 12:56 PM
To: [email protected]
Subject: [dpdk-dev] [PATCH v1] net/axgbe: add support for reading FW version
[CAUTION: External Email]
From: Selwin Sebastian <[email protected]>
Added support for fw_version_get API
--- 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(+)
doc/guides/nics/features/axgbe.ini +1 -0
@@ -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
drivers/net/axgbe/axgbe_ethdev.c +1 -0
@@ -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
drivers/net/axgbe/axgbe_rxtx.c +25 -2
@@ -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
Acked-by Amaranath Somalapuram-----Original Message-----
From: Sebastian, Selwin <[email protected]>
Sent: Thursday, November 19, 2020 4:56 PM
To: Sebastian, Selwin <[email protected]>; [email protected]
Cc: Somalapuram, Amaranath <[email protected]>
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 <[email protected]> On Behalf Of [email protected]
Sent: Thursday, November 19, 2020 12:56 PM
To: [email protected]
Subject: [dpdk-dev] [PATCH v1] net/axgbe: add support for reading FW version
[CAUTION: External Email]
From: Selwin Sebastian <[email protected]>
Added support for fw_version_get API
--- 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(+)
doc/guides/nics/features/axgbe.ini +1 -0
@@ -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
drivers/net/axgbe/axgbe_ethdev.c +1 -0
@@ -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
drivers/net/axgbe/axgbe_rxtx.c +25 -2
@@ -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
Quoted 41 lines · On 11/19/2020 7:26 AM, [email protected] wrote:
From: Selwin Sebastian <[email protected]>
Added support for
fw_version_getAPISigned-off-by Selwin Sebastian <[email protected]>--- 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(+)doc/guides/nics/features/axgbe.ini +1
-0@@ -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 = Ydrivers/net/axgbe/axgbe_ethdev.c +1
-0@@ -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)drivers/net/axgbe/axgbe_rxtx.c +0
-0
drivers/net/axgbe/axgbe_rxtx.c int axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, · line 579
Quoted 9 lines
drivers/net/axgbe/axgbe_rxtx.c +6
-0@@ -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?
drivers/net/axgbe/axgbe_rxtx.c int axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, · line 587
Quoted 8 lines
drivers/net/axgbe/axgbe_rxtx.c +8
-0+ + 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)'?
drivers/net/axgbe/axgbe_rxtx.c int axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, · line 592
Quoted 5 lines
drivers/net/axgbe/axgbe_rxtx.c +5
-0+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.
Quoted 2 lines
drivers/net/axgbe/axgbe_rxtx.c +2
-0+} +
PATCH v2 1/1 net/axgbe: add support for reading FW version
From: Selwin Sebastian <[email protected]>
Added support for fw_version_get API
--- 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(+)
doc/guides/nics/features/axgbe.ini +1 -0
@@ -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
drivers/net/axgbe/axgbe_ethdev.c +1 -0
@@ -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)
drivers/net/axgbe/axgbe_rxtx.c +25 -0
@@ -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 ) +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' */ + +if (fw_size < (u32 )ret) +return ret; +else +return 0 ; +} +static void axgbe_txq_prepare_tx_stop (struct axgbe_port *pdata,unsigned int queue) {
drivers/net/axgbe/axgbe_rxtx.h +3 -0
@@ -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,
Signature · 1 line
2.17.1
-----Original Message-----
From: Sebastian, Selwin <[email protected]>
Sent: Tuesday, December 29, 2020 12:40 PM
To: [email protected]
Cc: Somalapuram, Amaranath <[email protected]>; [email protected]
Subject: [PATCH v2] net/axgbe: add support for reading FW version
From: Selwin Sebastian <[email protected]>
Added support for fw_version_get API
--- 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(+)
doc/guides/nics/features/axgbe.ini +1 -0
@@ -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
drivers/net/axgbe/axgbe_ethdev.c +1 -0
@@ -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
drivers/net/axgbe/axgbe_rxtx.c +25 -0
@@ -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 ) +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' */ + +if (fw_size < (u32 )ret) +return ret; +else +return 0 ; +} +static void axgbe_txq_prepare_tx_stop (struct axgbe_port *pdata,unsigned int queue) {
drivers/net/axgbe/axgbe_rxtx.h +3 -1
@@ -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
Quoted 45 lines · On 12/29/2020 7:09 AM, [email protected] wrote:
From: Selwin Sebastian <[email protected]>
Added support for
fw_version_getAPISigned-off-by Selwin Sebastian <[email protected]>--- 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(+)doc/guides/nics/features/axgbe.ini +1
-0@@ -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 = Ydrivers/net/axgbe/axgbe_ethdev.c +1
-0@@ -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)drivers/net/axgbe/axgbe_rxtx.c +1
-0@@ -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,
drivers/net/axgbe/axgbe_rxtx.c int axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, · line 584
Quoted 10 lines
drivers/net/axgbe/axgbe_rxtx.c +10
-0+ 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.
drivers/net/axgbe/axgbe_rxtx.c int axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, · line 592
Quoted 8 lines
drivers/net/axgbe/axgbe_rxtx.c +8
-0+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.
drivers/net/axgbe/axgbe_rxtx.c int axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, · line 593
Quoted 1 line
drivers/net/axgbe/axgbe_rxtx.c +1
-0+if (fw_size < (u32 )ret)
instead of casting to 'u32', can cast to 'size_t' which is the type of the 'fw_size'.
Quoted 23 lines
drivers/net/axgbe/axgbe_rxtx.c +5
-0+return ret; + else + return 0; +} +static void axgbe_txq_prepare_tx_stop (struct axgbe_port *pdata,unsigned int queue) {drivers/net/axgbe/axgbe_rxtx.h +3
-0@@ -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,
PATCH v3 1/1 net/axgbe: add support for reading FW version
From: Selwin Sebastian <[email protected]>
Added support for fw_version_get API
--- doc/guides/nics/features/axgbe.ini | 1 + drivers/net/axgbe/axgbe_ethdev.c | 1 + drivers/net/axgbe/axgbe_rxtx.c | 28 ++++++++++++++++++++++++++++ drivers/net/axgbe/axgbe_rxtx.h | 3 +++ 4 files changed, 33 insertions(+)
doc/guides/nics/features/axgbe.ini +1 -0
@@ -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
drivers/net/axgbe/axgbe_ethdev.c +1 -0
@@ -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)
drivers/net/axgbe/axgbe_rxtx.c +28 -0
@@ -571,6 +571,34 @@ 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 ) +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 )); +if (ret <0 ) +return -EINVAL ; + + ret +=1 ;/* add the size of '\0' */ + +if (fw_size < (size_t )ret) +return ret; +else +return 0 ; +} +static void axgbe_txq_prepare_tx_stop (struct axgbe_port *pdata,unsigned int queue) {
drivers/net/axgbe/axgbe_rxtx.h +3 -0
@@ -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,
Signature · 1 line
2.17.1
-----Original Message-----
From: Sebastian, Selwin <[email protected]>
Sent: Wednesday, January 6, 2021 1:31 PM
To: [email protected]
Cc: Somalapuram, Amaranath <[email protected]>; [email protected]
Subject: [PATCH v3] net/axgbe: add support for reading FW version
From: Selwin Sebastian <[email protected]>
Added support for fw_version_get API
--- doc/guides/nics/features/axgbe.ini | 1 + drivers/net/axgbe/axgbe_ethdev.c | 1 + drivers/net/axgbe/axgbe_rxtx.c | 28 ++++++++++++++++++++++++++++ drivers/net/axgbe/axgbe_rxtx.h | 3 +++ 4 files changed, 33 insertions(+)
doc/guides/nics/features/axgbe.ini +1 -0
@@ -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
drivers/net/axgbe/axgbe_ethdev.c +1 -0
@@ -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..c10127a02 100644
drivers/net/axgbe/axgbe_rxtx.c +28 -0
@@ -571,6 +571,34 @@ 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 ) +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 )); +if (ret <0 ) +return -EINVAL ; + + ret +=1 ;/* add the size of '\0' */ + +if (fw_size < (size_t )ret) +return ret; +else +return 0 ; +} +static void axgbe_txq_prepare_tx_stop (struct axgbe_port *pdata,unsigned int queue) {
drivers/net/axgbe/axgbe_rxtx.h +3 -1
@@ -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
Ferruh Yigit
AppliedQuoted 14 lines · Amaranath
-----Original Message-----
From: Sebastian, Selwin <[email protected]>
Sent: Wednesday, January 6, 2021 1:31 PM
To: [email protected]
Cc: Somalapuram, Amaranath <[email protected]>; [email protected]
Subject: [PATCH v3] net/axgbe: add support for reading FW versionFrom: Selwin Sebastian <[email protected]>
Added support for
fw_version_getAPISigned-off-by Selwin Sebastian <[email protected]>
<...>
Quoted 3 lines
Applied to dpdk-next-net/main, thanks.