patch 'crypto/qat: fix GEN4 AEAD job in raw data path' has been queued to stable release 21.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.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/26/22. 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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/6f9d8df3d1bc4abbf43ab298b4935fd499f11ab8

Thanks.

Kevin

---
>From 6f9d8df3d1bc4abbf43ab298b4935fd499f11ab8 Mon Sep 17 00:00:00 2001
From: Kai Ji <kai.ji at intel.com>
Date: Fri, 21 Jan 2022 10:38:30 +0000
Subject: [PATCH] crypto/qat: fix GEN4 AEAD job in raw data path

[ upstream commit 3cb8f5347735eead44945ff5dbbdaf1069475d82 ]

This patch fix the cipher params configuration in AEAD job if
QAT GEN4 unified cipher slice(UCS) enabled.

Fixes: 328d690d2f60 ("crypto/qat: update raw data path")

Signed-off-by: Kai Ji <kai.ji at intel.com>
Acked-by: Fan Zhang <roy.fan.zhang at intel.com>
---
 drivers/crypto/qat/qat_sym_hw_dp.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/qat/qat_sym_hw_dp.c b/drivers/crypto/qat/qat_sym_hw_dp.c
index 12825e448b..792ad2b213 100644
--- a/drivers/crypto/qat/qat_sym_hw_dp.c
+++ b/drivers/crypto/qat/qat_sym_hw_dp.c
@@ -534,6 +534,18 @@ enqueue_one_aead_job(struct qat_sym_session *ctx,
 	if (ctx->is_single_pass) {
 		enqueue_one_cipher_job(ctx, req, iv, ofs, data_len);
-		cipher_param->spc_aad_addr = aad->iova;
-		cipher_param->spc_auth_res_addr = digest->iova;
+
+		if (ctx->is_ucs) {
+			/* QAT GEN4 uses single pass to treat AEAD as cipher
+			 * operation
+			 */
+			struct icp_qat_fw_la_cipher_20_req_params *cipher_param_20 =
+				(void *)&req->serv_specif_rqpars;
+			cipher_param_20->spc_aad_addr = aad->iova;
+			cipher_param_20->spc_auth_res_addr = digest->iova;
+		} else {
+			cipher_param->spc_aad_addr = aad->iova;
+			cipher_param->spc_auth_res_addr = digest->iova;
+		}
+
 		return;
 	}
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-21 15:22:48.629185160 +0000
+++ 0189-crypto-qat-fix-GEN4-AEAD-job-in-raw-data-path.patch	2022-02-21 15:22:44.375704766 +0000
@@ -1 +1 @@
-From 3cb8f5347735eead44945ff5dbbdaf1069475d82 Mon Sep 17 00:00:00 2001
+From 6f9d8df3d1bc4abbf43ab298b4935fd499f11ab8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3cb8f5347735eead44945ff5dbbdaf1069475d82 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org