[dpdk-stable] patch 'crypto/mvsam: fix capabilities' has been queued to stable release 19.11.10

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.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/12/21. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/819f3a8a413a953a259af03f0b9ce7d5af5f080c

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 819f3a8a413a953a259af03f0b9ce7d5af5f080c Mon Sep 17 00:00:00 2001
From: Michael Shamis <michaelsh at marvell.com>
Date: Thu, 1 Jul 2021 09:58:53 +0300
Subject: [PATCH] crypto/mvsam: fix capabilities

[ upstream commit 62f7513e2a2a7677b1f335e53c44316f171511e0 ]

Increased AAD max size up to 64B and allowed AAD increment step
1B according to EIP197 token HW limitation.
In addition, some capabilities were found incorrect due to
running FIPS tests. The patch fix the capabilities.

Fixes: 8a61c83af2f ("crypto/mrvl: add mrvl crypto driver")
Fixes: 2c22aa4f8f6 ("crypto/mvsam: update hash digest sizes")
Fixes: a84226fc055 ("crypto/mvsam: support HMAC SHA224")

Signed-off-by: Michael Shamis <michaelsh at marvell.com>
Reviewed-by: Liron Himi <lironh at marvell.com>
Tested-by: Liron Himi <lironh at marvell.com>
---
 drivers/crypto/mvsam/rte_mrvl_pmd_ops.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c b/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
index 2dfaa0b113..bf9c1200ef 100644
--- a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
+++ b/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
@@ -111,7 +111,7 @@ static const struct rte_cryptodev_capabilities
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 28,
+					.min = 12,
 					.max = 28,
 					.increment = 0
 				},
@@ -232,7 +232,7 @@ static const struct rte_cryptodev_capabilities
 				},
 				.digest_size = {
 					.min = 12,
-					.max = 48,
+					.max = 64,
 					.increment = 4
 				},
 			}, }
@@ -252,7 +252,7 @@ static const struct rte_cryptodev_capabilities
 				},
 				.digest_size = {
 					.min = 12,
-					.max = 48,
+					.max = 64,
 					.increment = 0
 				},
 			}, }
@@ -336,9 +336,9 @@ static const struct rte_cryptodev_capabilities
 					.increment = 0
 				},
 				.aad_size = {
-					.min = 8,
-					.max = 12,
-					.increment = 4
+					.min = 0,
+					.max = 64,
+					.increment = 1
 				},
 				.iv_size = {
 					.min = 12,
-- 
2.32.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-08-10 15:11:14.678763501 +0200
+++ 0042-crypto-mvsam-fix-capabilities.patch	2021-08-10 15:11:13.006638012 +0200
@@ -1 +1 @@
-From 62f7513e2a2a7677b1f335e53c44316f171511e0 Mon Sep 17 00:00:00 2001
+From 819f3a8a413a953a259af03f0b9ce7d5af5f080c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 62f7513e2a2a7677b1f335e53c44316f171511e0 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index c61bdca369..527ddef0cf 100644
+index 2dfaa0b113..bf9c1200ef 100644