net/sfc/base: rename firmware update verify result cap field

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

diff --git a/drivers/net/mlx4/mlx4_rxq.c b/drivers/net/mlx4/mlx4_rxq.c
index ad55934..53313c5 100644 (file)
--- a/drivers/net/mlx4/mlx4_rxq.c
+++ b/drivers/net/mlx4/mlx4_rxq.c
@@ -164,7 +164,8 @@ error:
  * @param rss
  *   RSS context to release.
  */
-void mlx4_rss_put(struct mlx4_rss *rss)
+void
+mlx4_rss_put(struct mlx4_rss *rss)
 {
        assert(rss->refcnt);
        if (--rss->refcnt)
@@ -190,7 +191,8 @@ void mlx4_rss_put(struct mlx4_rss *rss)
  * @return
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
-int mlx4_rss_attach(struct mlx4_rss *rss)
+int
+mlx4_rss_attach(struct mlx4_rss *rss)
 {
        assert(rss->refcnt);
        if (rss->usecnt++) {
@@ -312,7 +314,8 @@ error:
  * @param rss
  *   RSS context to detach from.
  */
-void mlx4_rss_detach(struct mlx4_rss *rss)
+void
+mlx4_rss_detach(struct mlx4_rss *rss)
 {
        struct priv *priv = rss->priv;
        unsigned int i;
@@ -510,7 +513,7 @@ mlx4_rxq_attach(struct rxq *rxq)
        struct rte_mbuf *(*elts)[elts_n] = rxq->elts;
        struct mlx4dv_obj mlxdv;
        struct mlx4dv_rwq dv_rwq;
-       struct mlx4dv_cq dv_cq;
+       struct mlx4dv_cq dv_cq = { .comp_mask = MLX4DV_CQ_MASK_UAR, };
        const char *msg;
        struct ibv_cq *cq = NULL;
        struct ibv_wq *wq = NULL;
@@ -604,6 +607,11 @@ mlx4_rxq_attach(struct rxq *rxq)
        rxq->mcq.cqe_cnt = dv_cq.cqe_cnt;
        rxq->mcq.set_ci_db = dv_cq.set_ci_db;
        rxq->mcq.cqe_64 = (dv_cq.cqe_size & 64) ? 1 : 0;
+       rxq->mcq.arm_db = dv_cq.arm_db;
+       rxq->mcq.arm_sn = dv_cq.arm_sn;
+       rxq->mcq.cqn = dv_cq.cqn;
+       rxq->mcq.cq_uar = dv_cq.cq_uar;
+       rxq->mcq.cq_db_reg = (uint8_t *)dv_cq.cq_uar + MLX4_CQ_DOORBELL;
        /* Update doorbell counter. */
        rxq->rq_ci = elts_n / sges_n;
        rte_wmb();
@@ -742,6 +750,7 @@ mlx4_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
                         dev->data->dev_conf.rxmode.hw_ip_checksum),
                .csum_l2tun = (priv->hw_csum_l2tun &&
                               dev->data->dev_conf.rxmode.hw_ip_checksum),
+               .l2tun_offload = priv->hw_csum_l2tun,
                .stats = {
                        .idx = idx,
                },
@@ -796,9 +805,8 @@ mlx4_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
                goto error;
        }
        /* Use the entire Rx mempool as the memory region. */
-       rxq->mr = mlx4_mp2mr(priv->pd, mp);
+       rxq->mr = mlx4_mr_get(priv, mp);
        if (!rxq->mr) {
-               rte_errno = EINVAL;
                ERROR("%p: MR creation failure: %s",
                      (void *)dev, strerror(rte_errno));
                goto error;
@@ -861,6 +869,6 @@ mlx4_rx_queue_release(void *dpdk_rxq)
        if (rxq->channel)
                claim_zero(ibv_destroy_comp_channel(rxq->channel));
        if (rxq->mr)
-               claim_zero(ibv_dereg_mr(rxq->mr));
+               mlx4_mr_put(rxq->mr);
        rte_free(rxq);
 }