[dpdk-stable] patch 'net/dpaa2: fix multi-segment Tx' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.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 09/04/19. 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/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/60c7ddba65c3c59589b02839de944c92ea701aef

Thanks.

Kevin Traynor

---
>From 60c7ddba65c3c59589b02839de944c92ea701aef Mon Sep 17 00:00:00 2001
From: Nipun Gupta <nipun.gupta at nxp.com>
Date: Fri, 19 Jul 2019 15:36:09 +0530
Subject: [PATCH] net/dpaa2: fix multi-segment Tx

[ upstream commit 1f4d77d20b2d23bfa2d0203411546d241e4bb644 ]

This patch resets frc and ctrl in sg tx fd to avoid corruption.

Fixes: 774e9ea91992 ("net/dpaa2: add support for multi seg buffers")

Signed-off-by: Nipun Gupta <nipun.gupta at nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>
---
 drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 1 +
 drivers/net/dpaa2/dpaa2_rxtx.c          | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
index efbeebef9..2f52aca95 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
@@ -207,4 +207,5 @@ enum qbman_fd_format {
 #define DPAA2_GET_FD_FRC_PARSE_SUM(fd)	\
 			((uint16_t)(((fd)->simple.frc & 0xffff0000) >> 16))
+#define DPAA2_RESET_FD_FRC(fd)		((fd)->simple.frc = 0)
 #define DPAA2_SET_FD_FRC(fd, _frc)	((fd)->simple.frc = _frc)
 #define DPAA2_RESET_FD_CTRL(fd)	 ((fd)->simple.ctrl = 0)
diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c
index eab943dcf..03320ca1b 100644
--- a/drivers/net/dpaa2/dpaa2_rxtx.c
+++ b/drivers/net/dpaa2/dpaa2_rxtx.c
@@ -353,6 +353,7 @@ eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf,
 	DPAA2_SET_ONLY_FD_BPID(fd, bpid);
 	DPAA2_SET_FD_OFFSET(fd, temp->data_off);
-	DPAA2_SET_FD_ASAL(fd, DPAA2_ASAL_VAL);
 	DPAA2_FD_SET_FORMAT(fd, qbman_fd_sg);
+	DPAA2_RESET_FD_FRC(fd);
+	DPAA2_RESET_FD_CTRL(fd);
 	/*Set Scatter gather table and Scatter gather entries*/
 	sgt = (struct qbman_sge *)(
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-28 14:32:35.080136000 +0100
+++ 0055-net-dpaa2-fix-multi-segment-Tx.patch	2019-08-28 14:32:31.731955354 +0100
@@ -1 +1 @@
-From 1f4d77d20b2d23bfa2d0203411546d241e4bb644 Mon Sep 17 00:00:00 2001
+From 60c7ddba65c3c59589b02839de944c92ea701aef Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1f4d77d20b2d23bfa2d0203411546d241e4bb644 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 92fc76211..8644761db 100644
+index efbeebef9..2f52aca95 100644
@@ -22 +23 @@
-@@ -230,4 +230,5 @@ enum qbman_fd_format {
+@@ -207,4 +207,5 @@ enum qbman_fd_format {
@@ -29 +30 @@
-index c6e50123c..6ca5071e0 100644
+index eab943dcf..03320ca1b 100644
@@ -32 +33 @@
-@@ -371,6 +371,7 @@ eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf,
+@@ -353,6 +353,7 @@ eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf,