[dpdk-stable] patch 'bus/fslmc: fix getting FD error' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

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

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/5ab31105f3f630d897d8dbd5397cda0317334458

Thanks.

Kevin.

---
>From 5ab31105f3f630d897d8dbd5397cda0317334458 Mon Sep 17 00:00:00 2001
From: Nipun Gupta <nipun.gupta at nxp.com>
Date: Tue, 7 Jul 2020 14:52:16 +0530
Subject: [PATCH] bus/fslmc: fix getting FD error

[ upstream commit 3827197dabf9ddd8ffb918aa15f64f8e9aa9502b ]

Fix the incorrect register for getting error

Fixes: 03e36408b9fb ("bus/fslmc: add macros required by QDMA for FLE and FD")

Signed-off-by: Nipun Gupta <nipun.gupta at nxp.com>
Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>
---
 drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
index 0a59f9d84f..9609f359fa 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
@@ -253,5 +253,5 @@ enum qbman_fd_format {
 #define DPAA2_GET_FD_FLC(fd) \
 	(((uint64_t)((fd)->simple.flc_hi) << 32) + (fd)->simple.flc_lo)
-#define DPAA2_GET_FD_ERR(fd)   ((fd)->simple.bpid_offset & 0x000000FF)
+#define DPAA2_GET_FD_ERR(fd)   ((fd)->simple.ctrl & 0x000000FF)
 #define DPAA2_GET_FLE_OFFSET(fle) (((fle)->fin_bpid_offset & 0x0FFF0000) >> 16)
 #define DPAA2_SET_FLE_SG_EXT(fle) ((fle)->fin_bpid_offset |= (uint64_t)1 << 29)
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.674631298 +0100
+++ 0023-bus-fslmc-fix-getting-FD-error.patch	2020-08-20 16:26:15.808324179 +0100
@@ -1 +1 @@
-From 3827197dabf9ddd8ffb918aa15f64f8e9aa9502b Mon Sep 17 00:00:00 2001
+From 5ab31105f3f630d897d8dbd5397cda0317334458 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3827197dabf9ddd8ffb918aa15f64f8e9aa9502b ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 4682a52998..f1c70251aa 100644
+index 0a59f9d84f..9609f359fa 100644
@@ -22 +23 @@
-@@ -287,5 +287,5 @@ enum qbman_fd_format {
+@@ -253,5 +253,5 @@ enum qbman_fd_format {