From: Andrew Rybchenko <arybchenko@solarflare.com>
To: <dev@dpdk.org>
Cc: Ivan Malov <ivan.malov@oktetlabs.ru>
Subject: [dpdk-dev] [PATCH v3 5/6] net/sfc: factor out function to report Tx capabilities
Date: Thu, 18 Jan 2018 07:07:48 +0000 [thread overview]
Message-ID: <1516259269-6887-6-git-send-email-arybchenko@solarflare.com> (raw)
In-Reply-To: <1516259269-6887-1-git-send-email-arybchenko@solarflare.com>
From: Ivan Malov <ivan.malov@oktetlabs.ru>
The patch adds a separate function to report supported
Tx capabilities because this function will be required
in more places across the code in the upcoming patches.
Signed-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
drivers/net/sfc/sfc_ethdev.c | 13 +------------
drivers/net/sfc/sfc_tx.c | 23 +++++++++++++++++++++++
drivers/net/sfc/sfc_tx.h | 2 ++
3 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index 0244a0f..0fe9bf5 100644
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -114,20 +114,12 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
dev_info->rx_offload_capa = sfc_rx_get_dev_offload_caps(sa) |
dev_info->rx_queue_offload_capa;
- dev_info->tx_offload_capa =
- DEV_TX_OFFLOAD_IPV4_CKSUM |
- DEV_TX_OFFLOAD_UDP_CKSUM |
- DEV_TX_OFFLOAD_TCP_CKSUM;
-
- if (encp->enc_tunnel_encapsulations_supported != 0)
- dev_info->tx_offload_capa |= DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM;
+ dev_info->tx_offload_capa = sfc_tx_get_dev_offload_caps(sa);
dev_info->default_txconf.txq_flags = ETH_TXQ_FLAGS_NOXSUMSCTP;
if ((~sa->dp_tx->features & SFC_DP_TX_FEAT_VLAN_INSERT) ||
!encp->enc_hw_tx_insert_vlan_enabled)
dev_info->default_txconf.txq_flags |= ETH_TXQ_FLAGS_NOVLANOFFL;
- else
- dev_info->tx_offload_capa |= DEV_TX_OFFLOAD_VLAN_INSERT;
if (~sa->dp_tx->features & SFC_DP_TX_FEAT_MULTI_SEG)
dev_info->default_txconf.txq_flags |= ETH_TXQ_FLAGS_NOMULTSEGS;
@@ -146,9 +138,6 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
}
#endif
- if (sa->tso)
- dev_info->tx_offload_capa |= DEV_TX_OFFLOAD_TCP_TSO;
-
/* Initialize to hardware limits */
dev_info->rx_desc_lim.nb_max = EFX_RXQ_MAXNDESCS;
dev_info->rx_desc_lim.nb_min = EFX_RXQ_MINNDESCS;
diff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c
index ee22049..7504037 100644
--- a/drivers/net/sfc/sfc_tx.c
+++ b/drivers/net/sfc/sfc_tx.c
@@ -34,6 +34,29 @@
*/
#define SFC_TX_QFLUSH_POLL_ATTEMPTS (2000)
+uint64_t
+sfc_tx_get_dev_offload_caps(struct sfc_adapter *sa)
+{
+ const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);
+ uint64_t caps = 0;
+
+ caps |= DEV_TX_OFFLOAD_IPV4_CKSUM;
+ caps |= DEV_TX_OFFLOAD_UDP_CKSUM;
+ caps |= DEV_TX_OFFLOAD_TCP_CKSUM;
+
+ if (encp->enc_tunnel_encapsulations_supported)
+ caps |= DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM;
+
+ if ((sa->dp_tx->features & SFC_DP_TX_FEAT_VLAN_INSERT) &&
+ encp->enc_hw_tx_insert_vlan_enabled)
+ caps |= DEV_TX_OFFLOAD_VLAN_INSERT;
+
+ if (sa->tso)
+ caps |= DEV_TX_OFFLOAD_TCP_TSO;
+
+ return caps;
+}
+
static int
sfc_tx_qcheck_conf(struct sfc_adapter *sa, unsigned int txq_max_fill_level,
const struct rte_eth_txconf *tx_conf)
diff --git a/drivers/net/sfc/sfc_tx.h b/drivers/net/sfc/sfc_tx.h
index c2b889f..fc9a9f7 100644
--- a/drivers/net/sfc/sfc_tx.h
+++ b/drivers/net/sfc/sfc_tx.h
@@ -129,6 +129,8 @@ void sfc_tx_qstop(struct sfc_adapter *sa, unsigned int sw_index);
int sfc_tx_start(struct sfc_adapter *sa);
void sfc_tx_stop(struct sfc_adapter *sa);
+uint64_t sfc_tx_get_dev_offload_caps(struct sfc_adapter *sa);
+
/* From 'sfc_tso.c' */
int sfc_efx_tso_alloc_tsoh_objs(struct sfc_efx_tx_sw_desc *sw_ring,
unsigned int txq_entries,
--
2.7.4
next prev parent reply other threads:[~2018-01-18 7:08 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-11 8:12 [dpdk-dev] [PATCH 0/6] net/sfc: convert to the new offload API Andrew Rybchenko
2018-01-11 8:12 ` [dpdk-dev] [PATCH 1/6] ethdev: add a function to look up Rx offload names Andrew Rybchenko
2018-01-17 16:55 ` Ferruh Yigit
2018-01-17 17:06 ` Thomas Monjalon
2018-01-17 17:33 ` Thomas Monjalon
2018-01-18 6:32 ` Shahaf Shuler
2018-01-18 7:16 ` Andrew Rybchenko
2018-01-18 7:52 ` Andrew Rybchenko
2018-01-18 9:24 ` Thomas Monjalon
2018-01-11 8:12 ` [dpdk-dev] [PATCH 2/6] ethdev: add a function to look up Tx " Andrew Rybchenko
2018-01-11 8:12 ` [dpdk-dev] [PATCH 3/6] net/sfc: factor out function to report Rx capabilities Andrew Rybchenko
2018-01-11 8:12 ` [dpdk-dev] [PATCH 4/6] net/sfc: convert to the new Rx offload API Andrew Rybchenko
2018-01-11 8:12 ` [dpdk-dev] [PATCH 5/6] net/sfc: factor out function to report Tx capabilities Andrew Rybchenko
2018-01-11 8:12 ` [dpdk-dev] [PATCH 6/6] net/sfc: convert to the new Tx offload API Andrew Rybchenko
2018-01-17 16:55 ` [dpdk-dev] [PATCH 0/6] net/sfc: convert to the new " Ferruh Yigit
2018-01-18 7:02 ` [dpdk-dev] [PATCH v2 " Andrew Rybchenko
2018-01-18 7:02 ` [dpdk-dev] [PATCH v2 1/6] ethdev: add a function to look up Rx offload names Andrew Rybchenko
2018-01-18 7:02 ` [dpdk-dev] [PATCH v2 2/6] ethdev: add a function to look up Tx " Andrew Rybchenko
2018-01-18 7:02 ` [dpdk-dev] [PATCH v2 3/6] net/sfc: factor out function to report Rx capabilities Andrew Rybchenko
2018-01-18 7:02 ` [dpdk-dev] [PATCH v2 4/6] net/sfc: convert to the new Rx offload API Andrew Rybchenko
2018-01-18 7:02 ` [dpdk-dev] [PATCH v2 5/6] net/sfc: factor out function to report Tx capabilities Andrew Rybchenko
2018-01-18 7:02 ` [dpdk-dev] [PATCH v2 6/6] net/sfc: convert to the new Tx offload API Andrew Rybchenko
2018-01-18 7:07 ` [dpdk-dev] [PATCH v3 0/6] net/sfc: convert to the new " Andrew Rybchenko
2018-01-18 7:07 ` [dpdk-dev] [PATCH v3 1/6] ethdev: add a function to look up Rx offload names Andrew Rybchenko
2018-01-18 9:26 ` Thomas Monjalon
2018-01-18 9:47 ` Andrew Rybchenko
2018-01-18 7:07 ` [dpdk-dev] [PATCH v3 2/6] ethdev: add a function to look up Tx " Andrew Rybchenko
2018-01-18 7:07 ` [dpdk-dev] [PATCH v3 3/6] net/sfc: factor out function to report Rx capabilities Andrew Rybchenko
2018-01-18 7:07 ` [dpdk-dev] [PATCH v3 4/6] net/sfc: convert to the new Rx offload API Andrew Rybchenko
2018-01-18 7:07 ` Andrew Rybchenko [this message]
2018-01-18 7:07 ` [dpdk-dev] [PATCH v3 6/6] net/sfc: convert to the new Tx " Andrew Rybchenko
2018-01-18 9:44 ` [dpdk-dev] [PATCH v4 0/6] net/sfc: convert to the new " Andrew Rybchenko
2018-01-18 9:44 ` [dpdk-dev] [PATCH v4 1/6] ethdev: add a function to look up Rx offload names Andrew Rybchenko
2018-01-18 10:29 ` Thomas Monjalon
2018-01-18 9:44 ` [dpdk-dev] [PATCH v4 2/6] ethdev: add a function to look up Tx " Andrew Rybchenko
2018-01-18 10:30 ` Thomas Monjalon
2018-01-18 9:44 ` [dpdk-dev] [PATCH v4 3/6] net/sfc: factor out function to report Rx capabilities Andrew Rybchenko
2018-01-18 9:44 ` [dpdk-dev] [PATCH v4 4/6] net/sfc: convert to the new Rx offload API Andrew Rybchenko
2018-01-18 9:44 ` [dpdk-dev] [PATCH v4 5/6] net/sfc: factor out function to report Tx capabilities Andrew Rybchenko
2018-01-18 9:44 ` [dpdk-dev] [PATCH v4 6/6] net/sfc: convert to the new Tx offload API Andrew Rybchenko
2018-01-18 15:40 ` [dpdk-dev] [PATCH v4 0/6] net/sfc: convert to the new " Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1516259269-6887-6-git-send-email-arybchenko@solarflare.com \
--to=arybchenko@solarflare.com \
--cc=dev@dpdk.org \
--cc=ivan.malov@oktetlabs.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).