IB/mlx4: Implement query SRQ (65541cb7) · Commits · e / devices / android_kernel_samsung_smdk4412

drivers/infiniband/hw/mlx4/main.c

+2 −0

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -256,6 +256,7 @@ struct ib_srq mlx4_ib_create_srq(struct ib_pd pd,
	struct ib_udata *udata);		struct ib_udata *udata);
	int mlx4_ib_modify_srq(struct ib_srq ibsrq, struct ib_srq_attr attr,		int mlx4_ib_modify_srq(struct ib_srq ibsrq, struct ib_srq_attr attr,
	enum ib_srq_attr_mask attr_mask, struct ib_udata *udata);		enum ib_srq_attr_mask attr_mask, struct ib_udata *udata);
			int mlx4_ib_query_srq(struct ib_srq srq, struct ib_srq_attr srq_attr);
	int mlx4_ib_destroy_srq(struct ib_srq *srq);		int mlx4_ib_destroy_srq(struct ib_srq *srq);
	void mlx4_ib_free_srq_wqe(struct mlx4_ib_srq *srq, int wqe_index);		void mlx4_ib_free_srq_wqe(struct mlx4_ib_srq *srq, int wqe_index);
	int mlx4_ib_post_srq_recv(struct ib_srq ibsrq, struct ib_recv_wr wr,		int mlx4_ib_post_srq_recv(struct ib_srq ibsrq, struct ib_recv_wr wr,

+18 −0

Original line number	Original line	Diff line number	Diff line
	@@ -240,6 +240,24 @@ int mlx4_ib_modify_srq(struct ib_srq ibsrq, struct ib_srq_attr attr,
	return 0;		return 0;
	}		}

			int mlx4_ib_query_srq(struct ib_srq ibsrq, struct ib_srq_attr srq_attr)
			{
			struct mlx4_ib_dev *dev = to_mdev(ibsrq->device);
			struct mlx4_ib_srq *srq = to_msrq(ibsrq);
			int ret;
			int limit_watermark;

			ret = mlx4_srq_query(dev->dev, &srq->msrq, &limit_watermark);
			if (ret)
			return ret;

			srq_attr->srq_limit = be16_to_cpu(limit_watermark);
			srq_attr->max_wr = srq->msrq.max - 1;
			srq_attr->max_sge = srq->msrq.max_gs;

			return 0;
			}

	int mlx4_ib_destroy_srq(struct ib_srq *srq)		int mlx4_ib_destroy_srq(struct ib_srq *srq)
	{		{
	struct mlx4_ib_dev *dev = to_mdev(srq->device);		struct mlx4_ib_dev *dev = to_mdev(srq->device);

+30 −0

Original line number	Original line	Diff line number	Diff line
	@@ -102,6 +102,13 @@ static int mlx4_ARM_SRQ(struct mlx4_dev *dev, int srq_num, int limit_watermark)
	MLX4_CMD_TIME_CLASS_B);		MLX4_CMD_TIME_CLASS_B);
	}		}

			static int mlx4_QUERY_SRQ(struct mlx4_dev dev, struct mlx4_cmd_mailbox mailbox,
			int srq_num)
			{
			return mlx4_cmd_box(dev, 0, mailbox->dma, srq_num, 0, MLX4_CMD_QUERY_SRQ,
			MLX4_CMD_TIME_CLASS_A);
			}

	int mlx4_srq_alloc(struct mlx4_dev dev, u32 pdn, struct mlx4_mtt mtt,		int mlx4_srq_alloc(struct mlx4_dev dev, u32 pdn, struct mlx4_mtt mtt,
	u64 db_rec, struct mlx4_srq *srq)		u64 db_rec, struct mlx4_srq *srq)
	{		{
	@@ -205,6 +212,29 @@ int mlx4_srq_arm(struct mlx4_dev dev, struct mlx4_srq srq, int limit_watermark
	}		}
	EXPORT_SYMBOL_GPL(mlx4_srq_arm);		EXPORT_SYMBOL_GPL(mlx4_srq_arm);

			int mlx4_srq_query(struct mlx4_dev dev, struct mlx4_srq srq, int *limit_watermark)
			{
			struct mlx4_cmd_mailbox *mailbox;
			struct mlx4_srq_context *srq_context;
			int err;

			mailbox = mlx4_alloc_cmd_mailbox(dev);
			if (IS_ERR(mailbox))
			return PTR_ERR(mailbox);

			srq_context = mailbox->buf;

			err = mlx4_QUERY_SRQ(dev, mailbox, srq->srqn);
			if (err)
			goto err_out;
			*limit_watermark = srq_context->limit_watermark;

			err_out:
			mlx4_free_cmd_mailbox(dev, mailbox);
			return err;
			}
			EXPORT_SYMBOL_GPL(mlx4_srq_query);

	int __devinit mlx4_init_srq_table(struct mlx4_dev *dev)		int __devinit mlx4_init_srq_table(struct mlx4_dev *dev)
	{		{
	struct mlx4_srq_table *srq_table = &mlx4_priv(dev)->srq_table;		struct mlx4_srq_table *srq_table = &mlx4_priv(dev)->srq_table;

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -323,6 +323,7 @@ int mlx4_srq_alloc(struct mlx4_dev dev, u32 pdn, struct mlx4_mtt mtt,
	u64 db_rec, struct mlx4_srq *srq);		u64 db_rec, struct mlx4_srq *srq);
	void mlx4_srq_free(struct mlx4_dev dev, struct mlx4_srq srq);		void mlx4_srq_free(struct mlx4_dev dev, struct mlx4_srq srq);
	int mlx4_srq_arm(struct mlx4_dev dev, struct mlx4_srq srq, int limit_watermark);		int mlx4_srq_arm(struct mlx4_dev dev, struct mlx4_srq srq, int limit_watermark);
			int mlx4_srq_query(struct mlx4_dev dev, struct mlx4_srq srq, int *limit_watermark);

	int mlx4_INIT_PORT(struct mlx4_dev *dev, int port);		int mlx4_INIT_PORT(struct mlx4_dev *dev, int port);
	int mlx4_CLOSE_PORT(struct mlx4_dev *dev, int port);		int mlx4_CLOSE_PORT(struct mlx4_dev *dev, int port);

Original line number	Original line	Diff line number	Diff line
	@@ -529,6 +529,7 @@ static void mlx4_ib_add(struct mlx4_dev dev)
	(1ull << IB_USER_VERBS_CMD_DETACH_MCAST) \|		(1ull << IB_USER_VERBS_CMD_DETACH_MCAST) \|
	(1ull << IB_USER_VERBS_CMD_CREATE_SRQ) \|		(1ull << IB_USER_VERBS_CMD_CREATE_SRQ) \|
	(1ull << IB_USER_VERBS_CMD_MODIFY_SRQ) \|		(1ull << IB_USER_VERBS_CMD_MODIFY_SRQ) \|
			(1ull << IB_USER_VERBS_CMD_QUERY_SRQ) \|
	(1ull << IB_USER_VERBS_CMD_DESTROY_SRQ);		(1ull << IB_USER_VERBS_CMD_DESTROY_SRQ);

	ibdev->ib_dev.query_device = mlx4_ib_query_device;		ibdev->ib_dev.query_device = mlx4_ib_query_device;
	@@ -547,6 +548,7 @@ static void mlx4_ib_add(struct mlx4_dev dev)
	ibdev->ib_dev.destroy_ah = mlx4_ib_destroy_ah;		ibdev->ib_dev.destroy_ah = mlx4_ib_destroy_ah;
	ibdev->ib_dev.create_srq = mlx4_ib_create_srq;		ibdev->ib_dev.create_srq = mlx4_ib_create_srq;
	ibdev->ib_dev.modify_srq = mlx4_ib_modify_srq;		ibdev->ib_dev.modify_srq = mlx4_ib_modify_srq;
			ibdev->ib_dev.query_srq = mlx4_ib_query_srq;
	ibdev->ib_dev.destroy_srq = mlx4_ib_destroy_srq;		ibdev->ib_dev.destroy_srq = mlx4_ib_destroy_srq;
	ibdev->ib_dev.post_srq_recv = mlx4_ib_post_srq_recv;		ibdev->ib_dev.post_srq_recv = mlx4_ib_post_srq_recv;
	ibdev->ib_dev.create_qp = mlx4_ib_create_qp;		ibdev->ib_dev.create_qp = mlx4_ib_create_qp;