Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20a6b588 authored by Kamal Heib's avatar Kamal Heib Committed by Jason Gunthorpe
Browse files

RDMA/vmw_pvrdma: Initialize ib_device_ops struct 



Initialize ib_device_ops with the supported operations using
ib_set_device_ops().

Signed-off-by: default avatarKamal Heib <kamalheib1@gmail.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent e7610581

drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c

+45 −37
Original line number Diff line number Diff line
@@ -161,6 +161,49 @@ static struct net_device *pvrdma_get_netdev(struct ib_device *ibdev, 
	return netdev;

}



static const struct ib_device_ops pvrdma_dev_ops = {

	.add_gid = pvrdma_add_gid,

	.alloc_mr = pvrdma_alloc_mr,

	.alloc_pd = pvrdma_alloc_pd,

	.alloc_ucontext = pvrdma_alloc_ucontext,

	.create_ah = pvrdma_create_ah,

	.create_cq = pvrdma_create_cq,

	.create_qp = pvrdma_create_qp,

	.dealloc_pd = pvrdma_dealloc_pd,

	.dealloc_ucontext = pvrdma_dealloc_ucontext,

	.del_gid = pvrdma_del_gid,

	.dereg_mr = pvrdma_dereg_mr,

	.destroy_ah = pvrdma_destroy_ah,

	.destroy_cq = pvrdma_destroy_cq,

	.destroy_qp = pvrdma_destroy_qp,

	.get_dev_fw_str = pvrdma_get_fw_ver_str,

	.get_dma_mr = pvrdma_get_dma_mr,

	.get_link_layer = pvrdma_port_link_layer,

	.get_netdev = pvrdma_get_netdev,

	.get_port_immutable = pvrdma_port_immutable,

	.map_mr_sg = pvrdma_map_mr_sg,

	.mmap = pvrdma_mmap,

	.modify_port = pvrdma_modify_port,

	.modify_qp = pvrdma_modify_qp,

	.poll_cq = pvrdma_poll_cq,

	.post_recv = pvrdma_post_recv,

	.post_send = pvrdma_post_send,

	.query_device = pvrdma_query_device,

	.query_gid = pvrdma_query_gid,

	.query_pkey = pvrdma_query_pkey,

	.query_port = pvrdma_query_port,

	.query_qp = pvrdma_query_qp,

	.reg_user_mr = pvrdma_reg_user_mr,

	.req_notify_cq = pvrdma_req_notify_cq,

};



static const struct ib_device_ops pvrdma_dev_srq_ops = {

	.create_srq = pvrdma_create_srq,

	.destroy_srq = pvrdma_destroy_srq,

	.modify_srq = pvrdma_modify_srq,

	.query_srq = pvrdma_query_srq,

};



static int pvrdma_register_device(struct pvrdma_dev *dev)

{

	int ret = -1;
@@ -197,39 +240,7 @@ static int pvrdma_register_device(struct pvrdma_dev *dev) 
	dev->ib_dev.node_type = RDMA_NODE_IB_CA;

	dev->ib_dev.phys_port_cnt = dev->dsr->caps.phys_port_cnt;



	dev->ib_dev.query_device = pvrdma_query_device;

	dev->ib_dev.query_port = pvrdma_query_port;

	dev->ib_dev.query_gid = pvrdma_query_gid;

	dev->ib_dev.query_pkey = pvrdma_query_pkey;

	dev->ib_dev.modify_port	= pvrdma_modify_port;

	dev->ib_dev.alloc_ucontext = pvrdma_alloc_ucontext;

	dev->ib_dev.dealloc_ucontext = pvrdma_dealloc_ucontext;

	dev->ib_dev.mmap = pvrdma_mmap;

	dev->ib_dev.alloc_pd = pvrdma_alloc_pd;

	dev->ib_dev.dealloc_pd = pvrdma_dealloc_pd;

	dev->ib_dev.create_ah = pvrdma_create_ah;

	dev->ib_dev.destroy_ah = pvrdma_destroy_ah;

	dev->ib_dev.create_qp = pvrdma_create_qp;

	dev->ib_dev.modify_qp = pvrdma_modify_qp;

	dev->ib_dev.query_qp = pvrdma_query_qp;

	dev->ib_dev.destroy_qp = pvrdma_destroy_qp;

	dev->ib_dev.post_send = pvrdma_post_send;

	dev->ib_dev.post_recv = pvrdma_post_recv;

	dev->ib_dev.create_cq = pvrdma_create_cq;

	dev->ib_dev.destroy_cq = pvrdma_destroy_cq;

	dev->ib_dev.poll_cq = pvrdma_poll_cq;

	dev->ib_dev.req_notify_cq = pvrdma_req_notify_cq;

	dev->ib_dev.get_dma_mr = pvrdma_get_dma_mr;

	dev->ib_dev.reg_user_mr	= pvrdma_reg_user_mr;

	dev->ib_dev.dereg_mr = pvrdma_dereg_mr;

	dev->ib_dev.alloc_mr = pvrdma_alloc_mr;

	dev->ib_dev.map_mr_sg = pvrdma_map_mr_sg;

	dev->ib_dev.add_gid = pvrdma_add_gid;

	dev->ib_dev.del_gid = pvrdma_del_gid;

	dev->ib_dev.get_netdev = pvrdma_get_netdev;

	dev->ib_dev.get_port_immutable = pvrdma_port_immutable;

	dev->ib_dev.get_link_layer = pvrdma_port_link_layer;

	dev->ib_dev.get_dev_fw_str = pvrdma_get_fw_ver_str;

	ib_set_device_ops(&dev->ib_dev, &pvrdma_dev_ops);



	mutex_init(&dev->port_mutex);

	spin_lock_init(&dev->desc_lock);
@@ -255,10 +266,7 @@ static int pvrdma_register_device(struct pvrdma_dev *dev) 
			(1ull << IB_USER_VERBS_CMD_DESTROY_SRQ)	|

			(1ull << IB_USER_VERBS_CMD_POST_SRQ_RECV);



		dev->ib_dev.create_srq = pvrdma_create_srq;

		dev->ib_dev.modify_srq = pvrdma_modify_srq;

		dev->ib_dev.query_srq = pvrdma_query_srq;

		dev->ib_dev.destroy_srq = pvrdma_destroy_srq;

		ib_set_device_ops(&dev->ib_dev, &pvrdma_dev_srq_ops);



		dev->srq_tbl = kcalloc(dev->dsr->caps.max_srq,

				       sizeof(struct pvrdma_srq *),