[dpdk-stable] patch 'mempool/octeontx: fix aura to pool mapping' has been queued to LTS release 18.11.11

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

Thanks.

Kevin.

---
>From a5017329fdc4d0caea9eebdddb252c101d649405 Mon Sep 17 00:00:00 2001
From: Pavan Nikhilesh <pbhagavatula at marvell.com>
Date: Wed, 29 Jul 2020 00:13:45 +0530
Subject: [PATCH] mempool/octeontx: fix aura to pool mapping

[ upstream commit e1712291b1fe834612403a086bbe6078e96748fb ]

When sending commands to Kernel FPA PF driver, it expects the
aura to be in the range of 0 to 16 for a given FPA pool.
In OCTEON TX we map a pool,aura pair as single mempool handle,
always set the aura id to 0 for a given FPA pool.

Fixes: 179c7e893f64 ("mempool/octeontx: fix pool to aura mapping")

Signed-off-by: Pavan Nikhilesh <pbhagavatula at marvell.com>
Acked-by: Jerin Jacob <jerinj at marvell.com>
---
 drivers/mempool/octeontx/octeontx_fpavf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mempool/octeontx/octeontx_fpavf.c b/drivers/mempool/octeontx/octeontx_fpavf.c
index 4cf387e8fb..435e173429 100644
--- a/drivers/mempool/octeontx/octeontx_fpavf.c
+++ b/drivers/mempool/octeontx/octeontx_fpavf.c
@@ -242,5 +242,5 @@ octeontx_fpapf_pool_setup(unsigned int gpool, unsigned int buf_size,
 		POOL_ENA;
 
-	cfg.aid = FPA_AURA_IDX(gpool);
+	cfg.aid = 0;
 	cfg.pool_cfg = reg;
 	cfg.pool_stack_base = phys_addr;
@@ -326,5 +326,5 @@ octeontx_fpapf_aura_attach(unsigned int gpool_index)
 	hdr.res_code = 0;
 	memset(&cfg, 0x0, sizeof(struct octeontx_mbox_fpa_cfg));
-	cfg.aid = FPA_AURA_IDX(gpool_index);
+	cfg.aid = 0;
 
 	ret = octeontx_mbox_send(&hdr, &cfg,
@@ -355,5 +355,5 @@ octeontx_fpapf_aura_detach(unsigned int gpool_index)
 	}
 
-	cfg.aid = FPA_AURA_IDX(gpool_index);
+	cfg.aid = 0;
 	hdr.coproc = FPA_COPROC;
 	hdr.msg = FPA_DETACHAURA;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.788657899 +0000
+++ 0028-mempool-octeontx-fix-aura-to-pool-mapping.patch	2020-11-05 12:38:54.208895995 +0000
@@ -1 +1 @@
-From e1712291b1fe834612403a086bbe6078e96748fb Mon Sep 17 00:00:00 2001
+From a5017329fdc4d0caea9eebdddb252c101d649405 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e1712291b1fe834612403a086bbe6078e96748fb ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 339da7824f..94dc5cd815 100644
+index 4cf387e8fb..435e173429 100644
@@ -24 +25 @@
-@@ -260,5 +260,5 @@ octeontx_fpapf_pool_setup(unsigned int gpool, unsigned int buf_size,
+@@ -242,5 +242,5 @@ octeontx_fpapf_pool_setup(unsigned int gpool, unsigned int buf_size,
@@ -31 +32 @@
-@@ -346,5 +346,5 @@ octeontx_fpapf_aura_attach(unsigned int gpool_index)
+@@ -326,5 +326,5 @@ octeontx_fpapf_aura_attach(unsigned int gpool_index)
@@ -38 +39 @@
-@@ -375,5 +375,5 @@ octeontx_fpapf_aura_detach(unsigned int gpool_index)
+@@ -355,5 +355,5 @@ octeontx_fpapf_aura_detach(unsigned int gpool_index)