[dpdk-stable] patch 'net/octeontx2: disable unnecessary error interrupts' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/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 85897fd567efec8e63eb73d498dc4a468443a451 Mon Sep 17 00:00:00 2001
From: Nithin Dabilpuram <ndabilpuram at marvell.com>
Date: Mon, 13 Apr 2020 19:15:40 +0530
Subject: [PATCH] net/octeontx2: disable unnecessary error interrupts

[ upstream commit c3d30e9d753ef3121c25b9403bf56ee09f2a2086 ]

Disable CQ_DISABLED error interrupt in NIX_LF_ERR_INT
to fix spurious interrupts in event dev mode. Also skip
configuring RSS when RQ count is '0' because
RSS table initialization is done incorrectly due to
divide-by-zero error and it is leading to RQ_OOR error
in NIX_LF_ERR_INT.

Fixes: 83ce2880e22e ("net/octeontx2: support RSS")

Signed-off-by: Nithin Dabilpuram <ndabilpuram at marvell.com>
Acked-by: Jerin Jacob <jerinj at marvell.com>
---
 drivers/net/octeontx2/otx2_ethdev_irq.c | 7 +++++--
 drivers/net/octeontx2/otx2_rss.c        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/octeontx2/otx2_ethdev_irq.c b/drivers/net/octeontx2/otx2_ethdev_irq.c
index 96b848a919..b121488faf 100644
--- a/drivers/net/octeontx2/otx2_ethdev_irq.c
+++ b/drivers/net/octeontx2/otx2_ethdev_irq.c
@@ -472,9 +472,12 @@ otx2_nix_err_intr_enb_dis(struct rte_eth_dev *eth_dev, bool enb)
 {
 	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
 
-	/* Enable all nix lf error interrupts except for RQ_DISABLED */
+	/* Enable all nix lf error interrupts except
+	 * RQ_DISABLED and CQ_DISABLED.
+	 */
 	if (enb)
-		otx2_write64(~BIT_ULL(11), dev->base + NIX_LF_ERR_INT_ENA_W1S);
+		otx2_write64(~(BIT_ULL(11) | BIT_ULL(24)),
+			     dev->base + NIX_LF_ERR_INT_ENA_W1S);
 	else
 		otx2_write64(~0ull, dev->base + NIX_LF_ERR_INT_ENA_W1C);
 }
diff --git a/drivers/net/octeontx2/otx2_rss.c b/drivers/net/octeontx2/otx2_rss.c
index bc7b64387a..d80579725a 100644
--- a/drivers/net/octeontx2/otx2_rss.c
+++ b/drivers/net/octeontx2/otx2_rss.c
@@ -341,7 +341,7 @@ otx2_nix_rss_config(struct rte_eth_dev *eth_dev)
 	int rc;
 
 	/* Skip further configuration if selected mode is not RSS */
-	if (eth_dev->data->dev_conf.rxmode.mq_mode != ETH_MQ_RX_RSS)
+	if (eth_dev->data->dev_conf.rxmode.mq_mode != ETH_MQ_RX_RSS || !qcnt)
 		return 0;
 
 	/* Update default RSS key and cfg */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:47.831912175 +0100
+++ 0083-net-octeontx2-disable-unnecessary-error-interrupts.patch	2020-05-19 14:04:44.252649025 +0100
@@ -1,8 +1,10 @@
-From c3d30e9d753ef3121c25b9403bf56ee09f2a2086 Mon Sep 17 00:00:00 2001
+From 85897fd567efec8e63eb73d498dc4a468443a451 Mon Sep 17 00:00:00 2001
 From: Nithin Dabilpuram <ndabilpuram at marvell.com>
 Date: Mon, 13 Apr 2020 19:15:40 +0530
 Subject: [PATCH] net/octeontx2: disable unnecessary error interrupts
 
+[ upstream commit c3d30e9d753ef3121c25b9403bf56ee09f2a2086 ]
+
 Disable CQ_DISABLED error interrupt in NIX_LF_ERR_INT
 to fix spurious interrupts in event dev mode. Also skip
 configuring RSS when RQ count is '0' because
@@ -11,7 +13,6 @@
 in NIX_LF_ERR_INT.
 
 Fixes: 83ce2880e22e ("net/octeontx2: support RSS")
-Cc: stable at dpdk.org
 
 Signed-off-by: Nithin Dabilpuram <ndabilpuram at marvell.com>
 Acked-by: Jerin Jacob <jerinj at marvell.com>
@@ -40,10 +41,10 @@
  		otx2_write64(~0ull, dev->base + NIX_LF_ERR_INT_ENA_W1C);
  }
 diff --git a/drivers/net/octeontx2/otx2_rss.c b/drivers/net/octeontx2/otx2_rss.c
-index a29441e6c9..5e3f866819 100644
+index bc7b64387a..d80579725a 100644
 --- a/drivers/net/octeontx2/otx2_rss.c
 +++ b/drivers/net/octeontx2/otx2_rss.c
-@@ -358,7 +358,7 @@ otx2_nix_rss_config(struct rte_eth_dev *eth_dev)
+@@ -341,7 +341,7 @@ otx2_nix_rss_config(struct rte_eth_dev *eth_dev)
  	int rc;
  
  	/* Skip further configuration if selected mode is not RSS */