patch 'net/mlx5: fix Tx scheduling check' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/30/21. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/40588e9f6f1f1c5b0f4be0c504bf0f01ddd44359

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 40588e9f6f1f1c5b0f4be0c504bf0f01ddd44359 Mon Sep 17 00:00:00 2001
From: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
Date: Wed, 10 Nov 2021 15:05:52 +0200
Subject: [PATCH] net/mlx5: fix Tx scheduling check
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 11cfe349b3f17b11b6dce109f5226e89bc0a5b85 ]

There was a redundant check for the enabled E-Switch, this
resulted in device probing failure if the Tx scheduling was
requested and E-Switch was enabled.

Fixes: f17e4b4ffef9 ("net/mlx5: add Tx scheduling check on queue creation")

Signed-off-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 drivers/net/mlx5/linux/mlx5_os.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 3128fb3e5e..a0ddc90311 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -1579,8 +1579,7 @@ err_secondary:
 		priv->obj_ops = ibv_obj_ops;
 	}
 	if (config->tx_pp &&
-	    (priv->config.dv_esw_en ||
-	     priv->obj_ops.txq_obj_new != mlx5_os_txq_obj_new)) {
+	    priv->obj_ops.txq_obj_new != mlx5_os_txq_obj_new) {
 		/*
 		 * HAVE_MLX5DV_DEVX_UAR_OFFSET is required to support
 		 * packet pacing and already checked above.
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-28 22:41:04.253284827 +0800
+++ 0014-net-mlx5-fix-Tx-scheduling-check.patch	2021-11-28 22:41:03.223542730 +0800
@@ -1 +1 @@
-From 11cfe349b3f17b11b6dce109f5226e89bc0a5b85 Mon Sep 17 00:00:00 2001
+From 40588e9f6f1f1c5b0f4be0c504bf0f01ddd44359 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 11cfe349b3f17b11b6dce109f5226e89bc0a5b85 ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -19 +21 @@
-index de880ee4c9..c29fe3d92b 100644
+index 3128fb3e5e..a0ddc90311 100644
@@ -22 +24 @@
-@@ -1727,8 +1727,7 @@ err_secondary:
+@@ -1579,8 +1579,7 @@ err_secondary:
@@ -27,2 +29,2 @@
--	     priv->obj_ops.txq_obj_new != mlx5_txq_devx_obj_new)) {
-+	    priv->obj_ops.txq_obj_new != mlx5_txq_devx_obj_new) {
+-	     priv->obj_ops.txq_obj_new != mlx5_os_txq_obj_new)) {
++	    priv->obj_ops.txq_obj_new != mlx5_os_txq_obj_new) {