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

Commit 34356f64 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Doug Ledford
Browse files

IB/mlx5: Unify CQ create flags check 



The create_cq() can receive creation flags which were used
differently by two commits which added create_cq extended
command and cross-channel. The merged code caused to not
accept any flags at all.

This patch unifies the check into one function and one return
error code.

Fixes: 972ecb82 ("IB/mlx5: Add create_cq extended command")
Fixes: 051f2630 ("IB/mlx5: Add driver cross-channel support")
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent ad5f8e96

drivers/infiniband/hw/mlx5/cq.c

+1 −8
Original line number Diff line number Diff line
@@ -757,10 +757,6 @@ static void destroy_cq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq) 
	mlx5_db_free(dev->mdev, &cq->db);

}



enum {

	CQ_CREATE_FLAGS_SUPPORTED = IB_CQ_FLAGS_TIMESTAMP_COMPLETION

};



struct ib_cq *mlx5_ib_create_cq(struct ib_device *ibdev,

				const struct ib_cq_init_attr *attr,

				struct ib_ucontext *context,
@@ -778,13 +774,10 @@ struct ib_cq *mlx5_ib_create_cq(struct ib_device *ibdev, 
	int eqn;

	int err;



	if (check_cq_create_flags(attr->flags))

		return ERR_PTR(-EINVAL);



	if (entries < 0)

		return ERR_PTR(-EINVAL);



	if (attr->flags & ~CQ_CREATE_FLAGS_SUPPORTED)

	if (check_cq_create_flags(attr->flags))

		return ERR_PTR(-EOPNOTSUPP);



	entries = roundup_pow_of_two(entries + 1);

drivers/infiniband/hw/mlx5/mlx5_ib.h

+2 −1
Original line number Diff line number Diff line
@@ -739,7 +739,8 @@ static inline u32 check_cq_create_flags(u32 flags) 
	 * It returns non-zero value for unsupported CQ

	 * create flags, otherwise it returns zero.

	 */

	return (flags & ~IB_CQ_FLAGS_IGNORE_OVERRUN);

	return (flags & ~(IB_CQ_FLAGS_IGNORE_OVERRUN |

			  IB_CQ_FLAGS_TIMESTAMP_COMPLETION));

}



static inline int verify_assign_uidx(u8 cqe_version, u32 cmd_uidx,