Commit a6b1b936 authored by Saeed Mahameed's avatar Saeed Mahameed
Browse files

Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux 



mlx5 updates for both net-next and rdma-next:

1) HW bits and definitions for TLS and IPsec offlaods
2) Release all pages capability bits
3) New command interface helpers and some code cleanup as a result
4) Move qp.c out of mlx5 core driver into mlx5_ib rdma driver

Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parents 323e395f 2dc8b524

drivers/infiniband/hw/mlx5/Makefile

+21 −7
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-$(CONFIG_MLX5_INFINIBAND) += mlx5_ib.o



mlx5_ib-y :=	main.o cq.o doorbell.o qp.o mem.o srq_cmd.o \

		srq.o mr.o ah.o mad.o gsi.o ib_virt.o cmd.o \

		cong.o restrack.o

mlx5_ib-y := ah.o \

	     cmd.o \

	     cong.o \

	     cq.o \

	     doorbell.o \

	     gsi.o \

	     ib_virt.o \

	     mad.o \

	     main.o \

	     mem.o \

	     mr.o \

	     qp.o \

	     qpc.o \

	     restrack.o \

	     srq.o \

	     srq_cmd.o



mlx5_ib-$(CONFIG_INFINIBAND_ON_DEMAND_PAGING) += odp.o

mlx5_ib-$(CONFIG_MLX5_ESWITCH) += ib_rep.o

mlx5_ib-$(CONFIG_INFINIBAND_USER_ACCESS) += devx.o

mlx5_ib-$(CONFIG_INFINIBAND_USER_ACCESS) += flow.o

mlx5_ib-$(CONFIG_INFINIBAND_USER_ACCESS) += qos.o
 
mlx5_ib-$(CONFIG_INFINIBAND_USER_ACCESS) += devx.o \

					    flow.o \

					    qos.o

drivers/infiniband/hw/mlx5/cmd.c

+0 −17
Original line number Diff line number Diff line
@@ -327,23 +327,6 @@ int mlx5_cmd_xrcd_dealloc(struct mlx5_core_dev *dev, u32 xrcdn, u16 uid) 
	return mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

}



int mlx5_cmd_alloc_q_counter(struct mlx5_core_dev *dev, u16 *counter_id,

			     u16 uid)

{

	u32 in[MLX5_ST_SZ_DW(alloc_q_counter_in)]   = {0};

	u32 out[MLX5_ST_SZ_DW(alloc_q_counter_out)] = {0};

	int err;



	MLX5_SET(alloc_q_counter_in, in, opcode, MLX5_CMD_OP_ALLOC_Q_COUNTER);

	MLX5_SET(alloc_q_counter_in, in, uid, uid);



	err = mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

	if (!err)

		*counter_id = MLX5_GET(alloc_q_counter_out, out,

				       counter_set_id);

	return err;

}



int mlx5_cmd_mad_ifc(struct mlx5_core_dev *dev, const void *inb, void *outb,

		     u16 opmod, u8 port)

{

drivers/infiniband/hw/mlx5/cmd.h

+0 −2
Original line number Diff line number Diff line
@@ -61,8 +61,6 @@ int mlx5_cmd_detach_mcg(struct mlx5_core_dev *dev, union ib_gid *mgid, 
			u32 qpn, u16 uid);

int mlx5_cmd_xrcd_alloc(struct mlx5_core_dev *dev, u32 *xrcdn, u16 uid);

int mlx5_cmd_xrcd_dealloc(struct mlx5_core_dev *dev, u32 xrcdn, u16 uid);

int mlx5_cmd_alloc_q_counter(struct mlx5_core_dev *dev, u16 *counter_id,

			     u16 uid);

int mlx5_cmd_mad_ifc(struct mlx5_core_dev *dev, const void *inb, void *outb,

		     u16 opmod, u8 port);

#endif /* MLX5_IB_CMD_H */

drivers/infiniband/hw/mlx5/cq.c

+6 −5
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <rdma/ib_cache.h>

#include "mlx5_ib.h"

#include "srq.h"

#include "qp.h"



static void mlx5_ib_cq_comp(struct mlx5_core_cq *cq, struct mlx5_eqe *eqe)

{
@@ -201,7 +202,7 @@ static void handle_responder(struct ib_wc *wc, struct mlx5_cqe64 *cqe, 
	case MLX5_CQE_RESP_WR_IMM:

		wc->opcode	= IB_WC_RECV_RDMA_WITH_IMM;

		wc->wc_flags	= IB_WC_WITH_IMM;

		wc->ex.imm_data = cqe->imm_inval_pkey;

		wc->ex.imm_data = cqe->immediate;

		break;

	case MLX5_CQE_RESP_SEND:

		wc->opcode   = IB_WC_RECV;
@@ -213,12 +214,12 @@ static void handle_responder(struct ib_wc *wc, struct mlx5_cqe64 *cqe, 
	case MLX5_CQE_RESP_SEND_IMM:

		wc->opcode	= IB_WC_RECV;

		wc->wc_flags	= IB_WC_WITH_IMM;

		wc->ex.imm_data = cqe->imm_inval_pkey;

		wc->ex.imm_data = cqe->immediate;

		break;

	case MLX5_CQE_RESP_SEND_INV:

		wc->opcode	= IB_WC_RECV;

		wc->wc_flags	= IB_WC_WITH_INVALIDATE;

		wc->ex.invalidate_rkey = be32_to_cpu(cqe->imm_inval_pkey);

		wc->ex.invalidate_rkey = be32_to_cpu(cqe->inval_rkey);

		break;

	}

	wc->src_qp	   = be32_to_cpu(cqe->flags_rqpn) & 0xffffff;
@@ -226,7 +227,7 @@ static void handle_responder(struct ib_wc *wc, struct mlx5_cqe64 *cqe, 
	g = (be32_to_cpu(cqe->flags_rqpn) >> 28) & 3;

	wc->wc_flags |= g ? IB_WC_GRH : 0;

	if (unlikely(is_qp1(qp->ibqp.qp_type))) {

		u16 pkey = be32_to_cpu(cqe->imm_inval_pkey) & 0xffff;

		u16 pkey = be32_to_cpu(cqe->pkey) & 0xffff;



		ib_find_cached_pkey(&dev->ib_dev, qp->port, pkey,

				    &wc->pkey_index);
@@ -484,7 +485,7 @@ repoll: 
		 * because CQs will be locked while QPs are removed

		 * from the table.

		 */

		mqp = __mlx5_qp_lookup(dev->mdev, qpn);

		mqp = radix_tree_lookup(&dev->qp_table.tree, qpn);

		*cur_qp = to_mibqp(mqp);

	}

drivers/infiniband/hw/mlx5/devx.c

+5 −5
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/mlx5/driver.h>

#include <linux/mlx5/fs.h>

#include "mlx5_ib.h"

#include "qp.h"

#include <linux/xarray.h>



#define UVERBS_MODULE_NAME mlx5_ib
@@ -1356,7 +1357,7 @@ static int devx_obj_cleanup(struct ib_uobject *uobject, 
	}



	if (obj->flags & DEVX_OBJ_FLAGS_DCT)

		ret = mlx5_core_destroy_dct(obj->ib_dev->mdev, &obj->core_dct);

		ret = mlx5_core_destroy_dct(obj->ib_dev, &obj->core_dct);

	else if (obj->flags & DEVX_OBJ_FLAGS_CQ)

		ret = mlx5_core_destroy_cq(obj->ib_dev->mdev, &obj->core_cq);

	else
@@ -1450,9 +1451,8 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)( 


	if (opcode == MLX5_CMD_OP_CREATE_DCT) {

		obj->flags |= DEVX_OBJ_FLAGS_DCT;

		err = mlx5_core_create_dct(dev->mdev, &obj->core_dct,

					   cmd_in, cmd_in_len,

					   cmd_out, cmd_out_len);

		err = mlx5_core_create_dct(dev, &obj->core_dct, cmd_in,

					   cmd_in_len, cmd_out, cmd_out_len);

	} else if (opcode == MLX5_CMD_OP_CREATE_CQ) {

		obj->flags |= DEVX_OBJ_FLAGS_CQ;

		obj->core_cq.comp = devx_cq_comp;
@@ -1499,7 +1499,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)( 


obj_destroy:

	if (obj->flags & DEVX_OBJ_FLAGS_DCT)

		mlx5_core_destroy_dct(obj->ib_dev->mdev, &obj->core_dct);

		mlx5_core_destroy_dct(obj->ib_dev, &obj->core_dct);

	else if (obj->flags & DEVX_OBJ_FLAGS_CQ)

		mlx5_core_destroy_cq(obj->ib_dev->mdev, &obj->core_cq);

	else

CRA Git | Maintained and supported by SUSTech CRA and CCSE