net/sfc: factor out function to report Tx capabilities

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>

diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index 0244a0f..0fe9bf5 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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,