lkml.org 
[lkml]   [2015]   [Mar]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 05/17] crypto: talitos - isolate scatter/gather handling for ahash
Date
SEC1 doesn't support scatter/gather, therefore this part of the code will
have to be implemented differently for SEC1, so we isolate it in a small
helper function

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>

---
drivers/crypto/talitos.c | 29 +++++++++++++++++++----------
1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index 4db35a6..6766bcc 100644
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -1709,6 +1709,23 @@ static int ahash_init_sha224_swinit(struct ahash_request *areq)
return 0;
}

+static void ahash_process_chain(struct scatterlist *src, int nbytes,
+ bool *chained,
+ struct talitos_ahash_req_ctx *req_ctx,
+ int nbytes_to_hash)
+{
+ if (req_ctx->nbuf) {
+ unsigned int nsg = (req_ctx->nbuf < nbytes_to_hash) ? 2 : 1;
+
+ sg_init_table(req_ctx->bufsl, nsg);
+ sg_set_buf(req_ctx->bufsl, req_ctx->buf, req_ctx->nbuf);
+ if (nsg > 1)
+ scatterwalk_sg_chain(req_ctx->bufsl, 2, src);
+ req_ctx->psrc = req_ctx->bufsl;
+ } else
+ req_ctx->psrc = src;
+}
+
static int ahash_process_req(struct ahash_request *areq, unsigned int nbytes)
{
struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
@@ -1719,7 +1736,6 @@ static int ahash_process_req(struct ahash_request *areq, unsigned int nbytes)
crypto_tfm_alg_blocksize(crypto_ahash_tfm(tfm));
unsigned int nbytes_to_hash;
unsigned int to_hash_later;
- unsigned int nsg;
bool chained;

if (!req_ctx->last && (nbytes + req_ctx->nbuf <= blocksize)) {
@@ -1747,15 +1763,8 @@ static int ahash_process_req(struct ahash_request *areq, unsigned int nbytes)
}

/* Chain in any previously buffered data */
- if (req_ctx->nbuf) {
- nsg = (req_ctx->nbuf < nbytes_to_hash) ? 2 : 1;
- sg_init_table(req_ctx->bufsl, nsg);
- sg_set_buf(req_ctx->bufsl, req_ctx->buf, req_ctx->nbuf);
- if (nsg > 1)
- scatterwalk_sg_chain(req_ctx->bufsl, 2, areq->src);
- req_ctx->psrc = req_ctx->bufsl;
- } else
- req_ctx->psrc = areq->src;
+ ahash_process_chain(areq->src, nbytes, &chained, req_ctx,
+ nbytes_to_hash);

if (to_hash_later) {
int nents = sg_count(areq->src, nbytes, &chained);
--
2.1.0


\
 
 \ /
  Last update: 2015-03-05 18:01    [W:0.025 / U:0.072 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site