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

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/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 655f346a13320cfce7054b944f3a3efcea0c6c96 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 63f8fb3b50..e37b844842 100644
--- a/drivers/mempool/octeontx/octeontx_fpavf.c
+++ b/drivers/mempool/octeontx/octeontx_fpavf.c
@@ -267,7 +267,7 @@ octeontx_fpapf_pool_setup(unsigned int gpool, unsigned int buf_size,
 		POOL_LTYPE(0x2) | POOL_STYPE(0) | POOL_SET_NAT_ALIGN |
 		POOL_ENA;
 
-	cfg.aid = FPA_AURA_IDX(gpool);
+	cfg.aid = 0;
 	cfg.pool_cfg = reg;
 	cfg.pool_stack_base = phys_addr;
 	cfg.pool_stack_end = phys_addr + memsz;
@@ -353,7 +353,7 @@ octeontx_fpapf_aura_attach(unsigned int gpool_index)
 	hdr.vfid = 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,
 					sizeof(struct octeontx_mbox_fpa_cfg),
@@ -382,7 +382,7 @@ octeontx_fpapf_aura_detach(unsigned int gpool_index)
 		goto err;
 	}
 
-	cfg.aid = FPA_AURA_IDX(gpool_index);
+	cfg.aid = 0;
 	hdr.coproc = FPA_COPROC;
 	hdr.msg = FPA_DETACHAURA;
 	hdr.vfid = gpool_index;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:14.320245699 +0000
+++ 0082-mempool-octeontx-fix-aura-to-pool-mapping.patch	2020-10-28 10:35:11.596831378 +0000
@@ -1,15 +1,16 @@
-From e1712291b1fe834612403a086bbe6078e96748fb Mon Sep 17 00:00:00 2001
+From 655f346a13320cfce7054b944f3a3efcea0c6c96 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")
-Cc: stable at dpdk.org
 
 Signed-off-by: Pavan Nikhilesh <pbhagavatula at marvell.com>
 Acked-by: Jerin Jacob <jerinj at marvell.com>
@@ -18,10 +19,10 @@
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/mempool/octeontx/octeontx_fpavf.c b/drivers/mempool/octeontx/octeontx_fpavf.c
-index 339da7824f..94dc5cd815 100644
+index 63f8fb3b50..e37b844842 100644
 --- a/drivers/mempool/octeontx/octeontx_fpavf.c
 +++ b/drivers/mempool/octeontx/octeontx_fpavf.c
-@@ -259,7 +259,7 @@ octeontx_fpapf_pool_setup(unsigned int gpool, unsigned int buf_size,
+@@ -267,7 +267,7 @@ octeontx_fpapf_pool_setup(unsigned int gpool, unsigned int buf_size,
  		POOL_LTYPE(0x2) | POOL_STYPE(0) | POOL_SET_NAT_ALIGN |
  		POOL_ENA;
  
@@ -30,7 +31,7 @@
  	cfg.pool_cfg = reg;
  	cfg.pool_stack_base = phys_addr;
  	cfg.pool_stack_end = phys_addr + memsz;
-@@ -345,7 +345,7 @@ octeontx_fpapf_aura_attach(unsigned int gpool_index)
+@@ -353,7 +353,7 @@ octeontx_fpapf_aura_attach(unsigned int gpool_index)
  	hdr.vfid = gpool_index;
  	hdr.res_code = 0;
  	memset(&cfg, 0x0, sizeof(struct octeontx_mbox_fpa_cfg));
@@ -39,7 +40,7 @@
  
  	ret = octeontx_mbox_send(&hdr, &cfg,
  					sizeof(struct octeontx_mbox_fpa_cfg),
-@@ -374,7 +374,7 @@ octeontx_fpapf_aura_detach(unsigned int gpool_index)
+@@ -382,7 +382,7 @@ octeontx_fpapf_aura_detach(unsigned int gpool_index)
  		goto err;
  	}