patch 'common/dpaax: fix short MAC-I IV calculation for ZUC' has been queued to stable release 20.11.6

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.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 06/23/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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/25165ac2415b369d76ee05f4ea3e43ddda646ec9

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 25165ac2415b369d76ee05f4ea3e43ddda646ec9 Mon Sep 17 00:00:00 2001
From: Gagandeep Singh <g.singh at nxp.com>
Date: Thu, 28 Apr 2022 17:17:33 +0530
Subject: [PATCH] common/dpaax: fix short MAC-I IV calculation for ZUC
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit c54fb3f7f77fa919673966227fd8964dbfbb3781 ]

Fixing the IV calculation for ZUC based short MAC-I
as per the HW security engine guidelines.

Fixes: 73a24060cd70 ("crypto/dpaa2_sec: add sample PDCP descriptor APIs")

Signed-off-by: Gagandeep Singh <g.singh at nxp.com>
Acked-by: Akhil Goyal <gakhil at marvell.com>
---
 drivers/common/dpaax/caamflib/desc/pdcp.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/common/dpaax/caamflib/desc/pdcp.h b/drivers/common/dpaax/caamflib/desc/pdcp.h
index 51d40b5dd9..6dd1122e15 100644
--- a/drivers/common/dpaax/caamflib/desc/pdcp.h
+++ b/drivers/common/dpaax/caamflib/desc/pdcp.h
@@ -3790,7 +3790,7 @@ cnstr_shdsc_pdcp_short_mac(uint32_t *descbuf,
 			return -ENOTSUP;
 		}
 		iv[0] = 0xFFFFFFFF;
-		iv[1] = swap ? swab32(0xFC000000) : 0xFC000000;
+		iv[1] = swab32(0xFC000000);
 		iv[2] = 0x00000000; /* unused */
 
 		KEY(p, KEY2, authdata->key_enc_flags, authdata->key,
-- 
2.35.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-06-21 15:37:50.204556318 +0800
+++ 0020-common-dpaax-fix-short-MAC-I-IV-calculation-for-ZUC.patch	2022-06-21 15:37:48.994451098 +0800
@@ -1 +1 @@
-From c54fb3f7f77fa919673966227fd8964dbfbb3781 Mon Sep 17 00:00:00 2001
+From 25165ac2415b369d76ee05f4ea3e43ddda646ec9 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit c54fb3f7f77fa919673966227fd8964dbfbb3781 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -19 +21 @@
-index 46153b9c29..289ee2a7d5 100644
+index 51d40b5dd9..6dd1122e15 100644
@@ -22,3 +24,3 @@
-@@ -3066,7 +3066,7 @@ cnstr_shdsc_pdcp_short_mac(uint32_t *descbuf,
- 
- 	case PDCP_AUTH_TYPE_ZUC:
+@@ -3790,7 +3790,7 @@ cnstr_shdsc_pdcp_short_mac(uint32_t *descbuf,
+ 			return -ENOTSUP;
+ 		}