Commit abc7a4ef authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5-update-2017-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux 



Saeed Mahameed says:

====================
mlx5-update-2017-05-23

First patch from Leon, came to remove the redundant usage of mlx5_vzalloc,
and directly use kvzalloc across all mlx5 drivers.

2nd patch from Noa, adds new device IDs into the supported devices list.

3rd and 4th patches from Ilan are adding the basic infrastructure and
support for Mellanox's mlx5 FPGA.

Last two patches from Tariq came to modify the outdated driver version
reported in ethtool and in mlx5_ib to more reflect the current driver state
and remove the redundant date string reported in the version.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ce682ef6 b359911d

MAINTAINERS

+10 −0
Original line number Diff line number Diff line
@@ -8311,6 +8311,16 @@ W: http://www.mellanox.com 
Q:	http://patchwork.ozlabs.org/project/netdev/list/

F:	drivers/net/ethernet/mellanox/mlx5/core/en_*



MELLANOX ETHERNET INNOVA DRIVER

M:	Ilan Tayari <ilant@mellanox.com>

R:	Boris Pismenny <borisp@mellanox.com>

L:	netdev@vger.kernel.org

S:	Supported

W:	http://www.mellanox.com

Q:	http://patchwork.ozlabs.org/project/netdev/list/

F:	drivers/net/ethernet/mellanox/mlx5/core/fpga/*

F:	include/linux/mlx5/mlx5_ifc_fpga.h



MELLANOX ETHERNET SWITCH DRIVERS

M:	Jiri Pirko <jiri@mellanox.com>

M:	Ido Schimmel <idosch@mellanox.com>

drivers/infiniband/hw/mlx5/cq.c

+3 −3
Original line number Diff line number Diff line
@@ -788,7 +788,7 @@ static int create_cq_user(struct mlx5_ib_dev *dev, struct ib_udata *udata, 


	*inlen = MLX5_ST_SZ_BYTES(create_cq_in) +

		 MLX5_FLD_SZ_BYTES(create_cq_in, pas[0]) * ncont;

	*cqb = mlx5_vzalloc(*inlen);

	*cqb = kvzalloc(*inlen, GFP_KERNEL);

	if (!*cqb) {

		err = -ENOMEM;

		goto err_db;
@@ -884,7 +884,7 @@ static int create_cq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq, 


	*inlen = MLX5_ST_SZ_BYTES(create_cq_in) +

		 MLX5_FLD_SZ_BYTES(create_cq_in, pas[0]) * cq->buf.buf.npages;

	*cqb = mlx5_vzalloc(*inlen);

	*cqb = kvzalloc(*inlen, GFP_KERNEL);

	if (!*cqb) {

		err = -ENOMEM;

		goto err_buf;
@@ -1314,7 +1314,7 @@ int mlx5_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata) 
	inlen = MLX5_ST_SZ_BYTES(modify_cq_in) +

		MLX5_FLD_SZ_BYTES(modify_cq_in, pas[0]) * npas;



	in = mlx5_vzalloc(inlen);

	in = kvzalloc(inlen, GFP_KERNEL);

	if (!in) {

		err = -ENOMEM;

		goto ex_resize;

drivers/infiniband/hw/mlx5/mad.c

+2 −2
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static int process_pma_cmd(struct ib_device *ibdev, u8 port_num, 
			(struct ib_pma_portcounters_ext *)(out_mad->data + 40);

		int sz = MLX5_ST_SZ_BYTES(query_vport_counter_out);



		out_cnt = mlx5_vzalloc(sz);

		out_cnt = kvzalloc(sz, GFP_KERNEL);

		if (!out_cnt)

			return IB_MAD_RESULT_FAILURE;
@@ -231,7 +231,7 @@ static int process_pma_cmd(struct ib_device *ibdev, u8 port_num, 
			(struct ib_pma_portcounters *)(out_mad->data + 40);

		int sz = MLX5_ST_SZ_BYTES(ppcnt_reg);



		out_cnt = mlx5_vzalloc(sz);

		out_cnt = kvzalloc(sz, GFP_KERNEL);

		if (!out_cnt)

			return IB_MAD_RESULT_FAILURE;

drivers/infiniband/hw/mlx5/main.c

+5 −6
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ 
#include "cmd.h"



#define DRIVER_NAME "mlx5_ib"

#define DRIVER_VERSION "2.2-1"

#define DRIVER_RELDATE	"Feb 2014"

#define DRIVER_VERSION "5.0-0"



MODULE_AUTHOR("Eli Cohen <eli@mellanox.com>");

MODULE_DESCRIPTION("Mellanox Connect-IB HCA IB driver");
@@ -70,7 +69,7 @@ MODULE_VERSION(DRIVER_VERSION); 


static char mlx5_version[] =

	DRIVER_NAME ": Mellanox Connect-IB Infiniband driver v"

	DRIVER_VERSION " (" DRIVER_RELDATE ")\n";

	DRIVER_VERSION "\n";



enum {

	MLX5_ATOMIC_SIZE_QP_8BYTES = 1 << 3,
@@ -2263,7 +2262,7 @@ static struct mlx5_ib_flow_handler *create_flow_rule(struct mlx5_ib_dev *dev, 
	if (!is_valid_attr(dev->mdev, flow_attr))

		return ERR_PTR(-EINVAL);



	spec = mlx5_vzalloc(sizeof(*spec));

	spec = kvzalloc(sizeof(*spec), GFP_KERNEL);

	handler = kzalloc(sizeof(*handler), GFP_KERNEL);

	if (!handler || !spec) {

		err = -ENOMEM;
@@ -3456,7 +3455,7 @@ static int mlx5_ib_query_q_counters(struct mlx5_ib_dev *dev, 
	__be32 val;

	int ret, i;



	out = mlx5_vzalloc(outlen);

	out = kvzalloc(outlen, GFP_KERNEL);

	if (!out)

		return -ENOMEM;
@@ -3485,7 +3484,7 @@ static int mlx5_ib_query_cong_counters(struct mlx5_ib_dev *dev, 
	int ret, i;

	int offset = port->cnts.num_q_counters;



	out = mlx5_vzalloc(outlen);

	out = kvzalloc(outlen, GFP_KERNEL);

	if (!out)

		return -ENOMEM;

drivers/infiniband/hw/mlx5/mr.c

+1 −1
Original line number Diff line number Diff line
@@ -1110,7 +1110,7 @@ static struct mlx5_ib_mr *reg_create(struct ib_mr *ibmr, struct ib_pd *pd, 


	inlen = MLX5_ST_SZ_BYTES(create_mkey_in) +

		sizeof(*pas) * ((npages + 1) / 2) * 2;

	in = mlx5_vzalloc(inlen);

	in = kvzalloc(inlen, GFP_KERNEL);

	if (!in) {

		err = -ENOMEM;

		goto err_1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE