net/mlx5: use SPDX tags in 6WIND copyrighted files

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

diff --git a/drivers/net/mlx5/mlx5_rxtx_vec.c b/drivers/net/mlx5/mlx5_rxtx_vec.c
index 01edcaf..b66c291 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxtx_vec.c
+++ b/drivers/net/mlx5/mlx5_rxtx_vec.c
@@ -1,34 +1,6 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright 2017 6WIND S.A.
- *   Copyright 2017 Mellanox.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of 6WIND S.A. nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2017 6WIND S.A.
+ * Copyright 2017 Mellanox.
  */
 
 #include <assert.h>
@@ -160,15 +132,15 @@ mlx5_tx_burst_vec(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
                uint16_t ret;
 
                /* Transmit multi-seg packets in the head of pkts list. */
-               if (!(txq->flags & ETH_TXQ_FLAGS_NOMULTSEGS) &&
+               if ((txq->offloads & DEV_TX_OFFLOAD_MULTI_SEGS) &&
                    NB_SEGS(pkts[nb_tx]) > 1)
                        nb_tx += txq_scatter_v(txq,
                                               &pkts[nb_tx],
                                               pkts_n - nb_tx);
                n = RTE_MIN((uint16_t)(pkts_n - nb_tx), MLX5_VPMD_TX_MAX_BURST);
-               if (!(txq->flags & ETH_TXQ_FLAGS_NOMULTSEGS))
+               if (txq->offloads & DEV_TX_OFFLOAD_MULTI_SEGS)
                        n = txq_count_contig_single_seg(&pkts[nb_tx], n);
-               if (!(txq->flags & ETH_TXQ_FLAGS_NOOFFLOADS))
+               if (txq->offloads & MLX5_VEC_TX_CKSUM_OFFLOAD_CAP)
                        n = txq_calc_offload(txq, &pkts[nb_tx], n, &cs_flags);
                ret = txq_burst_v(txq, &pkts[nb_tx], n, cs_flags);
                nb_tx += ret;
@@ -253,24 +225,20 @@ mlx5_rx_burst_vec(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)
  *
  * @param priv
  *   Pointer to private structure.
+ * @param dev
+ *   Pointer to rte_eth_dev structure.
  *
  * @return
  *   1 if supported, negative errno value if not.
  */
 int __attribute__((cold))
-priv_check_raw_vec_tx_support(struct priv *priv)
+priv_check_raw_vec_tx_support(__rte_unused struct priv *priv,
+                             struct rte_eth_dev *dev)
 {
-       uint16_t i;
+       uint64_t offloads = dev->data->dev_conf.txmode.offloads;
 
-       /* All the configured queues should support. */
-       for (i = 0; i < priv->txqs_n; ++i) {
-               struct mlx5_txq_data *txq = (*priv->txqs)[i];
-
-               if (!(txq->flags & ETH_TXQ_FLAGS_NOMULTSEGS) ||
-                   !(txq->flags & ETH_TXQ_FLAGS_NOOFFLOADS))
-                       break;
-       }
-       if (i != priv->txqs_n)
+       /* Doesn't support any offload. */
+       if (offloads)
                return -ENOTSUP;
        return 1;
 }
@@ -280,17 +248,21 @@ priv_check_raw_vec_tx_support(struct priv *priv)
  *
  * @param priv
  *   Pointer to private structure.
+ * @param dev
+ *   Pointer to rte_eth_dev structure.
  *
  * @return
  *   1 if supported, negative errno value if not.
  */
 int __attribute__((cold))
-priv_check_vec_tx_support(struct priv *priv)
+priv_check_vec_tx_support(struct priv *priv, struct rte_eth_dev *dev)
 {
-       if (!priv->tx_vec_en ||
+       uint64_t offloads = dev->data->dev_conf.txmode.offloads;
+
+       if (!priv->config.tx_vec_en ||
            priv->txqs_n > MLX5_VPMD_MIN_TXQS ||
-           priv->mps != MLX5_MPW_ENHANCED ||
-           priv->tso)
+           priv->config.mps != MLX5_MPW_ENHANCED ||
+           offloads & ~MLX5_VEC_TX_OFFLOAD_CAP)
                return -ENOTSUP;
        return 1;
 }
@@ -310,7 +282,7 @@ rxq_check_vec_support(struct mlx5_rxq_data *rxq)
        struct mlx5_rxq_ctrl *ctrl =
                container_of(rxq, struct mlx5_rxq_ctrl, rxq);
 
-       if (!ctrl->priv->rx_vec_en || rxq->sges_n != 0)
+       if (!ctrl->priv->config.rx_vec_en || rxq->sges_n != 0)
                return -ENOTSUP;
        return 1;
 }
@@ -329,7 +301,7 @@ priv_check_vec_rx_support(struct priv *priv)
 {
        uint16_t i;
 
-       if (!priv->rx_vec_en)
+       if (!priv->config.rx_vec_en)
                return -ENOTSUP;
        /* All the configured queues should support. */
        for (i = 0; i < priv->rxqs_n; ++i) {