From: Tariq Toukan <tariqt@nvidia.com>

Date: Mon, 14 Nov 2022 11:56:11 +0200

Subject: net/mlx5e: Remove leftovers from old XSK queues enumeration

Patch-mainline: v6.1-rc7

Git-commit: 11abca031ee34d8d50876e899cb2875d8fac01df

References: jsc#PED-1549

Before the cited commit, for N channels, a dedicated set of N queues was

created to support XSK, in indices [N, 2N-1], doubling the number of

queues.

In addition, changing the number of channels was prohibited, as it would

shift the indices.

Remove these two leftovers, as we moved XSK to a new queueing scheme,

starting from index 0.

Fixes: 3db4c85cde7a ("net/mlx5e: xsk: Use queue indices starting from 0 for XSK queues")

Signed-off-by: Tariq Toukan <tariqt@nvidia.com>

Reviewed-by: Gal Pressman <gal@nvidia.com>

Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c |   18 ------------------

 1 file changed, 18 deletions(-)

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

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

@@ -35,7 +35,6 @@

 #include "en.h"

 #include "en/port.h"

 #include "en/params.h"

-#include "en/xsk/pool.h"

 #include "en/ptp.h"

 #include "lib/clock.h"

 #include "en/fs_ethtool.h"

@@ -412,15 +411,8 @@ void mlx5e_ethtool_get_channels(struct m

 				struct ethtool_channels *ch)

 {

 	mutex_lock(&priv->state_lock);

-

 	ch->max_combined   = priv->max_nch;

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

-	if (priv->xsk.refcnt) {

-		/* The upper half are XSK queues. */

-		ch->max_combined *= 2;

-		ch->combined_count *= 2;

-	}

-

 	mutex_unlock(&priv->state_lock);

 }

@@ -454,16 +446,6 @@ int mlx5e_ethtool_set_channels(struct ml

 	mutex_lock(&priv->state_lock);

-	/* Don't allow changing the number of channels if there is an active

-	 * XSK, because the numeration of the XSK and regular RQs will change.

-	 */

-	if (priv->xsk.refcnt) {

-		err = -EINVAL;

-		netdev_err(priv->netdev, "%s: AF_XDP is active, cannot change the number of channels\n",

-			   __func__);

-		goto out;

-	}

-

 	/* Don't allow changing the number of channels if HTB offload is active,

 	 * because the numeration of the QoS SQs will change, while per-queue

 	 * qdiscs are attached.