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

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

Merge tag 'mlx5-fixes-2019-05-17' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
Mellanox, mlx5 fixes 2019-05-17

This series introduces some fixes to mlx5 driver.
For more information please see tag log below.

Please pull and let me know if there is any problem.

For -stable v4.19
  net/mlx5e: Fix ethtool rxfh commands when CONFIG_MLX5_EN_RXNFC is disabled
  net/mlx5: Imply MLXFW in mlx5_core

For -stable v5.0
  net/mlx5e: Add missing ethtool driver info for representors
  net/mlx5e: Additional check for flow destination comparison

For -stable v5.1
  net/mlx5: Fix peer pf disable hca command
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5593530e e7739a60

drivers/infiniband/hw/mlx5/ib_rep.c

+7 −6
Original line number Diff line number Diff line
@@ -109,15 +109,15 @@ u8 mlx5_ib_eswitch_mode(struct mlx5_eswitch *esw) 
}



struct mlx5_ib_dev *mlx5_ib_get_rep_ibdev(struct mlx5_eswitch *esw,

					  int vport_index)

					  u16 vport_num)

{

	return mlx5_eswitch_get_proto_dev(esw, vport_index, REP_IB);

	return mlx5_eswitch_get_proto_dev(esw, vport_num, REP_IB);

}



struct net_device *mlx5_ib_get_rep_netdev(struct mlx5_eswitch *esw,

					  int vport_index)

					  u16 vport_num)

{

	return mlx5_eswitch_get_proto_dev(esw, vport_index, REP_ETH);

	return mlx5_eswitch_get_proto_dev(esw, vport_num, REP_ETH);

}



struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev(struct mlx5_eswitch *esw)
@@ -125,9 +125,10 @@ struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev(struct mlx5_eswitch *esw) 
	return mlx5_eswitch_uplink_get_proto_dev(esw, REP_IB);

}



struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw, int vport)

struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw,

					   u16 vport_num)

{

	return mlx5_eswitch_vport_rep(esw, vport);

	return mlx5_eswitch_vport_rep(esw, vport_num);

}



struct mlx5_flow_handle *create_flow_rule_vport_sq(struct mlx5_ib_dev *dev,

drivers/infiniband/hw/mlx5/ib_rep.h

+6 −6
Original line number Diff line number Diff line
@@ -14,17 +14,17 @@ extern const struct mlx5_ib_profile uplink_rep_profile; 


u8 mlx5_ib_eswitch_mode(struct mlx5_eswitch *esw);

struct mlx5_ib_dev *mlx5_ib_get_rep_ibdev(struct mlx5_eswitch *esw,

					  int vport_index);

					  u16 vport_num);

struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev(struct mlx5_eswitch *esw);

struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw,

					   int vport_index);

					   u16 vport_num);

void mlx5_ib_register_vport_reps(struct mlx5_core_dev *mdev);

void mlx5_ib_unregister_vport_reps(struct mlx5_core_dev *mdev);

struct mlx5_flow_handle *create_flow_rule_vport_sq(struct mlx5_ib_dev *dev,

						   struct mlx5_ib_sq *sq,

						   u16 port);

struct net_device *mlx5_ib_get_rep_netdev(struct mlx5_eswitch *esw,

					  int vport_index);

					  u16 vport_num);

#else /* CONFIG_MLX5_ESWITCH */

static inline u8 mlx5_ib_eswitch_mode(struct mlx5_eswitch *esw)

{
@@ -33,7 +33,7 @@ static inline u8 mlx5_ib_eswitch_mode(struct mlx5_eswitch *esw) 


static inline

struct mlx5_ib_dev *mlx5_ib_get_rep_ibdev(struct mlx5_eswitch *esw,

					  int vport_index)

					  u16 vport_num)

{

	return NULL;

}
@@ -46,7 +46,7 @@ struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev(struct mlx5_eswitch *esw) 


static inline

struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw,

					   int vport_index)

					   u16 vport_num)

{

	return NULL;

}
@@ -63,7 +63,7 @@ struct mlx5_flow_handle *create_flow_rule_vport_sq(struct mlx5_ib_dev *dev, 


static inline

struct net_device *mlx5_ib_get_rep_netdev(struct mlx5_eswitch *esw,

					  int vport_index)

					  u16 vport_num)

{

	return NULL;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ config MLX5_CORE 
	select NET_DEVLINK

	imply PTP_1588_CLOCK

	imply VXLAN

	imply MLXFW

	default n

	---help---

	  Core driver for low level functionality of the ConnectX-4 and

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

+21 −1
Original line number Diff line number Diff line
@@ -1604,7 +1604,27 @@ void mlx5_cmd_flush(struct mlx5_core_dev *dev) 


static int status_to_err(u8 status)

{

	return status ? -1 : 0; /* TBD more meaningful codes */

	switch (status) {

	case MLX5_CMD_DELIVERY_STAT_OK:

	case MLX5_DRIVER_STATUS_ABORTED:

		return 0;

	case MLX5_CMD_DELIVERY_STAT_SIGNAT_ERR:

	case MLX5_CMD_DELIVERY_STAT_TOK_ERR:

		return -EBADR;

	case MLX5_CMD_DELIVERY_STAT_BAD_BLK_NUM_ERR:

	case MLX5_CMD_DELIVERY_STAT_OUT_PTR_ALIGN_ERR:

	case MLX5_CMD_DELIVERY_STAT_IN_PTR_ALIGN_ERR:

		return -EFAULT; /* Bad address */

	case MLX5_CMD_DELIVERY_STAT_IN_LENGTH_ERR:

	case MLX5_CMD_DELIVERY_STAT_OUT_LENGTH_ERR:

	case MLX5_CMD_DELIVERY_STAT_CMD_DESCR_ERR:

	case MLX5_CMD_DELIVERY_STAT_RES_FLD_NOT_CLR_ERR:

		return -ENOMSG;

	case MLX5_CMD_DELIVERY_STAT_FW_ERR:

		return -EIO;

	default:

		return -EINVAL;

	}

}



static struct mlx5_cmd_msg *alloc_msg(struct mlx5_core_dev *dev, int in_size,

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

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static int mlx5_peer_pf_disable_hca(struct mlx5_core_dev *dev) 


	MLX5_SET(disable_hca_in, in, opcode, MLX5_CMD_OP_DISABLE_HCA);

	MLX5_SET(disable_hca_in, in, function_id, 0);

	MLX5_SET(enable_hca_in, in, embedded_cpu_function, 0);

	MLX5_SET(disable_hca_in, in, embedded_cpu_function, 0);

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

}