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

Commit 7854ac44 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 core infrastructure updates and fixes.

From Eran:
 - Add MPEGC (Management PCIe General Configuration) registers and btis
 - Fix tristate and description for MLX5 module

rom Feras:
 - Add hardware structures for the firmware tracer

From Jainbo:
 - Core support for double vlan push/pop steering action

From Max:
 - Add XRQ commands definitions

From Noa:
 - Add missing SET_DRIVER_VERSION command translation

From Roi:
 - Use ERR_CAST() instead of coding it

From Tariq:
 - Better return types for CQE API

Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parents c9eaaa17 048f3143

drivers/infiniband/hw/mlx5/Kconfig

+1 −1
Original line number Diff line number Diff line 
config MLX5_INFINIBAND

	tristate "Mellanox Connect-IB HCA support"

	tristate "Mellanox 5th generation network adapters (ConnectX series) support"

	depends on NETDEVICES && ETHERNET && PCI && MLX5_CORE

	depends on INFINIBAND_USER_ACCESS || INFINIBAND_USER_ACCESS=n

	---help---

drivers/infiniband/hw/mlx5/cmd.c

+15 −0
Original line number Diff line number Diff line
@@ -32,6 +32,21 @@ 


#include "cmd.h"



int mlx5_cmd_dump_fill_mkey(struct mlx5_core_dev *dev, u32 *mkey)

{

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

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

	int err;



	MLX5_SET(query_special_contexts_in, in, opcode,

		 MLX5_CMD_OP_QUERY_SPECIAL_CONTEXTS);

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

	if (!err)

		*mkey = MLX5_GET(query_special_contexts_out, out,

				 dump_fill_mkey);

	return err;

}



int mlx5_cmd_null_mkey(struct mlx5_core_dev *dev, u32 *null_mkey)

{

	u32 out[MLX5_ST_SZ_DW(query_special_contexts_out)] = {};

drivers/infiniband/hw/mlx5/cmd.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/kernel.h>

#include <linux/mlx5/driver.h>



int mlx5_cmd_dump_fill_mkey(struct mlx5_core_dev *dev, u32 *mkey);

int mlx5_cmd_null_mkey(struct mlx5_core_dev *dev, u32 *null_mkey);

int mlx5_cmd_query_cong_params(struct mlx5_core_dev *dev, int cong_point,

			       void *out, int out_size);

drivers/net/ethernet/mellanox/mlx5/core/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



config MLX5_CORE

	tristate "Mellanox Technologies ConnectX-4 and Connect-IB core driver"

	tristate "Mellanox 5th generation network adapters (ConnectX series) core driver"

	depends on MAY_USE_DEVLINK

	depends on PCI

	imply PTP_1588_CLOCK
@@ -27,7 +27,7 @@ config MLX5_FPGA 
          sandbox-specific client drivers.



config MLX5_CORE_EN

	bool "Mellanox Technologies ConnectX-4 Ethernet support"

	bool "Mellanox 5th generation network adapters (ConnectX series) Ethernet support"

	depends on NETDEVICES && ETHERNET && INET && PCI && MLX5_CORE

	depends on IPV6=y || IPV6=n || MLX5_CORE=m

	select PAGE_POOL
@@ -69,7 +69,7 @@ config MLX5_CORE_EN_DCB 
	  If unsure, set to Y



config MLX5_CORE_IPOIB

	bool "Mellanox Technologies ConnectX-4 IPoIB offloads support"

	bool "Mellanox 5th generation network adapters (connectX series) IPoIB offloads support"

	depends on MLX5_CORE_EN

	default n

	---help---

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

+30 −23
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, 
	case MLX5_CMD_OP_DESTROY_PSV:

	case MLX5_CMD_OP_DESTROY_SRQ:

	case MLX5_CMD_OP_DESTROY_XRC_SRQ:

	case MLX5_CMD_OP_DESTROY_XRQ:

	case MLX5_CMD_OP_DESTROY_DCT:

	case MLX5_CMD_OP_DEALLOC_Q_COUNTER:

	case MLX5_CMD_OP_DESTROY_SCHEDULING_ELEMENT:
@@ -310,6 +311,7 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, 
	case MLX5_CMD_OP_DEALLOC_ENCAP_HEADER:

	case MLX5_CMD_OP_DEALLOC_MODIFY_HEADER_CONTEXT:

	case MLX5_CMD_OP_FPGA_DESTROY_QP:

	case MLX5_CMD_OP_DESTROY_GENERAL_OBJECT:

		return MLX5_CMD_STAT_OK;



	case MLX5_CMD_OP_QUERY_HCA_CAP:
@@ -346,6 +348,9 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, 
	case MLX5_CMD_OP_CREATE_XRC_SRQ:

	case MLX5_CMD_OP_QUERY_XRC_SRQ:

	case MLX5_CMD_OP_ARM_XRC_SRQ:

	case MLX5_CMD_OP_CREATE_XRQ:

	case MLX5_CMD_OP_QUERY_XRQ:

	case MLX5_CMD_OP_ARM_XRQ:

	case MLX5_CMD_OP_CREATE_DCT:

	case MLX5_CMD_OP_DRAIN_DCT:

	case MLX5_CMD_OP_QUERY_DCT:
@@ -427,6 +432,7 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, 
	case MLX5_CMD_OP_FPGA_MODIFY_QP:

	case MLX5_CMD_OP_FPGA_QUERY_QP:

	case MLX5_CMD_OP_FPGA_QUERY_QP_COUNTERS:

	case MLX5_CMD_OP_CREATE_GENERAL_OBJECT:

		*status = MLX5_DRIVER_STATUS_ABORTED;

		*synd = MLX5_DRIVER_SYND;

		return -EIO;
@@ -452,6 +458,7 @@ const char *mlx5_command_str(int command) 
	MLX5_COMMAND_STR_CASE(SET_HCA_CAP);

	MLX5_COMMAND_STR_CASE(QUERY_ISSI);

	MLX5_COMMAND_STR_CASE(SET_ISSI);

	MLX5_COMMAND_STR_CASE(SET_DRIVER_VERSION);

	MLX5_COMMAND_STR_CASE(CREATE_MKEY);

	MLX5_COMMAND_STR_CASE(QUERY_MKEY);

	MLX5_COMMAND_STR_CASE(DESTROY_MKEY);
@@ -599,6 +606,12 @@ const char *mlx5_command_str(int command) 
	MLX5_COMMAND_STR_CASE(FPGA_QUERY_QP);

	MLX5_COMMAND_STR_CASE(FPGA_QUERY_QP_COUNTERS);

	MLX5_COMMAND_STR_CASE(FPGA_DESTROY_QP);

	MLX5_COMMAND_STR_CASE(CREATE_XRQ);

	MLX5_COMMAND_STR_CASE(DESTROY_XRQ);

	MLX5_COMMAND_STR_CASE(QUERY_XRQ);

	MLX5_COMMAND_STR_CASE(ARM_XRQ);

	MLX5_COMMAND_STR_CASE(CREATE_GENERAL_OBJECT);

	MLX5_COMMAND_STR_CASE(DESTROY_GENERAL_OBJECT);

	default: return "unknown command opcode";

	}

}
@@ -677,7 +690,7 @@ struct mlx5_ifc_mbox_out_bits { 


struct mlx5_ifc_mbox_in_bits {

	u8         opcode[0x10];

	u8         reserved_at_10[0x10];

	u8         uid[0x10];



	u8         reserved_at_20[0x10];

	u8         op_mod[0x10];
@@ -697,6 +710,7 @@ static int mlx5_cmd_check(struct mlx5_core_dev *dev, void *in, void *out) 
	u8  status;

	u16 opcode;

	u16 op_mod;

	u16 uid;



	mlx5_cmd_mbox_status(out, &status, &syndrome);

	if (!status)
@@ -704,8 +718,15 @@ static int mlx5_cmd_check(struct mlx5_core_dev *dev, void *in, void *out) 


	opcode = MLX5_GET(mbox_in, in, opcode);

	op_mod = MLX5_GET(mbox_in, in, op_mod);

	uid    = MLX5_GET(mbox_in, in, uid);



	mlx5_core_err(dev,

	if (!uid && opcode != MLX5_CMD_OP_DESTROY_MKEY)

		mlx5_core_err_rl(dev,

			"%s(0x%x) op_mod(0x%x) failed, status %s(0x%x), syndrome (0x%x)\n",

			mlx5_command_str(opcode), opcode, op_mod,

			cmd_status_str(status), status, syndrome);

	else

		mlx5_core_dbg(dev,

		      "%s(0x%x) op_mod(0x%x) failed, status %s(0x%x), syndrome (0x%x)\n",

		      mlx5_command_str(opcode),

		      opcode, op_mod,
@@ -1022,7 +1043,10 @@ static ssize_t dbg_write(struct file *filp, const char __user *buf, 
	if (!dbg->in_msg || !dbg->out_msg)

		return -ENOMEM;



	if (copy_from_user(lbuf, buf, sizeof(lbuf)))

	if (count < sizeof(lbuf) - 1)

		return -EINVAL;



	if (copy_from_user(lbuf, buf, sizeof(lbuf) - 1))

		return -EFAULT;



	lbuf[sizeof(lbuf) - 1] = 0;
@@ -1226,21 +1250,12 @@ static ssize_t data_read(struct file *filp, char __user *buf, size_t count, 
{

	struct mlx5_core_dev *dev = filp->private_data;

	struct mlx5_cmd_debug *dbg = &dev->cmd.dbg;

	int copy;



	if (*pos)

		return 0;



	if (!dbg->out_msg)

		return -ENOMEM;



	copy = min_t(int, count, dbg->outlen);

	if (copy_to_user(buf, dbg->out_msg, copy))

		return -EFAULT;



	*pos += copy;



	return copy;

	return simple_read_from_buffer(buf, count, pos, dbg->out_msg,

				       dbg->outlen);

}



static const struct file_operations dfops = {
@@ -1258,19 +1273,11 @@ static ssize_t outlen_read(struct file *filp, char __user *buf, size_t count, 
	char outlen[8];

	int err;



	if (*pos)

		return 0;



	err = snprintf(outlen, sizeof(outlen), "%d", dbg->outlen);

	if (err < 0)

		return err;



	if (copy_to_user(buf, &outlen, err))

		return -EFAULT;



	*pos += err;



	return err;

	return simple_read_from_buffer(buf, count, pos, outlen, err);

}



static ssize_t outlen_write(struct file *filp, const char __user *buf,