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

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

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



Saeed Mahameed says:

====================
mlx5-updates-2019-02-19

This series includes misc updates to mlx5 drivers and one ethtool update.

1) From Aya Levin:
   - ethtool: Define 50Gbps per lane link modes
   - add support for 50Gbps per lane link modes in mlx5 driver

2) From Tariq Toukan,
   - Add a helper function to unify mlx5 resource reloading

3) From Vlad Buslov,
   - Remove wrong and superfluous tc pedit header type check

4) From Tonghao Zhang,
   - Some refactoring in en_tc.c to simplify the mlx5e_tc_add_fdb_flow

5) From Leon Romanovsky & Saeed,
   - Compilation warning fixes

6) From Bodong wang,
   - E-Switch fixes that are related to the SmarNIC series
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 51dcb69d 1c50d369

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

+3 −3
Original line number Diff line number Diff line
@@ -858,7 +858,7 @@ void mlx5e_close_channels(struct mlx5e_channels *chs); 
 * switching channels

 */

typedef int (*mlx5e_fp_hw_modify)(struct mlx5e_priv *priv);

void mlx5e_switch_priv_channels(struct mlx5e_priv *priv,

int mlx5e_safe_switch_channels(struct mlx5e_priv *priv,

			       struct mlx5e_channels *new_chs,

			       mlx5e_fp_hw_modify hw_modify);

void mlx5e_activate_priv_channels(struct mlx5e_priv *priv);

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

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static int mlx5e_monitor_event_handler(struct notifier_block *nb, 
	return NOTIFY_OK;

}



void mlx5e_monitor_counter_start(struct mlx5e_priv *priv)

static void mlx5e_monitor_counter_start(struct mlx5e_priv *priv)

{

	MLX5_NB_INIT(&priv->monitor_counters_nb, mlx5e_monitor_event_handler,

		     MONITOR_COUNTER);

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

+1 −3
Original line number Diff line number Diff line
@@ -1126,9 +1126,7 @@ static void mlx5e_trust_update_sq_inline_mode(struct mlx5e_priv *priv) 
	    priv->channels.params.tx_min_inline_mode)

		goto out;



	if (mlx5e_open_channels(priv, &new_channels))

		goto out;

	mlx5e_switch_priv_channels(priv, &new_channels, NULL);

	mlx5e_safe_switch_channels(priv, &new_channels, NULL);



out:

	mutex_unlock(&priv->state_lock);

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

+193 −104

File changed.

Preview size limit exceeded, changes collapsed.

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

+21 −12
Original line number Diff line number Diff line
@@ -2885,13 +2885,14 @@ void mlx5e_deactivate_priv_channels(struct mlx5e_priv *priv) 
	mlx5e_deactivate_channels(&priv->channels);

}



void mlx5e_switch_priv_channels(struct mlx5e_priv *priv,

static void mlx5e_switch_priv_channels(struct mlx5e_priv *priv,

				       struct mlx5e_channels *new_chs,

				       mlx5e_fp_hw_modify hw_modify)

{

	struct net_device *netdev = priv->netdev;

	int new_num_txqs;

	int carrier_ok;



	new_num_txqs = new_chs->num * new_chs->params.num_tc;



	carrier_ok = netif_carrier_ok(netdev);
@@ -2917,6 +2918,20 @@ void mlx5e_switch_priv_channels(struct mlx5e_priv *priv, 
		netif_carrier_on(netdev);

}



int mlx5e_safe_switch_channels(struct mlx5e_priv *priv,

			       struct mlx5e_channels *new_chs,

			       mlx5e_fp_hw_modify hw_modify)

{

	int err;



	err = mlx5e_open_channels(priv, new_chs);

	if (err)

		return err;



	mlx5e_switch_priv_channels(priv, new_chs, hw_modify);

	return 0;

}



void mlx5e_timestamp_init(struct mlx5e_priv *priv)

{

	priv->tstamp.tx_type   = HWTSTAMP_TX_OFF;
@@ -3333,13 +3348,12 @@ static int mlx5e_setup_tc_mqprio(struct net_device *netdev, 
		goto out;

	}



	err = mlx5e_open_channels(priv, &new_channels);

	err = mlx5e_safe_switch_channels(priv, &new_channels, NULL);

	if (err)

		goto out;



	priv->max_opened_tc = max_t(u8, priv->max_opened_tc,

				    new_channels.params.num_tc);

	mlx5e_switch_priv_channels(priv, &new_channels, NULL);

out:

	mutex_unlock(&priv->state_lock);

	return err;
@@ -3549,11 +3563,7 @@ static int set_feature_lro(struct net_device *netdev, bool enable) 
		goto out;

	}



	err = mlx5e_open_channels(priv, &new_channels);

	if (err)

		goto out;



	mlx5e_switch_priv_channels(priv, &new_channels, mlx5e_modify_tirs_lro);

	err = mlx5e_safe_switch_channels(priv, &new_channels, mlx5e_modify_tirs_lro);

out:

	mutex_unlock(&priv->state_lock);

	return err;
@@ -3771,11 +3781,10 @@ int mlx5e_change_mtu(struct net_device *netdev, int new_mtu, 
		goto out;

	}



	err = mlx5e_open_channels(priv, &new_channels);

	err = mlx5e_safe_switch_channels(priv, &new_channels, set_mtu_cb);

	if (err)

		goto out;



	mlx5e_switch_priv_channels(priv, &new_channels, set_mtu_cb);

	netdev->mtu = new_channels.params.sw_mtu;



out: