Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

crypto: marvell/cesa - move mv_cesa_dma_add_frag() calls

Browse source 
Move the calls to mv_cesa_dma_add_frag() into the parent function,
mv_cesa_ahash_dma_req_init().  This is in preparation to changing
when we generate the operation blocks, as we need to avoid generating
a block for a partial hash block at the end of the user data.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Russell King 2015-10-18 17:24:16 +01:00 committed by Herbert Xu
parent 2f396a91d1
commit 0971d09a85
1 changed files with 29 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
drivers/crypto/marvell/hash.c
View file

@ -499,51 +499,23 @@ mv_cesa_dma_add_frag(struct mv_cesa_tdma_chain *chain,
return op; return op;
} }
static struct mv_cesa_op_ctx * static int
mv_cesa_ahash_dma_add_cache(struct mv_cesa_tdma_chain *chain, mv_cesa_ahash_dma_add_cache(struct mv_cesa_tdma_chain *chain,
struct mv_cesa_ahash_dma_iter *dma_iter, struct mv_cesa_ahash_dma_iter *dma_iter,
struct mv_cesa_ahash_req *creq, struct mv_cesa_ahash_req *creq,
gfp_t flags) gfp_t flags)
{ {
struct mv_cesa_ahash_dma_req *ahashdreq = &creq->req.dma; struct mv_cesa_ahash_dma_req *ahashdreq = &creq->req.dma;
struct mv_cesa_op_ctx *op = NULL;
int ret;
if (!creq->cache_ptr) if (!creq->cache_ptr)
return NULL; return 0;
ret = mv_cesa_dma_add_data_transfer(chain, return mv_cesa_dma_add_data_transfer(chain,
CESA_SA_DATA_SRAM_OFFSET, CESA_SA_DATA_SRAM_OFFSET,
ahashdreq->cache_dma, ahashdreq->cache_dma,
creq->cache_ptr, creq->cache_ptr,
CESA_TDMA_DST_IN_SRAM, CESA_TDMA_DST_IN_SRAM,
flags); flags);
if (ret)
return ERR_PTR(ret);
if (!dma_iter->base.op_len)
op = mv_cesa_dma_add_frag(chain, &creq->op_tmpl,
creq->cache_ptr, flags);
return op;
}
static struct mv_cesa_op_ctx *
mv_cesa_ahash_dma_add_data(struct mv_cesa_tdma_chain *chain,
struct mv_cesa_ahash_dma_iter *dma_iter,
struct mv_cesa_ahash_req *creq,
gfp_t flags)
{
int ret;
/* Add input transfers */
ret = mv_cesa_dma_add_op_transfers(chain, &dma_iter->base,
&dma_iter->src, flags);
if (ret)
return ERR_PTR(ret);
return mv_cesa_dma_add_frag(chain, &creq->op_tmpl, dma_iter->base.op_len,
flags);
} }
static struct mv_cesa_op_ctx * static struct mv_cesa_op_ctx *
@ -647,19 +619,34 @@ static int mv_cesa_ahash_dma_req_init(struct ahash_request *req)
mv_cesa_tdma_desc_iter_init(&chain); mv_cesa_tdma_desc_iter_init(&chain);
mv_cesa_ahash_req_iter_init(&iter, req); mv_cesa_ahash_req_iter_init(&iter, req);
op = mv_cesa_ahash_dma_add_cache(&chain, &iter, /*
creq, flags); * Add the cache (left-over data from a previous block) first.
if (IS_ERR(op)) { * This will never overflow the SRAM size.
ret = PTR_ERR(op); */
ret = mv_cesa_ahash_dma_add_cache(&chain, &iter, creq, flags);
if (ret)
goto err_free_tdma; goto err_free_tdma;
if (creq->cache_ptr && !iter.base.op_len) {
op = mv_cesa_dma_add_frag(&chain, &creq->op_tmpl,
creq->cache_ptr, flags);
if (IS_ERR(op)) {
ret = PTR_ERR(op);
goto err_free_tdma;
}
} }
do { do {
if (!iter.base.op_len) if (!iter.base.op_len)
break; break;
op = mv_cesa_ahash_dma_add_data(&chain, &iter, ret = mv_cesa_dma_add_op_transfers(&chain, &iter.base,
creq, flags); &iter.src, flags);
if (ret)
goto err_free_tdma;
op = mv_cesa_dma_add_frag(&chain, &creq->op_tmpl,
iter.base.op_len, flags);
if (IS_ERR(op)) { if (IS_ERR(op)) {
ret = PTR_ERR(op); ret = PTR_ERR(op);
goto err_free_tdma; goto err_free_tdma;