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

Commit 79c54b6b authored by Amir Vadai's avatar Amir Vadai Committed by David S. Miller
Browse files

net/mlx4_en: Fix TX moderation info loss after set_ringparam is called 



We need to re-set tx moderation information after calling set_ringparam
else default tx moderation will be used.
Also avoid related code duplication, by putting it in a utility function.

Signed-off-by: default avatarAmir Vadai <amirv@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2c46c9d5

drivers/net/ethernet/mellanox/mlx4/en_ethtool.c

+30 −29
Original line number Original line Diff line number Diff line
@@ -43,6 +43,34 @@ 
#define EN_ETHTOOL_SHORT_MASK cpu_to_be16(0xffff)

#define EN_ETHTOOL_SHORT_MASK cpu_to_be16(0xffff)

#define EN_ETHTOOL_WORD_MASK  cpu_to_be32(0xffffffff)

#define EN_ETHTOOL_WORD_MASK  cpu_to_be32(0xffffffff)





static int mlx4_en_moderation_update(struct mlx4_en_priv *priv)

{

	int i;

	int err = 0;



	for (i = 0; i < priv->tx_ring_num; i++) {

		priv->tx_cq[i].moder_cnt = priv->tx_frames;

		priv->tx_cq[i].moder_time = priv->tx_usecs;

		err = mlx4_en_set_cq_moder(priv, &priv->tx_cq[i]);

		if (err)

			return err;

	}



	if (priv->adaptive_rx_coal)

		return 0;



	for (i = 0; i < priv->rx_ring_num; i++) {

		priv->rx_cq[i].moder_cnt = priv->rx_frames;

		priv->rx_cq[i].moder_time = priv->rx_usecs;

		priv->last_moder_time[i] = MLX4_EN_AUTO_CONF;

		err = mlx4_en_set_cq_moder(priv, &priv->rx_cq[i]);

		if (err)

			return err;

	}



	return err;

}



static void

static void

mlx4_en_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)

mlx4_en_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)

{

{
@@ -381,7 +409,6 @@ static int mlx4_en_set_coalesce(struct net_device *dev, 
			      struct ethtool_coalesce *coal)

			      struct ethtool_coalesce *coal)

{

{

	struct mlx4_en_priv *priv = netdev_priv(dev);

	struct mlx4_en_priv *priv = netdev_priv(dev);

	int err, i;





	priv->rx_frames = (coal->rx_max_coalesced_frames ==

	priv->rx_frames = (coal->rx_max_coalesced_frames ==

			   MLX4_EN_AUTO_CONF) ?

			   MLX4_EN_AUTO_CONF) ?
@@ -397,14 +424,6 @@ static int mlx4_en_set_coalesce(struct net_device *dev, 
	    coal->tx_max_coalesced_frames != priv->tx_frames) {

	    coal->tx_max_coalesced_frames != priv->tx_frames) {

		priv->tx_usecs = coal->tx_coalesce_usecs;

		priv->tx_usecs = coal->tx_coalesce_usecs;

		priv->tx_frames = coal->tx_max_coalesced_frames;

		priv->tx_frames = coal->tx_max_coalesced_frames;

		for (i = 0; i < priv->tx_ring_num; i++) {

			priv->tx_cq[i].moder_cnt = priv->tx_frames;

			priv->tx_cq[i].moder_time = priv->tx_usecs;

			if (mlx4_en_set_cq_moder(priv, &priv->tx_cq[i])) {

				en_warn(priv, "Failed changing moderation "

					      "for TX cq %d\n", i);

			}

		}

	}

	}





	/* Set adaptive coalescing params */

	/* Set adaptive coalescing params */
@@ -414,18 +433,8 @@ static int mlx4_en_set_coalesce(struct net_device *dev, 
	priv->rx_usecs_high = coal->rx_coalesce_usecs_high;

	priv->rx_usecs_high = coal->rx_coalesce_usecs_high;

	priv->sample_interval = coal->rate_sample_interval;

	priv->sample_interval = coal->rate_sample_interval;

	priv->adaptive_rx_coal = coal->use_adaptive_rx_coalesce;

	priv->adaptive_rx_coal = coal->use_adaptive_rx_coalesce;

	if (priv->adaptive_rx_coal)

		return 0;





	for (i = 0; i < priv->rx_ring_num; i++) {

	return mlx4_en_moderation_update(priv);

		priv->rx_cq[i].moder_cnt = priv->rx_frames;

		priv->rx_cq[i].moder_time = priv->rx_usecs;

		priv->last_moder_time[i] = MLX4_EN_AUTO_CONF;

		err = mlx4_en_set_cq_moder(priv, &priv->rx_cq[i]);

		if (err)

			return err;

	}

	return 0;

}

}





static int mlx4_en_set_pauseparam(struct net_device *dev,

static int mlx4_en_set_pauseparam(struct net_device *dev,
@@ -466,7 +475,6 @@ static int mlx4_en_set_ringparam(struct net_device *dev, 
	u32 rx_size, tx_size;

	u32 rx_size, tx_size;

	int port_up = 0;

	int port_up = 0;

	int err = 0;

	int err = 0;

	int i;





	if (param->rx_jumbo_pending || param->rx_mini_pending)

	if (param->rx_jumbo_pending || param->rx_mini_pending)

		return -EINVAL;

		return -EINVAL;
@@ -505,14 +513,7 @@ static int mlx4_en_set_ringparam(struct net_device *dev, 
			en_err(priv, "Failed starting port\n");

			en_err(priv, "Failed starting port\n");

	}

	}





	for (i = 0; i < priv->rx_ring_num; i++) {

	err = mlx4_en_moderation_update(priv);

		priv->rx_cq[i].moder_cnt = priv->rx_frames;

		priv->rx_cq[i].moder_time = priv->rx_usecs;

		priv->last_moder_time[i] = MLX4_EN_AUTO_CONF;

		err = mlx4_en_set_cq_moder(priv, &priv->rx_cq[i]);

		if (err)

			goto out;

	}





out:

out:

	mutex_unlock(&mdev->state_lock);

	mutex_unlock(&mdev->state_lock);