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

Commit 3435ab59 authored by Achiad Shochat's avatar Achiad Shochat Committed by David S. Miller
Browse files

net/mlx5e: Don't allow more than max supported channels 



Consider MLX5E_MAX_NUM_CHANNELS @ethtool set/get_channels

Signed-off-by: default avatarAchiad Shochat <achiad@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 61d0e73e

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

+6 −0
Original line number Diff line number Diff line
@@ -617,5 +617,11 @@ static inline void mlx5e_cq_arm(struct mlx5e_cq *cq) 
	mlx5_cq_arm(mcq, MLX5_CQ_DB_REQ_NOT, mcq->uar->map, NULL, cq->wq.cc);

}



static inline int mlx5e_get_max_num_channels(struct mlx5_core_dev *mdev)

{

	return min_t(int, mdev->priv.eq_table.num_comp_vectors,

		     MLX5E_MAX_NUM_CHANNELS);

}



extern const struct ethtool_ops mlx5e_ethtool_ops;

u16 mlx5e_get_max_inline_cap(struct mlx5_core_dev *mdev);

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

+2 −3
Original line number Diff line number Diff line
@@ -345,9 +345,8 @@ static void mlx5e_get_channels(struct net_device *dev, 
			       struct ethtool_channels *ch)

{

	struct mlx5e_priv *priv = netdev_priv(dev);

	int ncv = priv->mdev->priv.eq_table.num_comp_vectors;



	ch->max_combined   = ncv;

	ch->max_combined   = mlx5e_get_max_num_channels(priv->mdev);

	ch->combined_count = priv->params.num_channels;

}
@@ -355,7 +354,7 @@ static int mlx5e_set_channels(struct net_device *dev, 
			      struct ethtool_channels *ch)

{

	struct mlx5e_priv *priv = netdev_priv(dev);

	int ncv = priv->mdev->priv.eq_table.num_comp_vectors;

	int ncv = mlx5e_get_max_num_channels(priv->mdev);

	unsigned int count = ch->combined_count;

	bool was_opened;

	int err = 0;

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

+1 −2
Original line number Diff line number Diff line
@@ -2047,8 +2047,7 @@ static void *mlx5e_create_netdev(struct mlx5_core_dev *mdev) 
{

	struct net_device *netdev;

	struct mlx5e_priv *priv;

	int nch = min_t(int, mdev->priv.eq_table.num_comp_vectors,

			MLX5E_MAX_NUM_CHANNELS);

	int nch = mlx5e_get_max_num_channels(mdev);

	int err;



	if (mlx5e_check_required_hca_cap(mdev))