[dpdk-stable] patch 'bus/fslmc: fix getting FD error' 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 2f92210432eb5bf7613ffafbb32679aaafd291c1 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 ab2b213f8..00ef4ee53 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
@@ -289,7 +289,7 @@ enum qbman_fd_format {
 #define DPAA2_GET_FD_FRC(fd)   ((fd)->simple.frc)
 #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)
 #define DPAA2_IS_SET_FLE_SG_EXT(fle)	\
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:53.540143424 +0100
+++ 0130-bus-fslmc-fix-getting-FD-error.patch	2020-07-24 12:53:48.427009068 +0100
@@ -1,12 +1,13 @@
-From 3827197dabf9ddd8ffb918aa15f64f8e9aa9502b Mon Sep 17 00:00:00 2001
+From 2f92210432eb5bf7613ffafbb32679aaafd291c1 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")
-Cc: stable at dpdk.org
 
 Signed-off-by: Nipun Gupta <nipun.gupta at nxp.com>
 Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
@@ -16,10 +17,10 @@
  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 4682a5299..f1c70251a 100644
+index ab2b213f8..00ef4ee53 100644
 --- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
 +++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
-@@ -286,7 +286,7 @@ enum qbman_fd_format {
+@@ -289,7 +289,7 @@ enum qbman_fd_format {
  #define DPAA2_GET_FD_FRC(fd)   ((fd)->simple.frc)
  #define DPAA2_GET_FD_FLC(fd) \
  	(((uint64_t)((fd)->simple.flc_hi) << 32) + (fd)->simple.flc_lo)