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

Achiad Shochat · davem330 · commit 3435ab59d3fe · 2015-11-03T10:41:50.000-05:00
Consider MLX5E_MAX_NUM_CHANNELS @ethtool set/get_channels Signed-off-by: Achiad Shochat <achiad@mellanox.com> Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -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);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
@@ -345,17 +345,16 @@ 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;
 }
 
 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;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -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))

Original file line number	Diff line number	Diff line change
`@@ -345,17 +345,16 @@ static void mlx5e_get_channels(struct net_device *dev,`
`345`	`345`	`struct ethtool_channels *ch)`
`346`	`346`	`{`
`347`	`347`	`struct mlx5e_priv *priv = netdev_priv(dev);`
`348`		`- int ncv = priv->mdev->priv.eq_table.num_comp_vectors;`
`349`	`348`
`350`		`- ch->max_combined = ncv;`
	`349`	`+ ch->max_combined = mlx5e_get_max_num_channels(priv->mdev);`
`351`	`350`	`ch->combined_count = priv->params.num_channels;`
`352`	`351`	`}`
`353`	`352`
`354`	`353`	`static int mlx5e_set_channels(struct net_device *dev,`
`355`	`354`	`struct ethtool_channels *ch)`
`356`	`355`	`{`
`357`	`356`	`struct mlx5e_priv *priv = netdev_priv(dev);`
`358`		`- int ncv = priv->mdev->priv.eq_table.num_comp_vectors;`
	`357`	`+ int ncv = mlx5e_get_max_num_channels(priv->mdev);`
`359`	`358`	`unsigned int count = ch->combined_count;`
`360`	`359`	`bool was_opened;`
`361`	`360`	`int err = 0;`
Original file line number	Diff line number	Diff line change
`@@ -2047,8 +2047,7 @@ static void mlx5e_create_netdev(struct mlx5_core_dev mdev)`
`2047`	`2047`	`{`
`2048`	`2048`	`struct net_device *netdev;`
`2049`	`2049`	`struct mlx5e_priv *priv;`
`2050`		`- int nch = min_t(int, mdev->priv.eq_table.num_comp_vectors,`
`2051`		`- MLX5E_MAX_NUM_CHANNELS);`
	`2050`	`+ int nch = mlx5e_get_max_num_channels(mdev);`
`2052`	`2051`	`int err;`
`2053`	`2052`
`2054`	`2053`	`if (mlx5e_check_required_hca_cap(mdev))`