RDMA/mana_ib: unify mana_ib functions to support any gdma device

Use the installed gdma_device instead of hard-coded device
in requests to the HW.

Signed-off-by: Konstantin Taranov <kotaranov@microsoft.com>
Link: https://patch.msgid.link/1746633545-17653-4-git-send-email-kotaranov@linux.microsoft.com
Reviewed-by: Long Li <longli@microsoft.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>

diff --git a/drivers/infiniband/hw/mana/cq.c b/drivers/infiniband/hw/mana/cq.c
index 0fc4e26792180ba54704a37c37b37795530c9330..28e154bbb50f824b8843704aba6e26c2f5f6b150 100644 (file)
--- a/drivers/infiniband/hw/mana/cq.c
+++ b/drivers/infiniband/hw/mana/cq.c
@@ -15,14 +15,12 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
        struct ib_device *ibdev = ibcq->device;
        struct mana_ib_create_cq ucmd = {};
        struct mana_ib_dev *mdev;
-       struct gdma_context *gc;
        bool is_rnic_cq;
        u32 doorbell;
        u32 buf_size;
        int err;
 
        mdev = container_of(ibdev, struct mana_ib_dev, ib_dev);
-       gc = mdev_to_gc(mdev);
 
        cq->comp_vector = attr->comp_vector % ibdev->num_comp_vectors;
        cq->cq_handle = INVALID_MANA_HANDLE;
@@ -65,7 +63,7 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
                        ibdev_dbg(ibdev, "Failed to create kernel queue for create cq, %d\n", err);
                        return err;
                }
-               doorbell = gc->mana_ib.doorbell;
+               doorbell = mdev->gdma_dev->doorbell;
        }
 
        if (is_rnic_cq) {

diff --git a/drivers/infiniband/hw/mana/main.c b/drivers/infiniband/hw/mana/main.c
index 3837e30ed8198b2010a521e503153cf4d2911141..41a24a186f9d7d5f58e19f00472da4b4e272d603 100644 (file)
--- a/drivers/infiniband/hw/mana/main.c
+++ b/drivers/infiniband/hw/mana/main.c
@@ -244,7 +244,6 @@ void mana_ib_dealloc_ucontext(struct ib_ucontext *ibcontext)
 int mana_ib_create_kernel_queue(struct mana_ib_dev *mdev, u32 size, enum gdma_queue_type type,
                                struct mana_ib_queue *queue)
 {
-       struct gdma_context *gc = mdev_to_gc(mdev);
        struct gdma_queue_spec spec = {};
        int err;
 
@@ -253,7 +252,7 @@ int mana_ib_create_kernel_queue(struct mana_ib_dev *mdev, u32 size, enum gdma_qu
        spec.type = type;
        spec.monitor_avl_buf = false;
        spec.queue_size = size;
-       err = mana_gd_create_mana_wq_cq(&gc->mana_ib, &spec, &queue->kmem);
+       err = mana_gd_create_mana_wq_cq(mdev->gdma_dev, &spec, &queue->kmem);
        if (err)
                return err;
        /* take ownership into mana_ib from mana */
@@ -784,7 +783,7 @@ int mana_ib_create_eqs(struct mana_ib_dev *mdev)
        spec.eq.log2_throttle_limit = LOG2_EQ_THROTTLE;
        spec.eq.msix_index = 0;
 
-       err = mana_gd_create_mana_eq(&gc->mana_ib, &spec, &mdev->fatal_err_eq);
+       err = mana_gd_create_mana_eq(mdev->gdma_dev, &spec, &mdev->fatal_err_eq);
        if (err)
                return err;
 
@@ -835,7 +834,7 @@ int mana_ib_gd_create_rnic_adapter(struct mana_ib_dev *mdev)
 
        mana_gd_init_req_hdr(&req.hdr, MANA_IB_CREATE_ADAPTER, sizeof(req), sizeof(resp));
        req.hdr.req.msg_version = GDMA_MESSAGE_V2;
-       req.hdr.dev_id = gc->mana_ib.dev_id;
+       req.hdr.dev_id = mdev->gdma_dev->dev_id;
        req.notify_eq_id = mdev->fatal_err_eq->id;
 
        if (mdev->adapter_caps.feature_flags & MANA_IB_FEATURE_CLIENT_ERROR_CQE_SUPPORT)
@@ -860,7 +859,7 @@ int mana_ib_gd_destroy_rnic_adapter(struct mana_ib_dev *mdev)
 
        gc = mdev_to_gc(mdev);
        mana_gd_init_req_hdr(&req.hdr, MANA_IB_DESTROY_ADAPTER, sizeof(req), sizeof(resp));
-       req.hdr.dev_id = gc->mana_ib.dev_id;
+       req.hdr.dev_id = mdev->gdma_dev->dev_id;
        req.adapter = mdev->adapter_handle;
 
        err = mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp);
@@ -887,7 +886,7 @@ int mana_ib_gd_add_gid(const struct ib_gid_attr *attr, void **context)
        }
 
        mana_gd_init_req_hdr(&req.hdr, MANA_IB_CONFIG_IP_ADDR, sizeof(req), sizeof(resp));
-       req.hdr.dev_id = gc->mana_ib.dev_id;
+       req.hdr.dev_id = mdev->gdma_dev->dev_id;
        req.adapter = mdev->adapter_handle;
        req.op = ADDR_OP_ADD;
        req.sgid_type = (ntype == RDMA_NETWORK_IPV6) ? SGID_TYPE_IPV6 : SGID_TYPE_IPV4;
@@ -917,7 +916,7 @@ int mana_ib_gd_del_gid(const struct ib_gid_attr *attr, void **context)
        }
 
        mana_gd_init_req_hdr(&req.hdr, MANA_IB_CONFIG_IP_ADDR, sizeof(req), sizeof(resp));
-       req.hdr.dev_id = gc->mana_ib.dev_id;
+       req.hdr.dev_id = mdev->gdma_dev->dev_id;
        req.adapter = mdev->adapter_handle;
        req.op = ADDR_OP_REMOVE;
        req.sgid_type = (ntype == RDMA_NETWORK_IPV6) ? SGID_TYPE_IPV6 : SGID_TYPE_IPV4;
@@ -940,7 +939,7 @@ int mana_ib_gd_config_mac(struct mana_ib_dev *mdev, enum mana_ib_addr_op op, u8
        int err;
 
        mana_gd_init_req_hdr(&req.hdr, MANA_IB_CONFIG_MAC_ADDR, sizeof(req), sizeof(resp));
-       req.hdr.dev_id = gc->mana_ib.dev_id;
+       req.hdr.dev_id = mdev->gdma_dev->dev_id;
        req.adapter = mdev->adapter_handle;
        req.op = op;
        copy_in_reverse(req.mac_addr, mac, ETH_ALEN);
@@ -965,7 +964,7 @@ int mana_ib_gd_create_cq(struct mana_ib_dev *mdev, struct mana_ib_cq *cq, u32 do
                return -EINVAL;
 
        mana_gd_init_req_hdr(&req.hdr, MANA_IB_CREATE_CQ, sizeof(req), sizeof(resp));
-       req.hdr.dev_id = gc->mana_ib.dev_id;
+       req.hdr.dev_id = mdev->gdma_dev->dev_id;
        req.adapter = mdev->adapter_handle;
        req.gdma_region = cq->queue.gdma_region;
        req.eq_id = mdev->eqs[cq->comp_vector]->id;
@@ -997,7 +996,7 @@ int mana_ib_gd_destroy_cq(struct mana_ib_dev *mdev, struct mana_ib_cq *cq)
                return 0;
 
        mana_gd_init_req_hdr(&req.hdr, MANA_IB_DESTROY_CQ, sizeof(req), sizeof(resp));
-       req.hdr.dev_id = gc->mana_ib.dev_id;
+       req.hdr.dev_id = mdev->gdma_dev->dev_id;
        req.adapter = mdev->adapter_handle;
        req.cq_handle = cq->cq_handle;
 
@@ -1023,7 +1022,7 @@ int mana_ib_gd_create_rc_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp,
        int err, i;
 
        mana_gd_init_req_hdr(&req.hdr, MANA_IB_CREATE_RC_QP, sizeof(req), sizeof(resp));
-       req.hdr.dev_id = gc->mana_ib.dev_id;
+       req.hdr.dev_id = mdev->gdma_dev->dev_id;
        req.adapter = mdev->adapter_handle;
        req.pd_handle = pd->pd_handle;
        req.send_cq_handle = send_cq->cq_handle;
@@ -1059,7 +1058,7 @@ int mana_ib_gd_destroy_rc_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp)
        int err;
 
        mana_gd_init_req_hdr(&req.hdr, MANA_IB_DESTROY_RC_QP, sizeof(req), sizeof(resp));
-       req.hdr.dev_id = gc->mana_ib.dev_id;
+       req.hdr.dev_id = mdev->gdma_dev->dev_id;
        req.adapter = mdev->adapter_handle;
        req.rc_qp_handle = qp->qp_handle;
        err = mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp);
@@ -1082,7 +1081,7 @@ int mana_ib_gd_create_ud_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp,
        int err, i;
 
        mana_gd_init_req_hdr(&req.hdr, MANA_IB_CREATE_UD_QP, sizeof(req), sizeof(resp));
-       req.hdr.dev_id = gc->mana_ib.dev_id;
+       req.hdr.dev_id = mdev->gdma_dev->dev_id;
        req.adapter = mdev->adapter_handle;
        req.pd_handle = pd->pd_handle;
        req.send_cq_handle = send_cq->cq_handle;
@@ -1117,7 +1116,7 @@ int mana_ib_gd_destroy_ud_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp)
        int err;
 
        mana_gd_init_req_hdr(&req.hdr, MANA_IB_DESTROY_UD_QP, sizeof(req), sizeof(resp));
-       req.hdr.dev_id = gc->mana_ib.dev_id;
+       req.hdr.dev_id = mdev->gdma_dev->dev_id;
        req.adapter = mdev->adapter_handle;
        req.qp_handle = qp->qp_handle;
        err = mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp);

diff --git a/drivers/infiniband/hw/mana/qp.c b/drivers/infiniband/hw/mana/qp.c
index c928af58f38bfe47263f0481952d8a65242930cd..14fd7d6c54a243ce3c9b1e92f9268c73ed785a10 100644 (file)
--- a/drivers/infiniband/hw/mana/qp.c
+++ b/drivers/infiniband/hw/mana/qp.c
@@ -635,7 +635,6 @@ static int mana_ib_create_ud_qp(struct ib_qp *ibqp, struct ib_pd *ibpd,
 {
        struct mana_ib_dev *mdev = container_of(ibpd->device, struct mana_ib_dev, ib_dev);
        struct mana_ib_qp *qp = container_of(ibqp, struct mana_ib_qp, ibqp);
-       struct gdma_context *gc = mdev_to_gc(mdev);
        u32 doorbell, queue_size;
        int i, err;
 
@@ -654,7 +653,7 @@ static int mana_ib_create_ud_qp(struct ib_qp *ibqp, struct ib_pd *ibpd,
                        goto destroy_queues;
                }
        }
-       doorbell = gc->mana_ib.doorbell;
+       doorbell = mdev->gdma_dev->doorbell;
 
        err = create_shadow_queue(&qp->shadow_rq, attr->cap.max_recv_wr,
                                  sizeof(struct ud_rq_shadow_wqe));
@@ -736,7 +735,7 @@ static int mana_ib_gd_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
        int err;
 
        mana_gd_init_req_hdr(&req.hdr, MANA_IB_SET_QP_STATE, sizeof(req), sizeof(resp));
-       req.hdr.dev_id = gc->mana_ib.dev_id;
+       req.hdr.dev_id = mdev->gdma_dev->dev_id;
        req.adapter = mdev->adapter_handle;
        req.qp_handle = qp->qp_handle;
        req.qp_state = attr->qp_state;