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

Merge tag 'mlx5-updates-2019-08-22' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2019-08-22

Misc updates for mlx5e net device driver

1) Maxim and Tariq add the support for LAG TX port affinity distribution
When VF LAG is enabled, VFs netdevs will round-robin the TX affinity
of their tx queues among the different LAG ports.
2) Aya adds the support for ip-in-ip RSS.
3) Marina adds the support for ip-in-ip TX TSO and checksum offloads.
4) Moshe adds a device internal drop counter to mlx5 ethtool stats.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 42aa15cf 25948b87

drivers/infiniband/hw/mlx5/devx.c

+1 −0
Original line number Diff line number Diff line
@@ -922,6 +922,7 @@ static bool devx_is_general_cmd(void *in, struct mlx5_ib_dev *dev) 
	case MLX5_CMD_OP_QUERY_CONG_STATUS:

	case MLX5_CMD_OP_QUERY_CONG_PARAMS:

	case MLX5_CMD_OP_QUERY_CONG_STATISTICS:

	case MLX5_CMD_OP_QUERY_LAG:

		return true;

	default:

		return false;

drivers/infiniband/hw/mlx5/srq_cmd.c

+3 −3
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ struct mlx5_core_srq *mlx5_cmd_get_srq(struct mlx5_ib_dev *dev, u32 srqn) 
	xa_lock(&table->array);

	srq = xa_load(&table->array, srqn);

	if (srq)

		atomic_inc(&srq->common.refcount);

		refcount_inc(&srq->common.refcount);

	xa_unlock(&table->array);



	return srq;
@@ -592,7 +592,7 @@ int mlx5_cmd_create_srq(struct mlx5_ib_dev *dev, struct mlx5_core_srq *srq, 
	if (err)

		return err;



	atomic_set(&srq->common.refcount, 1);

	refcount_set(&srq->common.refcount, 1);

	init_completion(&srq->common.free);



	err = xa_err(xa_store_irq(&table->array, srq->srqn, srq, GFP_KERNEL));
@@ -675,7 +675,7 @@ static int srq_event_notifier(struct notifier_block *nb, 
	xa_lock(&table->array);

	srq = xa_load(&table->array, srqn);

	if (srq)

		atomic_inc(&srq->common.refcount);

		refcount_inc(&srq->common.refcount);

	xa_unlock(&table->array);



	if (!srq)

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

+4 −0
Original line number Diff line number Diff line
@@ -446,6 +446,8 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, 
	case MLX5_CMD_OP_CREATE_UMEM:

	case MLX5_CMD_OP_DESTROY_UMEM:

	case MLX5_CMD_OP_ALLOC_MEMIC:

	case MLX5_CMD_OP_MODIFY_XRQ:

	case MLX5_CMD_OP_RELEASE_XRQ_ERROR:

		*status = MLX5_DRIVER_STATUS_ABORTED;

		*synd = MLX5_DRIVER_SYND;

		return -EIO;
@@ -637,6 +639,8 @@ const char *mlx5_command_str(int command) 
	MLX5_COMMAND_STR_CASE(DESTROY_UCTX);

	MLX5_COMMAND_STR_CASE(CREATE_UMEM);

	MLX5_COMMAND_STR_CASE(DESTROY_UMEM);

	MLX5_COMMAND_STR_CASE(RELEASE_XRQ_ERROR);

	MLX5_COMMAND_STR_CASE(MODIFY_XRQ);

	default: return "unknown command opcode";

	}

}

drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c

+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ static void mlx5_fw_tracer_save_trace(struct mlx5_fw_tracer *tracer, 
	trace_data->timestamp = timestamp;

	trace_data->lost = lost;

	trace_data->event_id = event_id;

	strncpy(trace_data->msg, msg, TRACE_STR_MSG);

	strscpy_pad(trace_data->msg, msg, TRACE_STR_MSG);



	tracer->st_arr.saved_traces_index =

		(tracer->st_arr.saved_traces_index + 1) & (SAVED_TRACES_NUM - 1);

drivers/net/ethernet/mellanox/mlx5/core/en.h

+11 −7
Original line number Diff line number Diff line
@@ -163,6 +163,14 @@ enum mlx5e_rq_group { 
#define MLX5E_NUM_RQ_GROUPS(g) (1 + MLX5E_RQ_GROUP_##g)

};



static inline u8 mlx5e_get_num_lag_ports(struct mlx5_core_dev *mdev)

{

	if (mlx5_lag_is_lacp_owner(mdev))

		return 1;



	return clamp_t(u8, MLX5_CAP_GEN(mdev, num_lag_ports), 1, MLX5_MAX_PORTS);

}



static inline u16 mlx5_min_rx_wqes(int wq_type, u32 wq_size)

{

	switch (wq_type) {
@@ -705,6 +713,7 @@ struct mlx5e_channel { 
	struct net_device         *netdev;

	__be32                     mkey_be;

	u8                         num_tc;

	u8                         lag_port;



	/* XDP_REDIRECT */

	struct mlx5e_xdpsq         xdpsq;
@@ -818,7 +827,7 @@ struct mlx5e_priv { 
	struct mlx5e_rq            drop_rq;



	struct mlx5e_channels      channels;

	u32                        tisn[MLX5E_MAX_NUM_TC];

	u32                        tisn[MLX5_MAX_PORTS][MLX5E_MAX_NUM_TC];

	struct mlx5e_rqt           indir_rqt;

	struct mlx5e_tir           indir_tir[MLX5E_NUM_INDIR_TIRS];

	struct mlx5e_tir           inner_indir_tir[MLX5E_NUM_INDIR_TIRS];
@@ -1056,12 +1065,6 @@ int mlx5e_modify_sq(struct mlx5_core_dev *mdev, u32 sqn, 
void mlx5e_activate_txqsq(struct mlx5e_txqsq *sq);

void mlx5e_tx_disable_queue(struct netdev_queue *txq);



static inline bool mlx5e_tunnel_inner_ft_supported(struct mlx5_core_dev *mdev)

{

	return (MLX5_CAP_ETH(mdev, tunnel_stateless_gre) &&

		MLX5_CAP_FLOWTABLE_NIC_RX(mdev, ft_field_support.inner_ip_version));

}



static inline bool mlx5_tx_swp_supported(struct mlx5_core_dev *mdev)

{

	return MLX5_CAP_ETH(mdev, swp) &&
@@ -1107,6 +1110,7 @@ int mlx5e_create_tis(struct mlx5_core_dev *mdev, void *in, u32 *tisn); 
void mlx5e_destroy_tis(struct mlx5_core_dev *mdev, u32 tisn);



int mlx5e_create_tises(struct mlx5e_priv *priv);

void mlx5e_destroy_tises(struct mlx5e_priv *priv);

int mlx5e_update_nic_rx(struct mlx5e_priv *priv);

void mlx5e_update_carrier(struct mlx5e_priv *priv);

int mlx5e_close(struct net_device *netdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE