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

Commit 186daf0c authored by Saeed Mahameed's avatar Saeed Mahameed
Browse files

Merge branch 'mlx5-next' of... 

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

mlx5 updates for both net-next and rdma-next

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

: (21 commits)
  net/mlx5: Expose DC scatter to CQE capability bit
  net/mlx5: Update mlx5_ifc with DEVX UID bits
  net/mlx5: Set uid as part of DCT commands
  net/mlx5: Set uid as part of SRQ commands
  net/mlx5: Set uid as part of SQ commands
  net/mlx5: Set uid as part of RQ commands
  net/mlx5: Set uid as part of QP commands
  net/mlx5: Set uid as part of CQ commands
  net/mlx5: Rename incorrect naming in IFC file
  net/mlx5: Export packet reformat alloc/dealloc functions
  net/mlx5: Pass a namespace for packet reformat ID allocation
  net/mlx5: Expose new packet reformat capabilities
  {net, RDMA}/mlx5: Rename encap to reformat packet
  net/mlx5: Move header encap type to IFC header file
  net/mlx5: Break encap/decap into two separated flow table creation flags
  net/mlx5: Add support for more namespaces when allocating modify header
  net/mlx5: Export modify header alloc/dealloc functions
  net/mlx5: Add proper NIC TX steering flow tables support
  net/mlx5: Cleanup flow namespace getter switch logic
  net/mlx5: Add memic command opcode to command checker
  ...

Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parents aadd4355 94a04d1d

drivers/infiniband/hw/mlx5/devx.c

+3 −3
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static bool devx_is_obj_create_cmd(const void *in) 
	case MLX5_CMD_OP_CREATE_FLOW_TABLE:

	case MLX5_CMD_OP_CREATE_FLOW_GROUP:

	case MLX5_CMD_OP_ALLOC_FLOW_COUNTER:

	case MLX5_CMD_OP_ALLOC_ENCAP_HEADER:

	case MLX5_CMD_OP_ALLOC_PACKET_REFORMAT_CONTEXT:

	case MLX5_CMD_OP_ALLOC_MODIFY_HEADER_CONTEXT:

	case MLX5_CMD_OP_CREATE_SCHEDULING_ELEMENT:

	case MLX5_CMD_OP_ADD_VXLAN_UDP_DPORT:
@@ -627,9 +627,9 @@ static void devx_obj_build_destroy_cmd(void *in, void *out, void *din, 
		MLX5_SET(general_obj_in_cmd_hdr, din, opcode,

			 MLX5_CMD_OP_DEALLOC_FLOW_COUNTER);

		break;

	case MLX5_CMD_OP_ALLOC_ENCAP_HEADER:

	case MLX5_CMD_OP_ALLOC_PACKET_REFORMAT_CONTEXT:

		MLX5_SET(general_obj_in_cmd_hdr, din, opcode,

			 MLX5_CMD_OP_DEALLOC_ENCAP_HEADER);

			 MLX5_CMD_OP_DEALLOC_PACKET_REFORMAT_CONTEXT);

		break;

	case MLX5_CMD_OP_ALLOC_MODIFY_HEADER_CONTEXT:

		MLX5_SET(general_obj_in_cmd_hdr, din, opcode,

drivers/infiniband/hw/mlx5/qp.c

+2 −2
Original line number Diff line number Diff line
@@ -1279,7 +1279,7 @@ static int create_raw_packet_qp_tir(struct mlx5_ib_dev *dev, 


	if (dev->rep)

		MLX5_SET(tirc, tirc, self_lb_block,

			 MLX5_TIRC_SELF_LB_BLOCK_BLOCK_UNICAST_);

			 MLX5_TIRC_SELF_LB_BLOCK_BLOCK_UNICAST);



	err = mlx5_core_create_tir(dev->mdev, in, inlen, &rq->tirn);
@@ -1582,7 +1582,7 @@ static int create_rss_raw_qp_tir(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp, 
create_tir:

	if (dev->rep)

		MLX5_SET(tirc, tirc, self_lb_block,

			 MLX5_TIRC_SELF_LB_BLOCK_BLOCK_UNICAST_);

			 MLX5_TIRC_SELF_LB_BLOCK_BLOCK_UNICAST);



	err = mlx5_core_create_tir(dev->mdev, in, inlen, &qp->rss_qp.tirn);

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

+8 −4
Original line number Diff line number Diff line
@@ -308,10 +308,11 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, 
	case MLX5_CMD_OP_MODIFY_FLOW_TABLE:

	case MLX5_CMD_OP_SET_FLOW_TABLE_ENTRY:

	case MLX5_CMD_OP_SET_FLOW_TABLE_ROOT:

	case MLX5_CMD_OP_DEALLOC_ENCAP_HEADER:

	case MLX5_CMD_OP_DEALLOC_PACKET_REFORMAT_CONTEXT:

	case MLX5_CMD_OP_DEALLOC_MODIFY_HEADER_CONTEXT:

	case MLX5_CMD_OP_FPGA_DESTROY_QP:

	case MLX5_CMD_OP_DESTROY_GENERAL_OBJECT:

	case MLX5_CMD_OP_DEALLOC_MEMIC:

		return MLX5_CMD_STAT_OK;



	case MLX5_CMD_OP_QUERY_HCA_CAP:
@@ -426,7 +427,7 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, 
	case MLX5_CMD_OP_QUERY_FLOW_TABLE_ENTRY:

	case MLX5_CMD_OP_ALLOC_FLOW_COUNTER:

	case MLX5_CMD_OP_QUERY_FLOW_COUNTER:

	case MLX5_CMD_OP_ALLOC_ENCAP_HEADER:

	case MLX5_CMD_OP_ALLOC_PACKET_REFORMAT_CONTEXT:

	case MLX5_CMD_OP_ALLOC_MODIFY_HEADER_CONTEXT:

	case MLX5_CMD_OP_FPGA_CREATE_QP:

	case MLX5_CMD_OP_FPGA_MODIFY_QP:
@@ -435,6 +436,7 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, 
	case MLX5_CMD_OP_CREATE_GENERAL_OBJECT:

	case MLX5_CMD_OP_MODIFY_GENERAL_OBJECT:

	case MLX5_CMD_OP_QUERY_GENERAL_OBJECT:

	case MLX5_CMD_OP_ALLOC_MEMIC:

		*status = MLX5_DRIVER_STATUS_ABORTED;

		*synd = MLX5_DRIVER_SYND;

		return -EIO;
@@ -599,8 +601,8 @@ const char *mlx5_command_str(int command) 
	MLX5_COMMAND_STR_CASE(DEALLOC_FLOW_COUNTER);

	MLX5_COMMAND_STR_CASE(QUERY_FLOW_COUNTER);

	MLX5_COMMAND_STR_CASE(MODIFY_FLOW_TABLE);

	MLX5_COMMAND_STR_CASE(ALLOC_ENCAP_HEADER);

	MLX5_COMMAND_STR_CASE(DEALLOC_ENCAP_HEADER);

	MLX5_COMMAND_STR_CASE(ALLOC_PACKET_REFORMAT_CONTEXT);

	MLX5_COMMAND_STR_CASE(DEALLOC_PACKET_REFORMAT_CONTEXT);

	MLX5_COMMAND_STR_CASE(ALLOC_MODIFY_HEADER_CONTEXT);

	MLX5_COMMAND_STR_CASE(DEALLOC_MODIFY_HEADER_CONTEXT);

	MLX5_COMMAND_STR_CASE(FPGA_CREATE_QP);
@@ -617,6 +619,8 @@ const char *mlx5_command_str(int command) 
	MLX5_COMMAND_STR_CASE(MODIFY_GENERAL_OBJECT);

	MLX5_COMMAND_STR_CASE(QUERY_GENERAL_OBJECT);

	MLX5_COMMAND_STR_CASE(QUERY_MODIFY_HEADER_CONTEXT);

	MLX5_COMMAND_STR_CASE(ALLOC_MEMIC);

	MLX5_COMMAND_STR_CASE(DEALLOC_MEMIC);

	default: return "unknown command opcode";

	}

}

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

+4 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ int mlx5_core_create_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq, 
	cq->cons_index = 0;

	cq->arm_sn     = 0;

	cq->eq         = eq;

	cq->uid = MLX5_GET(create_cq_in, in, uid);

	refcount_set(&cq->refcount, 1);

	init_completion(&cq->free);

	if (!cq->comp)
@@ -144,6 +145,7 @@ int mlx5_core_create_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq, 
	memset(dout, 0, sizeof(dout));

	MLX5_SET(destroy_cq_in, din, opcode, MLX5_CMD_OP_DESTROY_CQ);

	MLX5_SET(destroy_cq_in, din, cqn, cq->cqn);

	MLX5_SET(destroy_cq_in, din, uid, cq->uid);

	mlx5_cmd_exec(dev, din, sizeof(din), dout, sizeof(dout));

	return err;

}
@@ -165,6 +167,7 @@ int mlx5_core_destroy_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq) 


	MLX5_SET(destroy_cq_in, in, opcode, MLX5_CMD_OP_DESTROY_CQ);

	MLX5_SET(destroy_cq_in, in, cqn, cq->cqn);

	MLX5_SET(destroy_cq_in, in, uid, cq->uid);

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

	if (err)

		return err;
@@ -196,6 +199,7 @@ int mlx5_core_modify_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq, 
	u32 out[MLX5_ST_SZ_DW(modify_cq_out)] = {0};



	MLX5_SET(modify_cq_in, in, opcode, MLX5_CMD_OP_MODIFY_CQ);

	MLX5_SET(modify_cq_in, in, uid, cq->uid);

	return mlx5_cmd_exec(dev, in, inlen, out, sizeof(out));

}

EXPORT_SYMBOL(mlx5_core_modify_cq);

drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.h

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ TRACE_EVENT(mlx5_fs_del_fg, 
	{MLX5_FLOW_CONTEXT_ACTION_DROP,		 "DROP"},\

	{MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,	 "FWD"},\

	{MLX5_FLOW_CONTEXT_ACTION_COUNT,	 "CNT"},\

	{MLX5_FLOW_CONTEXT_ACTION_ENCAP,	 "ENCAP"},\

	{MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT, "REFORMAT"},\

	{MLX5_FLOW_CONTEXT_ACTION_DECAP,	 "DECAP"},\

	{MLX5_FLOW_CONTEXT_ACTION_MOD_HDR,	 "MOD_HDR"},\

	{MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH,	 "VLAN_PUSH"},\