aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/804-crypto-0022-MLK-19801-2-crypto-caam-add-support-of-tagged-keys-i.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2020-05-11 13:17:22 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-05-12 12:36:28 +0200
commit0fed36dd484272eb546dd69f4dc84221ca5f01a5 (patch)
tree1707740b7a5c50720771e169aeb76124ba8e5f6e /target/linux/layerscape/patches-5.4/804-crypto-0022-MLK-19801-2-crypto-caam-add-support-of-tagged-keys-i.patch
parent7dd2d7289a06ac742cfce5dbc9c583146b2c4a9c (diff)
downloadupstream-0fed36dd484272eb546dd69f4dc84221ca5f01a5.tar.gz
upstream-0fed36dd484272eb546dd69f4dc84221ca5f01a5.tar.bz2
upstream-0fed36dd484272eb546dd69f4dc84221ca5f01a5.zip
kernel: bump 5.4 to 5.4.40
Refreshed all patches. Compile-tested on: imx6 Runtime-tested on: imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/804-crypto-0022-MLK-19801-2-crypto-caam-add-support-of-tagged-keys-i.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/804-crypto-0022-MLK-19801-2-crypto-caam-add-support-of-tagged-keys-i.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/layerscape/patches-5.4/804-crypto-0022-MLK-19801-2-crypto-caam-add-support-of-tagged-keys-i.patch b/target/linux/layerscape/patches-5.4/804-crypto-0022-MLK-19801-2-crypto-caam-add-support-of-tagged-keys-i.patch
index 915a2cdb47..cf982f8a58 100644
--- a/target/linux/layerscape/patches-5.4/804-crypto-0022-MLK-19801-2-crypto-caam-add-support-of-tagged-keys-i.patch
+++ b/target/linux/layerscape/patches-5.4/804-crypto-0022-MLK-19801-2-crypto-caam-add-support-of-tagged-keys-i.patch
@@ -205,7 +205,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
--- a/drivers/crypto/caam/caamalg_desc.c
+++ b/drivers/crypto/caam/caamalg_desc.c
-@@ -1386,8 +1386,14 @@ void cnstr_shdsc_skcipher_encap(u32 * co
+@@ -1389,8 +1389,14 @@ void cnstr_shdsc_skcipher_encap(u32 * co
JUMP_COND_SHRD);
/* Load class1 key only */
@@ -222,7 +222,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
/* Load nonce into CONTEXT1 reg */
if (is_rfc3686) {
-@@ -1458,8 +1464,14 @@ void cnstr_shdsc_skcipher_decap(u32 * co
+@@ -1464,8 +1470,14 @@ void cnstr_shdsc_skcipher_decap(u32 * co
JUMP_COND_SHRD);
/* Load class1 key only */