From e2e50f485c7cac5f449237c4bf7db91b72c4813f Mon Sep 17 00:00:00 2001 From: Artemy Kovalyov Date: Sun, 23 Apr 2017 10:30:25 +0300 Subject: [PATCH 1/2] mlx5: Few small fixes 1) Drop redundant line as part of CQE parsing and fix indentation. 2) Under DEBUG mode add a missing 'static' declaration. Signed-off-by: Artemy Kovalyov Reviewed-by: Yishai Hadas --- providers/mlx5/cq.c | 4 +--- providers/mlx5/qp.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/providers/mlx5/cq.c b/providers/mlx5/cq.c index 2e8b584b0..288e08f7c 100644 --- a/providers/mlx5/cq.c +++ b/providers/mlx5/cq.c @@ -177,7 +177,7 @@ static inline int handle_responder_lazy(struct mlx5_cq *cq, struct mlx5_cqe64 *c else if (cqe->op_own & MLX5_INLINE_SCATTER_64) err = mlx5_copy_to_recv_wqe(qp, wqe_ctr, cqe - 1, be32toh(cqe->byte_cnt)); -} + } return err; } @@ -228,8 +228,6 @@ static inline int handle_responder(struct ibv_wc *wc, struct mlx5_cqe64 *cqe, if (err) return err; - wc->byte_len = be32toh(cqe->byte_cnt); - switch (cqe->op_own >> 4) { case MLX5_CQE_RESP_WR_IMM: wc->opcode = IBV_WC_RECV_RDMA_WITH_IMM; diff --git a/providers/mlx5/qp.c b/providers/mlx5/qp.c index 1d5a2f923..597575548 100644 --- a/providers/mlx5/qp.c +++ b/providers/mlx5/qp.c @@ -317,7 +317,7 @@ static uint8_t wq_sig(struct mlx5_wqe_ctrl_seg *ctrl) } #ifdef MLX5_DEBUG -void dump_wqe(FILE *fp, int idx, int size_16, struct mlx5_qp *qp) +static void dump_wqe(FILE *fp, int idx, int size_16, struct mlx5_qp *qp) { uint32_t *uninitialized_var(p); int i, j; From 97fe568be26f27367cbcecc389356112f12a5141 Mon Sep 17 00:00:00 2001 From: Noa Osherovich Date: Wed, 19 Apr 2017 13:57:41 +0300 Subject: [PATCH 2/2] mlx5: Update supported PCI devices list Add the BlueField device and VF IDs to the supported devices list. Signed-off-by: Noa Osherovich Reviewed-by: Yishai Hadas --- providers/mlx5/mlx5.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/providers/mlx5/mlx5.c b/providers/mlx5/mlx5.c index 30f165b02..1bbc3f2f6 100644 --- a/providers/mlx5/mlx5.c +++ b/providers/mlx5/mlx5.c @@ -78,6 +78,8 @@ static struct { HCA(MELLANOX, 4122), /* ConnectX-5 Ex VF */ HCA(MELLANOX, 4123), /* ConnectX-6 */ HCA(MELLANOX, 4124), /* ConnectX-6 VF */ + HCA(MELLANOX, 41682), /* BlueField integrated ConnectX-5 network controller */ + HCA(MELLANOX, 41683), /* BlueField integrated ConnectX-5 network controller VF */ }; uint32_t mlx5_debug_mask = 0;