[dpdk-stable] patch 'net/qede: fix promiscuous enable' has been queued to stable release 19.11.7

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/06/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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/d900b4d90f84b7b5e26a2b40797a33b7059b3fe0

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From d900b4d90f84b7b5e26a2b40797a33b7059b3fe0 Mon Sep 17 00:00:00 2001
From: Balazs Nemeth <bnemeth at redhat.com>
Date: Wed, 23 Dec 2020 15:15:49 +0100
Subject: [PATCH] net/qede: fix promiscuous enable

[ upstream commit a91fb48a8c248293f1035cdd8b36ad712ae9478f ]

When calling rte_eth_promiscuous_enable(port_id) followed by
rte_eth_allmulticast_enable(port_id), the port is not in promisc mode
anymore. This patch ensures that promisc mode takes precedence over
allmulticast mode fixing the regression introduced by b10231aed1ed.

Fixes: b10231aed1ed ("net/qede: fix multicast drop in promiscuous mode")

Signed-off-by: Balazs Nemeth <bnemeth at redhat.com>
Acked-by: Rasesh Mody <rmody at marvell.com>
---
 drivers/net/qede/qede_ethdev.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
index 102451bbd3..2932f155af 100644
--- a/drivers/net/qede/qede_ethdev.c
+++ b/drivers/net/qede/qede_ethdev.c
@@ -1796,6 +1796,8 @@ static int qede_allmulticast_enable(struct rte_eth_dev *eth_dev)
 	    QED_FILTER_RX_MODE_TYPE_MULTI_PROMISC;
 	enum _ecore_status_t ecore_status;
 
+	if (rte_eth_promiscuous_get(eth_dev->data->port_id) == 1)
+		type = QED_FILTER_RX_MODE_TYPE_PROMISC;
 	ecore_status = qed_configure_filter_rx_mode(eth_dev, type);
 
 	return ecore_status >= ECORE_SUCCESS ? 0 : -EAGAIN;
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:30.332457243 +0100
+++ 0054-net-qede-fix-promiscuous-enable.patch	2021-02-04 12:04:27.978789678 +0100
@@ -1 +1 @@
-From a91fb48a8c248293f1035cdd8b36ad712ae9478f Mon Sep 17 00:00:00 2001
+From d900b4d90f84b7b5e26a2b40797a33b7059b3fe0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a91fb48a8c248293f1035cdd8b36ad712ae9478f ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 549013557c..3bec62d828 100644
+index 102451bbd3..2932f155af 100644
@@ -24 +25 @@
-@@ -1885,6 +1885,8 @@ static int qede_allmulticast_enable(struct rte_eth_dev *eth_dev)
+@@ -1796,6 +1796,8 @@ static int qede_allmulticast_enable(struct rte_eth_dev *eth_dev)