diff options
author | Daniel Golle <daniel@makrotopia.org> | 2022-03-21 01:16:48 +0000 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2022-03-21 13:11:56 +0000 |
commit | 786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186 (patch) | |
tree | 926fecb2b1f6ce1e42ba7ef4c7aab8e68dfd214c /target/linux/layerscape/patches-5.4/804-crypto-0003-crypto-caam-use-mapped_-src-dst-_nents-for-descripto.patch | |
parent | 9470160c350d15f765c33d6c1db15d6c4709a64c (diff) | |
download | upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.tar.gz upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.tar.bz2 upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.zip |
kernel: delete Linux 5.4 config and patches
As the upcoming release will be based on Linux 5.10 only, remove all
kernel configuration as well as patches for Linux 5.4.
There were no targets still actively using Linux 5.4.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit 3a14580411adfb75f9a44eded9f41245b9e44606)
Diffstat (limited to 'target/linux/layerscape/patches-5.4/804-crypto-0003-crypto-caam-use-mapped_-src-dst-_nents-for-descripto.patch')
-rw-r--r-- | target/linux/layerscape/patches-5.4/804-crypto-0003-crypto-caam-use-mapped_-src-dst-_nents-for-descripto.patch | 227 |
1 files changed, 0 insertions, 227 deletions
diff --git a/target/linux/layerscape/patches-5.4/804-crypto-0003-crypto-caam-use-mapped_-src-dst-_nents-for-descripto.patch b/target/linux/layerscape/patches-5.4/804-crypto-0003-crypto-caam-use-mapped_-src-dst-_nents-for-descripto.patch deleted file mode 100644 index 4e1efc858b..0000000000 --- a/target/linux/layerscape/patches-5.4/804-crypto-0003-crypto-caam-use-mapped_-src-dst-_nents-for-descripto.patch +++ /dev/null @@ -1,227 +0,0 @@ -From e640f4bcfa0088ff696bc5da6063a1ea8d782189 Mon Sep 17 00:00:00 2001 -From: Iuliana Prodan <iuliana.prodan@nxp.com> -Date: Thu, 26 Sep 2019 15:26:29 +0300 -Subject: [PATCH] crypto: caam - use mapped_{src,dst}_nents for descriptor -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The mapped_{src,dst}_nents _returned_ from the dma_map_sg -call (which could be less than src/dst_nents) have to be -used to generate the job descriptors. - -Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com> -Reviewed-by: Horia Geantă <horia.geanta@nxp.com> -Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> -(cherry picked from commit eff9771d51529acf7f6f58a60b2923b98da28f0e) ---- - drivers/crypto/caam/caampkc.c | 72 +++++++++++++++++++++++-------------------- - drivers/crypto/caam/caampkc.h | 8 +++-- - 2 files changed, 45 insertions(+), 35 deletions(-) - ---- a/drivers/crypto/caam/caampkc.c -+++ b/drivers/crypto/caam/caampkc.c -@@ -252,9 +252,9 @@ static struct rsa_edesc *rsa_edesc_alloc - gfp_t flags = (req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP) ? - GFP_KERNEL : GFP_ATOMIC; - int sg_flags = (flags == GFP_ATOMIC) ? SG_MITER_ATOMIC : 0; -- int sgc; - int sec4_sg_index, sec4_sg_len = 0, sec4_sg_bytes; - int src_nents, dst_nents; -+ int mapped_src_nents, mapped_dst_nents; - unsigned int diff_size = 0; - int lzeros; - -@@ -285,13 +285,27 @@ static struct rsa_edesc *rsa_edesc_alloc - req_ctx->fixup_src_len); - dst_nents = sg_nents_for_len(req->dst, req->dst_len); - -- if (!diff_size && src_nents == 1) -+ mapped_src_nents = dma_map_sg(dev, req_ctx->fixup_src, src_nents, -+ DMA_TO_DEVICE); -+ if (unlikely(!mapped_src_nents)) { -+ dev_err(dev, "unable to map source\n"); -+ return ERR_PTR(-ENOMEM); -+ } -+ mapped_dst_nents = dma_map_sg(dev, req->dst, dst_nents, -+ DMA_FROM_DEVICE); -+ if (unlikely(!mapped_dst_nents)) { -+ dev_err(dev, "unable to map destination\n"); -+ goto src_fail; -+ } -+ -+ if (!diff_size && mapped_src_nents == 1) - sec4_sg_len = 0; /* no need for an input hw s/g table */ - else -- sec4_sg_len = src_nents + !!diff_size; -+ sec4_sg_len = mapped_src_nents + !!diff_size; - sec4_sg_index = sec4_sg_len; -- if (dst_nents > 1) -- sec4_sg_len += pad_sg_nents(dst_nents); -+ -+ if (mapped_dst_nents > 1) -+ sec4_sg_len += pad_sg_nents(mapped_dst_nents); - else - sec4_sg_len = pad_sg_nents(sec4_sg_len); - -@@ -301,19 +315,7 @@ static struct rsa_edesc *rsa_edesc_alloc - edesc = kzalloc(sizeof(*edesc) + desclen + sec4_sg_bytes, - GFP_DMA | flags); - if (!edesc) -- return ERR_PTR(-ENOMEM); -- -- sgc = dma_map_sg(dev, req_ctx->fixup_src, src_nents, DMA_TO_DEVICE); -- if (unlikely(!sgc)) { -- dev_err(dev, "unable to map source\n"); -- goto src_fail; -- } -- -- sgc = dma_map_sg(dev, req->dst, dst_nents, DMA_FROM_DEVICE); -- if (unlikely(!sgc)) { -- dev_err(dev, "unable to map destination\n"); - goto dst_fail; -- } - - edesc->sec4_sg = (void *)edesc + sizeof(*edesc) + desclen; - if (diff_size) -@@ -324,7 +326,7 @@ static struct rsa_edesc *rsa_edesc_alloc - sg_to_sec4_sg_last(req_ctx->fixup_src, req_ctx->fixup_src_len, - edesc->sec4_sg + !!diff_size, 0); - -- if (dst_nents > 1) -+ if (mapped_dst_nents > 1) - sg_to_sec4_sg_last(req->dst, req->dst_len, - edesc->sec4_sg + sec4_sg_index, 0); - -@@ -335,6 +337,9 @@ static struct rsa_edesc *rsa_edesc_alloc - if (!sec4_sg_bytes) - return edesc; - -+ edesc->mapped_src_nents = mapped_src_nents; -+ edesc->mapped_dst_nents = mapped_dst_nents; -+ - edesc->sec4_sg_dma = dma_map_single(dev, edesc->sec4_sg, - sec4_sg_bytes, DMA_TO_DEVICE); - if (dma_mapping_error(dev, edesc->sec4_sg_dma)) { -@@ -351,11 +356,11 @@ static struct rsa_edesc *rsa_edesc_alloc - return edesc; - - sec4_sg_fail: -- dma_unmap_sg(dev, req->dst, dst_nents, DMA_FROM_DEVICE); -+ kfree(edesc); - dst_fail: -- dma_unmap_sg(dev, req_ctx->fixup_src, src_nents, DMA_TO_DEVICE); -+ dma_unmap_sg(dev, req->dst, dst_nents, DMA_FROM_DEVICE); - src_fail: -- kfree(edesc); -+ dma_unmap_sg(dev, req_ctx->fixup_src, src_nents, DMA_TO_DEVICE); - return ERR_PTR(-ENOMEM); - } - -@@ -383,15 +388,15 @@ static int set_rsa_pub_pdb(struct akciph - return -ENOMEM; - } - -- if (edesc->src_nents > 1) { -+ if (edesc->mapped_src_nents > 1) { - pdb->sgf |= RSA_PDB_SGF_F; - pdb->f_dma = edesc->sec4_sg_dma; -- sec4_sg_index += edesc->src_nents; -+ sec4_sg_index += edesc->mapped_src_nents; - } else { - pdb->f_dma = sg_dma_address(req_ctx->fixup_src); - } - -- if (edesc->dst_nents > 1) { -+ if (edesc->mapped_dst_nents > 1) { - pdb->sgf |= RSA_PDB_SGF_G; - pdb->g_dma = edesc->sec4_sg_dma + - sec4_sg_index * sizeof(struct sec4_sg_entry); -@@ -428,17 +433,18 @@ static int set_rsa_priv_f1_pdb(struct ak - return -ENOMEM; - } - -- if (edesc->src_nents > 1) { -+ if (edesc->mapped_src_nents > 1) { - pdb->sgf |= RSA_PRIV_PDB_SGF_G; - pdb->g_dma = edesc->sec4_sg_dma; -- sec4_sg_index += edesc->src_nents; -+ sec4_sg_index += edesc->mapped_src_nents; -+ - } else { - struct caam_rsa_req_ctx *req_ctx = akcipher_request_ctx(req); - - pdb->g_dma = sg_dma_address(req_ctx->fixup_src); - } - -- if (edesc->dst_nents > 1) { -+ if (edesc->mapped_dst_nents > 1) { - pdb->sgf |= RSA_PRIV_PDB_SGF_F; - pdb->f_dma = edesc->sec4_sg_dma + - sec4_sg_index * sizeof(struct sec4_sg_entry); -@@ -493,17 +499,17 @@ static int set_rsa_priv_f2_pdb(struct ak - goto unmap_tmp1; - } - -- if (edesc->src_nents > 1) { -+ if (edesc->mapped_src_nents > 1) { - pdb->sgf |= RSA_PRIV_PDB_SGF_G; - pdb->g_dma = edesc->sec4_sg_dma; -- sec4_sg_index += edesc->src_nents; -+ sec4_sg_index += edesc->mapped_src_nents; - } else { - struct caam_rsa_req_ctx *req_ctx = akcipher_request_ctx(req); - - pdb->g_dma = sg_dma_address(req_ctx->fixup_src); - } - -- if (edesc->dst_nents > 1) { -+ if (edesc->mapped_dst_nents > 1) { - pdb->sgf |= RSA_PRIV_PDB_SGF_F; - pdb->f_dma = edesc->sec4_sg_dma + - sec4_sg_index * sizeof(struct sec4_sg_entry); -@@ -582,17 +588,17 @@ static int set_rsa_priv_f3_pdb(struct ak - goto unmap_tmp1; - } - -- if (edesc->src_nents > 1) { -+ if (edesc->mapped_src_nents > 1) { - pdb->sgf |= RSA_PRIV_PDB_SGF_G; - pdb->g_dma = edesc->sec4_sg_dma; -- sec4_sg_index += edesc->src_nents; -+ sec4_sg_index += edesc->mapped_src_nents; - } else { - struct caam_rsa_req_ctx *req_ctx = akcipher_request_ctx(req); - - pdb->g_dma = sg_dma_address(req_ctx->fixup_src); - } - -- if (edesc->dst_nents > 1) { -+ if (edesc->mapped_dst_nents > 1) { - pdb->sgf |= RSA_PRIV_PDB_SGF_F; - pdb->f_dma = edesc->sec4_sg_dma + - sec4_sg_index * sizeof(struct sec4_sg_entry); ---- a/drivers/crypto/caam/caampkc.h -+++ b/drivers/crypto/caam/caampkc.h -@@ -112,8 +112,10 @@ struct caam_rsa_req_ctx { - - /** - * rsa_edesc - s/w-extended rsa descriptor -- * @src_nents : number of segments in input scatterlist -- * @dst_nents : number of segments in output scatterlist -+ * @src_nents : number of segments in input s/w scatterlist -+ * @dst_nents : number of segments in output s/w scatterlist -+ * @mapped_src_nents: number of segments in input h/w link table -+ * @mapped_dst_nents: number of segments in output h/w link table - * @sec4_sg_bytes : length of h/w link table - * @sec4_sg_dma : dma address of h/w link table - * @sec4_sg : pointer to h/w link table -@@ -123,6 +125,8 @@ struct caam_rsa_req_ctx { - struct rsa_edesc { - int src_nents; - int dst_nents; -+ int mapped_src_nents; -+ int mapped_dst_nents; - int sec4_sg_bytes; - dma_addr_t sec4_sg_dma; - struct sec4_sg_entry *sec4_sg; |