[dpdk-stable] patch 'crypto/dpaax_sec: fix inline query for descriptors' 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/fc14e174a78a17b0d7be03f19e81333ee1fc4880

Thanks.

Kevin.

---
>From fc14e174a78a17b0d7be03f19e81333ee1fc4880 Mon Sep 17 00:00:00 2001
From: Akhil Goyal <akhil.goyal at nxp.com>
Date: Fri, 5 Jun 2020 01:34:10 +0530
Subject: [PATCH] crypto/dpaax_sec: fix inline query for descriptors

[ upstream commit 453b9593a3cfe62ce1f64c65382090ec8adb3ec0 ]

The maximum length of job descriptor which is formed
is 13 words and hence rta_inline_query should take
care of the max descriptor(shared + job) lengths and
thus find out of the key can be referenced or immediate.

Fixes: 05b12700cd4c ("crypto/dpaa_sec: support null algos for protocol offload")
Fixes: 13273250eec5 ("crypto/dpaa2_sec: support AES-GCM and CTR")

Signed-off-by: Akhil Goyal <akhil.goyal at nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>
---
 drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 4 ++--
 drivers/crypto/dpaa2_sec/hw/desc.h          | 2 +-
 drivers/crypto/dpaa_sec/dpaa_sec.c          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
index d888568327..db8a6b0ee3 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -1906,5 +1906,5 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev,
 	priv->flc_desc[0].desc[0] = aeaddata.keylen;
 	err = rta_inline_query(IPSEC_AUTH_VAR_AES_DEC_BASE_DESC_LEN,
-			       MIN_JOB_DESC_SIZE,
+			       DESC_JOB_IO_LEN,
 			       (unsigned int *)priv->flc_desc[0].desc,
 			       &priv->flc_desc[0].desc[1], 1);
@@ -2128,5 +2128,5 @@ dpaa2_sec_aead_chain_init(struct rte_cryptodev *dev,
 	priv->flc_desc[0].desc[1] = authdata.keylen;
 	err = rta_inline_query(IPSEC_AUTH_VAR_AES_DEC_BASE_DESC_LEN,
-			       MIN_JOB_DESC_SIZE,
+			       DESC_JOB_IO_LEN,
 			       (unsigned int *)priv->flc_desc[0].desc,
 			       &priv->flc_desc[0].desc[2], 2);
diff --git a/drivers/crypto/dpaa2_sec/hw/desc.h b/drivers/crypto/dpaa2_sec/hw/desc.h
index 5d99dd8af6..7e703dabbc 100644
--- a/drivers/crypto/dpaa2_sec/hw/desc.h
+++ b/drivers/crypto/dpaa2_sec/hw/desc.h
@@ -25,5 +25,5 @@
 #define CAAM_PTR_SZ sizeof(dma_addr_t)
 #define CAAM_DESC_BYTES_MAX (CAAM_CMD_SZ * MAX_CAAM_DESCSIZE)
-#define DESC_JOB_IO_LEN (CAAM_CMD_SZ * 5 + CAAM_PTR_SZ * 3)
+#define DESC_JOB_IO_LEN (CAAM_CMD_SZ * 7 + CAAM_PTR_SZ * 3)
 
 /* Block size of any entity covered/uncovered with a KEK/TKEK */
diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c
index 4426f08c10..d650b44204 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c
@@ -416,5 +416,5 @@ dpaa_sec_prep_ipsec_cdb(dpaa_sec_session *ses)
 	cdb->sh_desc[1] = authdata.keylen;
 	err = rta_inline_query(IPSEC_AUTH_VAR_AES_DEC_BASE_DESC_LEN,
-			       MIN_JOB_DESC_SIZE,
+			       DESC_JOB_IO_LEN,
 			       (unsigned int *)cdb->sh_desc,
 			       &cdb->sh_desc[2], 2);
@@ -560,5 +560,5 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)
 		cdb->sh_desc[1] = alginfo_a.keylen;
 		err = rta_inline_query(IPSEC_AUTH_VAR_AES_DEC_BASE_DESC_LEN,
-				       MIN_JOB_DESC_SIZE,
+				       DESC_JOB_IO_LEN,
 				       (unsigned int *)cdb->sh_desc,
 				       &cdb->sh_desc[2], 2);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.220769358 +0100
+++ 0009-crypto-dpaax_sec-fix-inline-query-for-descriptors.patch	2020-08-20 16:26:15.775323879 +0100
@@ -1 +1 @@
-From 453b9593a3cfe62ce1f64c65382090ec8adb3ec0 Mon Sep 17 00:00:00 2001
+From fc14e174a78a17b0d7be03f19e81333ee1fc4880 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 453b9593a3cfe62ce1f64c65382090ec8adb3ec0 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -18 +18,0 @@
- drivers/common/dpaax/caamflib/desc.h        | 2 +-
@@ -19,0 +20 @@
+ drivers/crypto/dpaa2_sec/hw/desc.h          | 2 +-
@@ -23,11 +23,0 @@
-diff --git a/drivers/common/dpaax/caamflib/desc.h b/drivers/common/dpaax/caamflib/desc.h
-index e4139aaa9f..635d6bad07 100644
---- a/drivers/common/dpaax/caamflib/desc.h
-+++ b/drivers/common/dpaax/caamflib/desc.h
-@@ -27,5 +27,5 @@ extern enum rta_sec_era rta_sec_era;
- #define CAAM_PTR_SZ sizeof(dma_addr_t)
- #define CAAM_DESC_BYTES_MAX (CAAM_CMD_SZ * MAX_CAAM_DESCSIZE)
--#define DESC_JOB_IO_LEN (CAAM_CMD_SZ * 5 + CAAM_PTR_SZ * 3)
-+#define DESC_JOB_IO_LEN (CAAM_CMD_SZ * 7 + CAAM_PTR_SZ * 3)
- 
- /* Block size of any entity covered/uncovered with a KEK/TKEK */
@@ -35 +25 @@
-index 60fdced789..c56fb2152e 100644
+index d888568327..db8a6b0ee3 100644
@@ -38 +28 @@
-@@ -2193,5 +2193,5 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev,
+@@ -1906,5 +1906,5 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev,
@@ -45 +35 @@
-@@ -2417,5 +2417,5 @@ dpaa2_sec_aead_chain_init(struct rte_cryptodev *dev,
+@@ -2128,5 +2128,5 @@ dpaa2_sec_aead_chain_init(struct rte_cryptodev *dev,
@@ -51,0 +42,11 @@
+diff --git a/drivers/crypto/dpaa2_sec/hw/desc.h b/drivers/crypto/dpaa2_sec/hw/desc.h
+index 5d99dd8af6..7e703dabbc 100644
+--- a/drivers/crypto/dpaa2_sec/hw/desc.h
++++ b/drivers/crypto/dpaa2_sec/hw/desc.h
+@@ -25,5 +25,5 @@
+ #define CAAM_PTR_SZ sizeof(dma_addr_t)
+ #define CAAM_DESC_BYTES_MAX (CAAM_CMD_SZ * MAX_CAAM_DESCSIZE)
+-#define DESC_JOB_IO_LEN (CAAM_CMD_SZ * 5 + CAAM_PTR_SZ * 3)
++#define DESC_JOB_IO_LEN (CAAM_CMD_SZ * 7 + CAAM_PTR_SZ * 3)
+ 
+ /* Block size of any entity covered/uncovered with a KEK/TKEK */
@@ -53 +54 @@
-index 01e79c8eaa..5ce7e35827 100644
+index 4426f08c10..d650b44204 100644
@@ -56 +57 @@
-@@ -352,5 +352,5 @@ dpaa_sec_prep_ipsec_cdb(dpaa_sec_session *ses)
+@@ -416,5 +416,5 @@ dpaa_sec_prep_ipsec_cdb(dpaa_sec_session *ses)
@@ -63 +64 @@
-@@ -538,5 +538,5 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)
+@@ -560,5 +560,5 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)