net/sfc/base: support FEC mode settings

[dpdk.git] / drivers / net / mlx4 / mlx4_txq.c

diff --git a/drivers/net/mlx4/mlx4_txq.c b/drivers/net/mlx4/mlx4_txq.c
index 7664c3e..071b2d5 100644 (file)
--- a/drivers/net/mlx4/mlx4_txq.c
+++ b/drivers/net/mlx4/mlx4_txq.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
  */
 
 /**
@@ -54,12 +26,13 @@
 
 #include <rte_common.h>
 #include <rte_errno.h>
-#include <rte_ethdev.h>
+#include <rte_ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
 #include <rte_mempool.h>
 
 #include "mlx4.h"
+#include "mlx4_glue.h"
 #include "mlx4_prm.h"
 #include "mlx4_rxtx.h"
 #include "mlx4_utils.h"
@@ -350,7 +323,7 @@ mlx4_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
                .lb = !!priv->vf,
                .bounce_buf = bounce_buf,
        };
-       txq->cq = ibv_create_cq(priv->ctx, desc, NULL, NULL, 0);
+       txq->cq = mlx4_glue->create_cq(priv->ctx, desc, NULL, NULL, 0);
        if (!txq->cq) {
                rte_errno = ENOMEM;
                ERROR("%p: CQ creation failure: %s",
@@ -370,7 +343,7 @@ mlx4_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
                /* No completion events must occur by default. */
                .sq_sig_all = 0,
        };
-       txq->qp = ibv_create_qp(priv->pd, &qp_init_attr);
+       txq->qp = mlx4_glue->create_qp(priv->pd, &qp_init_attr);
        if (!txq->qp) {
                rte_errno = errno ? errno : EINVAL;
                ERROR("%p: QP creation failure: %s",
@@ -378,7 +351,7 @@ mlx4_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
                goto error;
        }
        txq->max_inline = qp_init_attr.cap.max_inline_data;
-       ret = ibv_modify_qp
+       ret = mlx4_glue->modify_qp
                (txq->qp,
                 &(struct ibv_qp_attr){
                        .qp_state = IBV_QPS_INIT,
@@ -391,7 +364,7 @@ mlx4_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
                      (void *)dev, strerror(rte_errno));
                goto error;
        }
-       ret = ibv_modify_qp
+       ret = mlx4_glue->modify_qp
                (txq->qp,
                 &(struct ibv_qp_attr){
                        .qp_state = IBV_QPS_RTR,
@@ -403,7 +376,7 @@ mlx4_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
                      (void *)dev, strerror(rte_errno));
                goto error;
        }
-       ret = ibv_modify_qp
+       ret = mlx4_glue->modify_qp
                (txq->qp,
                 &(struct ibv_qp_attr){
                        .qp_state = IBV_QPS_RTS,
@@ -420,7 +393,7 @@ mlx4_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
        mlxdv.cq.out = &dv_cq;
        mlxdv.qp.in = txq->qp;
        mlxdv.qp.out = &dv_qp;
-       ret = mlx4dv_init_obj(&mlxdv, MLX4DV_OBJ_QP | MLX4DV_OBJ_CQ);
+       ret = mlx4_glue->dv_init_obj(&mlxdv, MLX4DV_OBJ_QP | MLX4DV_OBJ_CQ);
        if (ret) {
                rte_errno = EINVAL;
                ERROR("%p: failed to obtain information needed for"
@@ -470,9 +443,9 @@ mlx4_tx_queue_release(void *dpdk_txq)
                }
        mlx4_txq_free_elts(txq);
        if (txq->qp)
-               claim_zero(ibv_destroy_qp(txq->qp));
+               claim_zero(mlx4_glue->destroy_qp(txq->qp));
        if (txq->cq)
-               claim_zero(ibv_destroy_cq(txq->cq));
+               claim_zero(mlx4_glue->destroy_cq(txq->cq));
        for (i = 0; i != RTE_DIM(txq->mp2mr); ++i) {
                if (!txq->mp2mr[i].mp)
                        break;