Commit 4806f1e2 authored by Maor Gottlieb's avatar Maor Gottlieb Committed by Saeed Mahameed
Browse files

net/mlx5: Set QP timestamp mode to default 



QPs which don't care from timestamp mode, should set the ts_format
to default, otherwise the QP creation could be failed if the timestamp
mode is not supported.

Fixes: 2fe8d4b8 ("RDMA/mlx5: Fail QP creation if the device can not support the CQE TS")
Signed-off-by: default avatarMaor Gottlieb <maorg@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 469549e4

drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c

+1 −0
Original line number Diff line number Diff line
@@ -575,6 +575,7 @@ static int mlx5_fpga_conn_create_qp(struct mlx5_fpga_conn *conn, 
	MLX5_SET(qpc, qpc, log_sq_size, ilog2(conn->qp.sq.size));

	MLX5_SET(qpc, qpc, cqn_snd, conn->cq.mcq.cqn);

	MLX5_SET(qpc, qpc, cqn_rcv, conn->cq.mcq.cqn);

	MLX5_SET(qpc, qpc, ts_format, mlx5_get_qp_default_ts(mdev));

	MLX5_SET64(qpc, qpc, dbr_addr, conn->qp.wq_ctrl.db.dma);

	if (MLX5_CAP_GEN(mdev, cqe_version) == 1)

		MLX5_SET(qpc, qpc, user_index, 0xFFFFFF);

drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c

+1 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ int mlx5i_create_underlay_qp(struct mlx5e_priv *priv) 
	}



	qpc = MLX5_ADDR_OF(create_qp_in, in, qpc);

	MLX5_SET(qpc, qpc, ts_format, mlx5_get_qp_default_ts(priv->mdev));

	MLX5_SET(qpc, qpc, st, MLX5_QP_ST_UD);

	MLX5_SET(qpc, qpc, pm_state, MLX5_QP_PM_MIGRATED);

	MLX5_SET(qpc, qpc, ulp_stateless_offload_mode,

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ static struct mlx5dr_qp *dr_create_rc_qp(struct mlx5_core_dev *mdev, 
	MLX5_SET(qpc, qpc, log_rq_size, ilog2(dr_qp->rq.wqe_cnt));

	MLX5_SET(qpc, qpc, rq_type, MLX5_NON_ZERO_RQ);

	MLX5_SET(qpc, qpc, log_sq_size, ilog2(dr_qp->sq.wqe_cnt));

	MLX5_SET(qpc, qpc, ts_format, mlx5_get_qp_default_ts(mdev));

	MLX5_SET64(qpc, qpc, dbr_addr, dr_qp->wq_ctrl.db.dma);

	if (MLX5_CAP_GEN(mdev, cqe_version) == 1)

		MLX5_SET(qpc, qpc, user_index, 0xFFFFFF);

include/linux/mlx5/qp.h

+7 −0
Original line number Diff line number Diff line
@@ -547,4 +547,11 @@ static inline const char *mlx5_qp_state_str(int state) 
	}

}



static inline int mlx5_get_qp_default_ts(struct mlx5_core_dev *dev)

{

	return !MLX5_CAP_ROCE(dev, qp_ts_format) ?

		       MLX5_QPC_TIMESTAMP_FORMAT_FREE_RUNNING :

		       MLX5_QPC_TIMESTAMP_FORMAT_DEFAULT;

}



#endif /* MLX5_QP_H */