net/mlx5: prepare MR prototypes for DevX

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

diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c
index 73ee147..84a5c55 100644 (file)
--- a/drivers/net/mlx5/mlx5_devx.c
+++ b/drivers/net/mlx5/mlx5_devx.c
@@ -154,14 +154,14 @@ mlx5_rxq_release_devx_rq_resources(struct mlx5_rxq_ctrl *rxq_ctrl)
 {
        struct mlx5_devx_dbr_page *dbr_page = rxq_ctrl->rq_dbrec_page;
 
+       if (rxq_ctrl->wq_umem) {
+               mlx5_os_umem_dereg(rxq_ctrl->wq_umem);
+               rxq_ctrl->wq_umem = NULL;
+       }
        if (rxq_ctrl->rxq.wqes) {
                mlx5_free((void *)(uintptr_t)rxq_ctrl->rxq.wqes);
                rxq_ctrl->rxq.wqes = NULL;
        }
-       if (rxq_ctrl->wq_umem) {
-               mlx5_glue->devx_umem_dereg(rxq_ctrl->wq_umem);
-               rxq_ctrl->wq_umem = NULL;
-       }
        if (dbr_page) {
                claim_zero(mlx5_release_dbr(&rxq_ctrl->priv->dbrpgs,
                                            mlx5_os_get_umem_id(dbr_page->umem),
@@ -181,14 +181,14 @@ mlx5_rxq_release_devx_cq_resources(struct mlx5_rxq_ctrl *rxq_ctrl)
 {
        struct mlx5_devx_dbr_page *dbr_page = rxq_ctrl->cq_dbrec_page;
 
+       if (rxq_ctrl->cq_umem) {
+               mlx5_os_umem_dereg(rxq_ctrl->cq_umem);
+               rxq_ctrl->cq_umem = NULL;
+       }
        if (rxq_ctrl->rxq.cqes) {
                rte_free((void *)(uintptr_t)rxq_ctrl->rxq.cqes);
                rxq_ctrl->rxq.cqes = NULL;
        }
-       if (rxq_ctrl->cq_umem) {
-               mlx5_glue->devx_umem_dereg(rxq_ctrl->cq_umem);
-               rxq_ctrl->cq_umem = NULL;
-       }
        if (dbr_page) {
                claim_zero(mlx5_release_dbr(&rxq_ctrl->priv->dbrpgs,
                                            mlx5_os_get_umem_id(dbr_page->umem),
@@ -216,7 +216,7 @@ mlx5_rxq_devx_obj_release(struct mlx5_rxq_obj *rxq_obj)
                claim_zero(mlx5_devx_cmd_destroy(rxq_obj->rq));
                claim_zero(mlx5_devx_cmd_destroy(rxq_obj->devx_cq));
                if (rxq_obj->devx_channel)
-                       mlx5_glue->devx_destroy_event_channel
+                       mlx5_os_devx_destroy_event_channel
                                                        (rxq_obj->devx_channel);
                mlx5_rxq_release_devx_rq_resources(rxq_obj->rxq_ctrl);
                mlx5_rxq_release_devx_cq_resources(rxq_obj->rxq_ctrl);
@@ -375,7 +375,7 @@ mlx5_rxq_create_devx_rq_resources(struct rte_eth_dev *dev, uint16_t idx)
        if (!buf)
                return NULL;
        rxq_data->wqes = buf;
-       rxq_ctrl->wq_umem = mlx5_glue->devx_umem_reg(priv->sh->ctx,
+       rxq_ctrl->wq_umem = mlx5_os_umem_reg(priv->sh->ctx,
                                                     buf, wq_size, 0);
        if (!rxq_ctrl->wq_umem)
                goto error;
@@ -497,7 +497,7 @@ mlx5_rxq_create_devx_cq_resources(struct rte_eth_dev *dev, uint16_t idx)
                goto error;
        }
        rxq_data->cqes = (volatile struct mlx5_cqe (*)[])(uintptr_t)buf;
-       rxq_ctrl->cq_umem = mlx5_glue->devx_umem_reg(priv->sh->ctx, buf,
+       rxq_ctrl->cq_umem = mlx5_os_umem_reg(priv->sh->ctx, buf,
                                                     cq_size,
                                                     IBV_ACCESS_LOCAL_WRITE);
        if (!rxq_ctrl->cq_umem) {
@@ -533,7 +533,7 @@ mlx5_rxq_create_devx_cq_resources(struct rte_eth_dev *dev, uint16_t idx)
        rxq_data->cqe_n = log_cqe_n;
        rxq_data->cqn = cq_obj->id;
        if (rxq_ctrl->obj->devx_channel) {
-               ret = mlx5_glue->devx_subscribe_devx_event
+               ret = mlx5_os_devx_subscribe_devx_event
                                                (rxq_ctrl->obj->devx_channel,
                                                 cq_obj->obj,
                                                 sizeof(event_nums),
@@ -644,7 +644,7 @@ mlx5_rxq_devx_obj_new(struct rte_eth_dev *dev, uint16_t idx)
                int devx_ev_flag =
                          MLX5DV_DEVX_CREATE_EVENT_CHANNEL_FLAGS_OMIT_EV_DATA;
 
-               tmpl->devx_channel = mlx5_glue->devx_create_event_channel
+               tmpl->devx_channel = mlx5_os_devx_create_event_channel
                                                                (priv->sh->ctx,
                                                                 devx_ev_flag);
                if (!tmpl->devx_channel) {
@@ -686,7 +686,7 @@ error:
        if (tmpl->devx_cq)
                claim_zero(mlx5_devx_cmd_destroy(tmpl->devx_cq));
        if (tmpl->devx_channel)
-               mlx5_glue->devx_destroy_event_channel(tmpl->devx_channel);
+               mlx5_os_devx_destroy_event_channel(tmpl->devx_channel);
        mlx5_rxq_release_devx_rq_resources(rxq_ctrl);
        mlx5_rxq_release_devx_cq_resources(rxq_ctrl);
        rte_errno = ret; /* Restore rte_errno. */
@@ -1127,7 +1127,7 @@ mlx5_txq_release_devx_sq_resources(struct mlx5_txq_obj *txq_obj)
                txq_obj->sq_devx = NULL;
        }
        if (txq_obj->sq_umem) {
-               claim_zero(mlx5_glue->devx_umem_dereg(txq_obj->sq_umem));
+               claim_zero(mlx5_os_umem_dereg(txq_obj->sq_umem));
                txq_obj->sq_umem = NULL;
        }
        if (txq_obj->sq_buf) {
@@ -1155,7 +1155,7 @@ mlx5_txq_release_devx_cq_resources(struct mlx5_txq_obj *txq_obj)
        if (txq_obj->cq_devx)
                claim_zero(mlx5_devx_cmd_destroy(txq_obj->cq_devx));
        if (txq_obj->cq_umem)
-               claim_zero(mlx5_glue->devx_umem_dereg(txq_obj->cq_umem));
+               claim_zero(mlx5_os_umem_dereg(txq_obj->cq_umem));
        if (txq_obj->cq_buf)
                mlx5_free(txq_obj->cq_buf);
        if (txq_obj->cq_dbrec_page)
@@ -1174,8 +1174,8 @@ mlx5_txq_release_devx_cq_resources(struct mlx5_txq_obj *txq_obj)
 static void
 mlx5_txq_release_devx_resources(struct mlx5_txq_obj *txq_obj)
 {
-       mlx5_txq_release_devx_cq_resources(txq_obj);
        mlx5_txq_release_devx_sq_resources(txq_obj);
+       mlx5_txq_release_devx_cq_resources(txq_obj);
 }
 
 /**
@@ -1243,7 +1243,7 @@ mlx5_txq_create_devx_cq_resources(struct rte_eth_dev *dev, uint16_t idx)
                return 0;
        }
        /* Register allocated buffer in user space with DevX. */
-       txq_obj->cq_umem = mlx5_glue->devx_umem_reg(priv->sh->ctx,
+       txq_obj->cq_umem = mlx5_os_umem_reg(priv->sh->ctx,
                                                (void *)txq_obj->cq_buf,
                                                cqe_n * sizeof(struct mlx5_cqe),
                                                IBV_ACCESS_LOCAL_WRITE);
@@ -1342,7 +1342,7 @@ mlx5_txq_create_devx_sq_resources(struct rte_eth_dev *dev, uint16_t idx)
                goto error;
        }
        /* Register allocated buffer in user space with DevX. */
-       txq_obj->sq_umem = mlx5_glue->devx_umem_reg
+       txq_obj->sq_umem = mlx5_os_umem_reg
                                        (priv->sh->ctx,
                                         (void *)txq_obj->sq_buf,
                                         wqe_n * sizeof(struct mlx5_wqe),