[dpdk-stable] patch 'net/octeontx2: fix DMAC filtering' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 07/26/20. 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.

Thanks.

Luca Boccassi

---
>From 2789a4d75c75e811d05f59ef0152d1f7de8315e5 Mon Sep 17 00:00:00 2001
From: Harman Kalra <hkalra at marvell.com>
Date: Wed, 3 Jun 2020 20:22:13 +0530
Subject: [PATCH] net/octeontx2: fix DMAC filtering

[ upstream commit 987984204bdc982e0f58393678dd50ba91c639c4 ]

Issue has been observed where packets are getting dropped
at DMAC filtering if a new dmac address is added before
starting of port.

Fixes: c43adf61682f ("net/octeontx2: add unicast MAC filter")

Signed-off-by: Harman Kalra <hkalra at marvell.com>
Acked-by: Sunil Kumar Kori <skori at marvell.com>
Acked-by: Jerin Jacob <jerinj at marvell.com>
---
 drivers/net/octeontx2/otx2_ethdev.h     | 1 +
 drivers/net/octeontx2/otx2_ethdev_ops.c | 4 +++-
 drivers/net/octeontx2/otx2_mac.c        | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/net/octeontx2/otx2_ethdev.h b/drivers/net/octeontx2/otx2_ethdev.h
index 864356e36..0aadaecf7 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -267,6 +267,7 @@ struct otx2_eth_dev {
 	uint8_t mac_addr[RTE_ETHER_ADDR_LEN];
 	uint8_t mkex_pfl_name[MKEX_NAME_LEN];
 	uint8_t max_mac_entries;
+	bool dmac_filter_enable;
 	uint8_t lf_tx_stats;
 	uint8_t lf_rx_stats;
 	uint16_t flags;
diff --git a/drivers/net/octeontx2/otx2_ethdev_ops.c b/drivers/net/octeontx2/otx2_ethdev_ops.c
index 8f1635dba..93ef04803 100644
--- a/drivers/net/octeontx2/otx2_ethdev_ops.c
+++ b/drivers/net/octeontx2/otx2_ethdev_ops.c
@@ -148,8 +148,10 @@ otx2_nix_promisc_enable(struct rte_eth_dev *eth_dev)
 int
 otx2_nix_promisc_disable(struct rte_eth_dev *eth_dev)
 {
-	otx2_nix_promisc_config(eth_dev, 0);
+	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+	otx2_nix_promisc_config(eth_dev, dev->dmac_filter_enable);
 	nix_cgx_promisc_config(eth_dev, 0);
+	dev->dmac_filter_enable = false;
 
 	return 0;
 }
diff --git a/drivers/net/octeontx2/otx2_mac.c b/drivers/net/octeontx2/otx2_mac.c
index 262d185e5..49a700ca1 100644
--- a/drivers/net/octeontx2/otx2_mac.c
+++ b/drivers/net/octeontx2/otx2_mac.c
@@ -76,6 +76,8 @@ otx2_nix_mac_addr_add(struct rte_eth_dev *eth_dev, struct rte_ether_addr *addr,
 
 	/* Enable promiscuous mode at NIX level */
 	otx2_nix_promisc_config(eth_dev, 1);
+	dev->dmac_filter_enable = true;
+	eth_dev->data->promiscuous = 0;
 
 done:
 	return rc;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:51.173175258 +0100
+++ 0067-net-octeontx2-fix-DMAC-filtering.patch	2020-07-24 12:53:48.291006534 +0100
@@ -1,14 +1,15 @@
-From 987984204bdc982e0f58393678dd50ba91c639c4 Mon Sep 17 00:00:00 2001
+From 2789a4d75c75e811d05f59ef0152d1f7de8315e5 Mon Sep 17 00:00:00 2001
 From: Harman Kalra <hkalra at marvell.com>
 Date: Wed, 3 Jun 2020 20:22:13 +0530
 Subject: [PATCH] net/octeontx2: fix DMAC filtering
 
+[ upstream commit 987984204bdc982e0f58393678dd50ba91c639c4 ]
+
 Issue has been observed where packets are getting dropped
 at DMAC filtering if a new dmac address is added before
 starting of port.
 
 Fixes: c43adf61682f ("net/octeontx2: add unicast MAC filter")
-Cc: stable at dpdk.org
 
 Signed-off-by: Harman Kalra <hkalra at marvell.com>
 Acked-by: Sunil Kumar Kori <skori at marvell.com>
@@ -20,10 +21,10 @@
  3 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/octeontx2/otx2_ethdev.h b/drivers/net/octeontx2/otx2_ethdev.h
-index 0fbf68b8e..16b0d8163 100644
+index 864356e36..0aadaecf7 100644
 --- a/drivers/net/octeontx2/otx2_ethdev.h
 +++ b/drivers/net/octeontx2/otx2_ethdev.h
-@@ -271,6 +271,7 @@ struct otx2_eth_dev {
+@@ -267,6 +267,7 @@ struct otx2_eth_dev {
  	uint8_t mac_addr[RTE_ETHER_ADDR_LEN];
  	uint8_t mkex_pfl_name[MKEX_NAME_LEN];
  	uint8_t max_mac_entries;
@@ -32,7 +33,7 @@
  	uint8_t lf_rx_stats;
  	uint16_t flags;
 diff --git a/drivers/net/octeontx2/otx2_ethdev_ops.c b/drivers/net/octeontx2/otx2_ethdev_ops.c
-index 80ac2b96e..faecf216c 100644
+index 8f1635dba..93ef04803 100644
 --- a/drivers/net/octeontx2/otx2_ethdev_ops.c
 +++ b/drivers/net/octeontx2/otx2_ethdev_ops.c
 @@ -148,8 +148,10 @@ otx2_nix_promisc_enable(struct rte_eth_dev *eth_dev)