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

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

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



Saeed Mahameed says:

====================
Mellanox, mlx5 fixes 2019-02-13

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2fdeee25 407e17b1

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

+18 −0
Original line number Diff line number Diff line
@@ -1583,6 +1583,24 @@ void mlx5_cmd_trigger_completions(struct mlx5_core_dev *dev) 
	spin_unlock_irqrestore(&dev->cmd.alloc_lock, flags);

}



void mlx5_cmd_flush(struct mlx5_core_dev *dev)

{

	struct mlx5_cmd *cmd = &dev->cmd;

	int i;



	for (i = 0; i < cmd->max_reg_cmds; i++)

		while (down_trylock(&cmd->sem))

			mlx5_cmd_trigger_completions(dev);



	while (down_trylock(&cmd->pages_sem))

		mlx5_cmd_trigger_completions(dev);



	/* Unlock cmdif */

	up(&cmd->pages_sem);

	for (i = 0; i < cmd->max_reg_cmds; i++)

		up(&cmd->sem);

}



static int status_to_err(u8 status)

{

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

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

+1 −0
Original line number Diff line number Diff line
@@ -657,6 +657,7 @@ struct mlx5e_channel_stats { 
enum {

	MLX5E_STATE_OPENED,

	MLX5E_STATE_DESTROYING,

	MLX5E_STATE_XDP_TX_ENABLED,

};



struct mlx5e_rqt {

drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c

+2 −4
Original line number Diff line number Diff line
@@ -365,7 +365,8 @@ int mlx5e_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames, 
	int sq_num;

	int i;



	if (unlikely(!test_bit(MLX5E_STATE_OPENED, &priv->state)))

	/* this flag is sufficient, no need to test internal sq state */

	if (unlikely(!mlx5e_xdp_tx_is_enabled(priv)))

		return -ENETDOWN;



	if (unlikely(flags & ~XDP_XMIT_FLAGS_MASK))
@@ -378,9 +379,6 @@ int mlx5e_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames, 


	sq = &priv->channels.c[sq_num]->xdpsq;



	if (unlikely(!test_bit(MLX5E_SQ_STATE_ENABLED, &sq->state)))

		return -ENETDOWN;



	for (i = 0; i < n; i++) {

		struct xdp_frame *xdpf = frames[i];

		struct mlx5e_xdp_info xdpi;

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

+17 −0
Original line number Diff line number Diff line
@@ -50,6 +50,23 @@ void mlx5e_xdp_rx_poll_complete(struct mlx5e_rq *rq); 
int mlx5e_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames,

		   u32 flags);



static inline void mlx5e_xdp_tx_enable(struct mlx5e_priv *priv)

{

	set_bit(MLX5E_STATE_XDP_TX_ENABLED, &priv->state);

}



static inline void mlx5e_xdp_tx_disable(struct mlx5e_priv *priv)

{

	clear_bit(MLX5E_STATE_XDP_TX_ENABLED, &priv->state);

	/* let other device's napi(s) see our new state */

	synchronize_rcu();

}



static inline bool mlx5e_xdp_tx_is_enabled(struct mlx5e_priv *priv)

{

	return test_bit(MLX5E_STATE_XDP_TX_ENABLED, &priv->state);

}



static inline void mlx5e_xmit_xdp_doorbell(struct mlx5e_xdpsq *sq)

{

	if (sq->doorbell_cseg) {

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

+4 −3
Original line number Diff line number Diff line
@@ -354,9 +354,6 @@ int mlx5e_ethtool_set_channels(struct mlx5e_priv *priv, 


	new_channels.params = priv->channels.params;

	new_channels.params.num_channels = count;

	if (!netif_is_rxfh_configured(priv->netdev))

		mlx5e_build_default_indir_rqt(priv->rss_params.indirection_rqt,

					      MLX5E_INDIR_RQT_SIZE, count);



	if (!test_bit(MLX5E_STATE_OPENED, &priv->state)) {

		priv->channels.params = new_channels.params;
@@ -372,6 +369,10 @@ int mlx5e_ethtool_set_channels(struct mlx5e_priv *priv, 
	if (arfs_enabled)

		mlx5e_arfs_disable(priv);



	if (!netif_is_rxfh_configured(priv->netdev))

		mlx5e_build_default_indir_rqt(priv->rss_params.indirection_rqt,

					      MLX5E_INDIR_RQT_SIZE, count);



	/* Switch to new channels, set new parameters and close old ones */

	mlx5e_switch_priv_channels(priv, &new_channels, NULL);