[dpdk-stable] patch 'bus/fslmc: fix atomic queues on NXP LX2 platform' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/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 d1aaa24a6789cfdddd8de4bcaae7006d2b00e1c5 Mon Sep 17 00:00:00 2001
From: Youri Querry <youri.querry_1 at nxp.com>
Date: Thu, 24 Sep 2020 09:32:04 +0530
Subject: [PATCH] bus/fslmc: fix atomic queues on NXP LX2 platform

[ upstream commit 8bd11d45d53d66da5e2adb7faf2ea64b36120f60 ]

Traffic was stalling after few packet while running l2fwd-event
in atomic mode on LX2 platform. It was due to wrong dca setting
while enqueuing packets to EQCR.
This patch fixes the issue by writing correct dca setting.

Fixes: 1b49352f41be ("bus/fslmc: rename portal pi index to consumer index")

Signed-off-by: Youri Querry <youri.querry_1 at nxp.com>
Signed-off-by: Rohit Raj <rohit.raj at nxp.com>
Acked-by: Nipun Gupta <nipun.gupta at nxp.com>
---
 drivers/bus/fslmc/qbman/qbman_portal.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/bus/fslmc/qbman/qbman_portal.c b/drivers/bus/fslmc/qbman/qbman_portal.c
index d4223bdc8b..54bea97820 100644
--- a/drivers/bus/fslmc/qbman/qbman_portal.c
+++ b/drivers/bus/fslmc/qbman/qbman_portal.c
@@ -999,6 +999,8 @@ static int qbman_swp_enqueue_multiple_mem_back(struct qbman_swp *s,
 				QBMAN_CENA_SWP_EQCR(eqcr_pi & half_mask));
 		memcpy(&p[1], &cl[1], 28);
 		memcpy(&p[8], &fd[i], sizeof(*fd));
+		p[0] = cl[0] | s->eqcr.pi_vb;
+
 		if (flags && (flags[i] & QBMAN_ENQUEUE_FLAG_DCA)) {
 			struct qbman_eq_desc *d = (struct qbman_eq_desc *)p;
 
@@ -1006,7 +1008,6 @@ static int qbman_swp_enqueue_multiple_mem_back(struct qbman_swp *s,
 				((flags[i]) & QBMAN_EQCR_DCA_IDXMASK);
 		}
 		eqcr_pi++;
-		p[0] = cl[0] | s->eqcr.pi_vb;
 
 		if (!(eqcr_pi & half_mask))
 			s->eqcr.pi_vb ^= QB_VALID_BIT;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:15.151316939 +0000
+++ 0109-bus-fslmc-fix-atomic-queues-on-NXP-LX2-platform.patch	2020-10-28 10:35:11.664832379 +0000
@@ -1,15 +1,16 @@
-From 8bd11d45d53d66da5e2adb7faf2ea64b36120f60 Mon Sep 17 00:00:00 2001
+From d1aaa24a6789cfdddd8de4bcaae7006d2b00e1c5 Mon Sep 17 00:00:00 2001
 From: Youri Querry <youri.querry_1 at nxp.com>
 Date: Thu, 24 Sep 2020 09:32:04 +0530
 Subject: [PATCH] bus/fslmc: fix atomic queues on NXP LX2 platform
 
+[ upstream commit 8bd11d45d53d66da5e2adb7faf2ea64b36120f60 ]
+
 Traffic was stalling after few packet while running l2fwd-event
 in atomic mode on LX2 platform. It was due to wrong dca setting
 while enqueuing packets to EQCR.
 This patch fixes the issue by writing correct dca setting.
 
 Fixes: 1b49352f41be ("bus/fslmc: rename portal pi index to consumer index")
-Cc: stable at dpdk.org
 
 Signed-off-by: Youri Querry <youri.querry_1 at nxp.com>
 Signed-off-by: Rohit Raj <rohit.raj at nxp.com>
@@ -19,10 +20,10 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/bus/fslmc/qbman/qbman_portal.c b/drivers/bus/fslmc/qbman/qbman_portal.c
-index 0a2af7be4c..77c9d508c4 100644
+index d4223bdc8b..54bea97820 100644
 --- a/drivers/bus/fslmc/qbman/qbman_portal.c
 +++ b/drivers/bus/fslmc/qbman/qbman_portal.c
-@@ -1201,6 +1201,8 @@ static int qbman_swp_enqueue_multiple_mem_back(struct qbman_swp *s,
+@@ -999,6 +999,8 @@ static int qbman_swp_enqueue_multiple_mem_back(struct qbman_swp *s,
  				QBMAN_CENA_SWP_EQCR(eqcr_pi & half_mask));
  		memcpy(&p[1], &cl[1], 28);
  		memcpy(&p[8], &fd[i], sizeof(*fd));
@@ -31,7 +32,7 @@
  		if (flags && (flags[i] & QBMAN_ENQUEUE_FLAG_DCA)) {
  			struct qbman_eq_desc *d = (struct qbman_eq_desc *)p;
  
-@@ -1208,7 +1210,6 @@ static int qbman_swp_enqueue_multiple_mem_back(struct qbman_swp *s,
+@@ -1006,7 +1008,6 @@ static int qbman_swp_enqueue_multiple_mem_back(struct qbman_swp *s,
  				((flags[i]) & QBMAN_EQCR_DCA_IDXMASK);
  		}
  		eqcr_pi++;