[dpdk-stable] patch 'bus/fslmc: fix ring mode to use correct cache settings' has been queued to LTS release 18.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.1

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

Thanks.

Kevin Traynor

---
>From 5c07eee5a50de593e760d8879b94be02a0897723 Mon Sep 17 00:00:00 2001
From: Youri Querry <youri.querry_1 at nxp.com>
Date: Fri, 11 Jan 2019 12:24:08 +0000
Subject: [PATCH] bus/fslmc: fix ring mode to use correct cache settings

[ upstream commit 2557cf8f9e5b187622d8a863e0f452773f5e0082 ]

The code was incorrectly using the cache inhibited access.
It shall use cached enabled access for better performance.

Fixes: 293c0ca94c36 ("bus/fslmc: support memory backed portals with QBMAN 5.0")

Signed-off-by: Youri Querry <youri.querry_1 at nxp.com>
Acked-by: Shreyansh Jain <shreyansh.jain at nxp.com>
---
 drivers/bus/fslmc/qbman/qbman_portal.c | 12 ++++++------
 drivers/bus/fslmc/qbman/qbman_sys.h    |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/bus/fslmc/qbman/qbman_portal.c b/drivers/bus/fslmc/qbman/qbman_portal.c
index 3380e54f5..bbea37efc 100644
--- a/drivers/bus/fslmc/qbman/qbman_portal.c
+++ b/drivers/bus/fslmc/qbman/qbman_portal.c
@@ -684,6 +684,6 @@ static int qbman_swp_enqueue_ring_mode_mem_back(struct qbman_swp *s,
 	if (!s->eqcr.available) {
 		eqcr_ci = s->eqcr.ci;
-		s->eqcr.ci = qbman_cinh_read(&s->sys,
-				QBMAN_CENA_SWP_EQCR_CI) & full_mask;
+		s->eqcr.ci = qbman_cena_read_reg(&s->sys,
+				QBMAN_CENA_SWP_EQCR_CI_MEMBACK) & full_mask;
 		s->eqcr.available = qm_cyc_diff(s->eqcr.pi_ring_size,
 				eqcr_ci, s->eqcr.ci);
@@ -810,6 +810,6 @@ static int qbman_swp_enqueue_multiple_mem_back(struct qbman_swp *s,
 	if (!s->eqcr.available) {
 		eqcr_ci = s->eqcr.ci;
-		s->eqcr.ci = qbman_cinh_read(&s->sys,
-				QBMAN_CENA_SWP_EQCR_CI) & full_mask;
+		s->eqcr.ci = qbman_cena_read_reg(&s->sys,
+				QBMAN_CENA_SWP_EQCR_CI_MEMBACK) & full_mask;
 		s->eqcr.available = qm_cyc_diff(s->eqcr.pi_ring_size,
 					eqcr_ci, s->eqcr.ci);
@@ -942,6 +942,6 @@ static int qbman_swp_enqueue_multiple_desc_mem_back(struct qbman_swp *s,
 	if (!s->eqcr.available) {
 		eqcr_ci = s->eqcr.ci;
-		s->eqcr.ci = qbman_cinh_read(&s->sys,
-				QBMAN_CENA_SWP_EQCR_CI) & full_mask;
+		s->eqcr.ci = qbman_cena_read_reg(&s->sys,
+				QBMAN_CENA_SWP_EQCR_CI_MEMBACK) & full_mask;
 		s->eqcr.available = qm_cyc_diff(s->eqcr.pi_ring_size,
 					eqcr_ci, s->eqcr.ci);
diff --git a/drivers/bus/fslmc/qbman/qbman_sys.h b/drivers/bus/fslmc/qbman/qbman_sys.h
index d41af8358..0571097ab 100644
--- a/drivers/bus/fslmc/qbman/qbman_sys.h
+++ b/drivers/bus/fslmc/qbman/qbman_sys.h
@@ -56,4 +56,5 @@
 #define QBMAN_CENA_SWP_VDQCR   0x780
 #define QBMAN_CENA_SWP_EQCR_CI 0x840
+#define QBMAN_CENA_SWP_EQCR_CI_MEMBACK 0x1840
 
 /* CENA register offsets in memory-backed mode */
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-31 15:44:06.742782804 +0000
+++ 0043-bus-fslmc-fix-ring-mode-to-use-correct-cache-setting.patch	2019-01-31 15:44:05.000000000 +0000
@@ -1,13 +1,14 @@
-From 2557cf8f9e5b187622d8a863e0f452773f5e0082 Mon Sep 17 00:00:00 2001
+From 5c07eee5a50de593e760d8879b94be02a0897723 Mon Sep 17 00:00:00 2001
 From: Youri Querry <youri.querry_1 at nxp.com>
 Date: Fri, 11 Jan 2019 12:24:08 +0000
 Subject: [PATCH] bus/fslmc: fix ring mode to use correct cache settings
 
+[ upstream commit 2557cf8f9e5b187622d8a863e0f452773f5e0082 ]
+
 The code was incorrectly using the cache inhibited access.
 It shall use cached enabled access for better performance.
 
 Fixes: 293c0ca94c36 ("bus/fslmc: support memory backed portals with QBMAN 5.0")
-Cc: stable at dpdk.org
 
 Signed-off-by: Youri Querry <youri.querry_1 at nxp.com>
 Acked-by: Shreyansh Jain <shreyansh.jain at nxp.com>