net/mlx5: convert to new Rx offloads API

[dpdk.git] / drivers / net / mlx5 / mlx5_ethdev.c

diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 2818353..278a4df 100644 (file)
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -551,7 +551,25 @@ dev_configure(struct rte_eth_dev *dev)
        unsigned int reta_idx_n;
        const uint8_t use_app_rss_key =
                !!dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key;
-
+       uint64_t supp_tx_offloads = mlx5_priv_get_tx_port_offloads(priv);
+       uint64_t tx_offloads = dev->data->dev_conf.txmode.offloads;
+       uint64_t supp_rx_offloads =
+               (mlx5_priv_get_rx_port_offloads(priv) |
+                mlx5_priv_get_rx_queue_offloads(priv));
+       uint64_t rx_offloads = dev->data->dev_conf.rxmode.offloads;
+
+       if ((tx_offloads & supp_tx_offloads) != tx_offloads) {
+               ERROR("Some Tx offloads are not supported "
+                     "requested 0x%" PRIx64 " supported 0x%" PRIx64,
+                     tx_offloads, supp_tx_offloads);
+               return ENOTSUP;
+       }
+       if ((rx_offloads & supp_rx_offloads) != rx_offloads) {
+               ERROR("Some Rx offloads are not supported "
+                     "requested 0x%" PRIx64 " supported 0x%" PRIx64,
+                     rx_offloads, supp_rx_offloads);
+               return ENOTSUP;
+       }
        if (use_app_rss_key &&
            (dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key_len !=
             rss_hash_default_key_len)) {
@@ -579,7 +597,7 @@ dev_configure(struct rte_eth_dev *dev)
                     (void *)dev, priv->txqs_n, txqs_n);
                priv->txqs_n = txqs_n;
        }
-       if (rxqs_n > priv->ind_table_max_size) {
+       if (rxqs_n > priv->config.ind_table_max_size) {
                ERROR("cannot handle this many RX queues (%u)", rxqs_n);
                return EINVAL;
        }
@@ -592,7 +610,7 @@ dev_configure(struct rte_eth_dev *dev)
         * maximum indirection table size for better balancing.
         * The result is always rounded to the next power of two. */
        reta_idx_n = (1 << log2above((rxqs_n & (rxqs_n - 1)) ?
-                                    priv->ind_table_max_size :
+                                    priv->config.ind_table_max_size :
                                     rxqs_n));
        if (priv_rss_reta_index_resize(priv, reta_idx_n))
                return ENOMEM;
@@ -641,6 +659,7 @@ void
 mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
 {
        struct priv *priv = dev->data->dev_private;
+       struct mlx5_dev_config *config = &priv->config;
        unsigned int max;
        char ifname[IF_NAMESIZE];
 
@@ -662,32 +681,15 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
        info->max_rx_queues = max;
        info->max_tx_queues = max;
        info->max_mac_addrs = RTE_DIM(priv->mac);
-       info->rx_offload_capa =
-               (priv->hw_csum ?
-                (DEV_RX_OFFLOAD_IPV4_CKSUM |
-                 DEV_RX_OFFLOAD_UDP_CKSUM |
-                 DEV_RX_OFFLOAD_TCP_CKSUM) :
-                0) |
-               (priv->hw_vlan_strip ? DEV_RX_OFFLOAD_VLAN_STRIP : 0) |
-               DEV_RX_OFFLOAD_TIMESTAMP;
-
-       if (!priv->mps)
-               info->tx_offload_capa = DEV_TX_OFFLOAD_VLAN_INSERT;
-       if (priv->hw_csum)
-               info->tx_offload_capa |=
-                       (DEV_TX_OFFLOAD_IPV4_CKSUM |
-                        DEV_TX_OFFLOAD_UDP_CKSUM |
-                        DEV_TX_OFFLOAD_TCP_CKSUM);
-       if (priv->tso)
-               info->tx_offload_capa |= DEV_TX_OFFLOAD_TCP_TSO;
-       if (priv->tunnel_en)
-               info->tx_offload_capa |= (DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |
-                                         DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
-                                         DEV_TX_OFFLOAD_GRE_TNL_TSO);
+       info->rx_queue_offload_capa =
+               mlx5_priv_get_rx_queue_offloads(priv);
+       info->rx_offload_capa = (mlx5_priv_get_rx_port_offloads(priv) |
+                                info->rx_queue_offload_capa);
+       info->tx_offload_capa = mlx5_priv_get_tx_port_offloads(priv);
        if (priv_get_ifname(priv, &ifname) == 0)
                info->if_index = if_nametoindex(ifname);
        info->reta_size = priv->reta_idx_n ?
-               priv->reta_idx_n : priv->ind_table_max_size;
+               priv->reta_idx_n : config->ind_table_max_size;
        info->hash_key_size = priv->rss_conf.rss_key_len;
        info->speed_capa = priv->link_speed_capa;
        priv_unlock(priv);
@@ -1391,15 +1393,23 @@ mlx5_set_link_up(struct rte_eth_dev *dev)
  *   Pointer to selected Tx burst function.
  */
 eth_tx_burst_t
-priv_select_tx_function(struct priv *priv, __rte_unused struct rte_eth_dev *dev)
+priv_select_tx_function(struct priv *priv, struct rte_eth_dev *dev)
 {
        eth_tx_burst_t tx_pkt_burst = mlx5_tx_burst;
+       struct mlx5_dev_config *config = &priv->config;
+       uint64_t tx_offloads = dev->data->dev_conf.txmode.offloads;
+       int tso = !!(tx_offloads & (DEV_TX_OFFLOAD_TCP_TSO |
+                                   DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
+                                   DEV_TX_OFFLOAD_GRE_TNL_TSO));
+       int vlan_insert = !!(tx_offloads & DEV_TX_OFFLOAD_VLAN_INSERT);
 
        assert(priv != NULL);
        /* Select appropriate TX function. */
-       if (priv->mps == MLX5_MPW_ENHANCED) {
-               if (priv_check_vec_tx_support(priv) > 0) {
-                       if (priv_check_raw_vec_tx_support(priv) > 0)
+       if (vlan_insert || tso)
+               return tx_pkt_burst;
+       if (config->mps == MLX5_MPW_ENHANCED) {
+               if (priv_check_vec_tx_support(priv, dev) > 0) {
+                       if (priv_check_raw_vec_tx_support(priv, dev) > 0)
                                tx_pkt_burst = mlx5_tx_burst_raw_vec;
                        else
                                tx_pkt_burst = mlx5_tx_burst_vec;
@@ -1408,10 +1418,10 @@ priv_select_tx_function(struct priv *priv, __rte_unused struct rte_eth_dev *dev)
                        tx_pkt_burst = mlx5_tx_burst_empw;
                        DEBUG("selected Enhanced MPW TX function");
                }
-       } else if (priv->mps && priv->txq_inline) {
+       } else if (config->mps && (config->txq_inline > 0)) {
                tx_pkt_burst = mlx5_tx_burst_mpw_inline;
                DEBUG("selected MPW inline TX function");
-       } else if (priv->mps) {
+       } else if (config->mps) {
                tx_pkt_burst = mlx5_tx_burst_mpw;
                DEBUG("selected MPW TX function");
        }