Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8651791e authored by Russell King's avatar Russell King Committed by Herbert Xu
Browse files

crypto: marvell/cesa - factor out first fragment decisions to helper 



Multiple locations in the driver test the operation context fragment
type, checking whether it is a first fragment or not.  Introduce a
mv_cesa_mac_op_is_first_frag() helper, which returns true if the
fragment operation is for a first fragment.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent c439e4ee

drivers/crypto/marvell/cesa.h

+6 −0
Original line number Diff line number Diff line
@@ -686,6 +686,12 @@ static inline u32 mv_cesa_get_int_mask(struct mv_cesa_engine *engine) 
	return engine->int_mask;

}



static inline bool mv_cesa_mac_op_is_first_frag(const struct mv_cesa_op_ctx *op)

{

	return (mv_cesa_get_op_cfg(op) & CESA_SA_DESC_CFG_FRAG_MSK) ==

		CESA_SA_DESC_CFG_FIRST_FRAG;

}



int mv_cesa_queue_req(struct crypto_async_request *req);



/* TDMA functions */

drivers/crypto/marvell/hash.c

+3 −6
Original line number Diff line number Diff line
@@ -524,8 +524,7 @@ mv_cesa_ahash_dma_add_data(struct mv_cesa_tdma_chain *chain, 


	mv_cesa_set_mac_op_frag_len(op, dma_iter->base.op_len);



	if ((mv_cesa_get_op_cfg(&creq->op_tmpl) & CESA_SA_DESC_CFG_FRAG_MSK) ==

	    CESA_SA_DESC_CFG_FIRST_FRAG)

	if (mv_cesa_mac_op_is_first_frag(&creq->op_tmpl))

		mv_cesa_update_op_cfg(&creq->op_tmpl,

				      CESA_SA_DESC_CFG_MID_FRAG,

				      CESA_SA_DESC_CFG_FRAG_MSK);
@@ -561,8 +560,7 @@ mv_cesa_ahash_dma_last_req(struct mv_cesa_tdma_chain *chain, 
	if (op && creq->len <= CESA_SA_DESC_MAC_SRC_TOTAL_LEN_MAX) {

		u32 frag = CESA_SA_DESC_CFG_NOT_FRAG;



		if ((mv_cesa_get_op_cfg(op) & CESA_SA_DESC_CFG_FRAG_MSK) !=

		    CESA_SA_DESC_CFG_FIRST_FRAG)

		if (!mv_cesa_mac_op_is_first_frag(op))

			frag = CESA_SA_DESC_CFG_LAST_FRAG;



		mv_cesa_update_op_cfg(op, frag, CESA_SA_DESC_CFG_FRAG_MSK);
@@ -600,8 +598,7 @@ mv_cesa_ahash_dma_last_req(struct mv_cesa_tdma_chain *chain, 
	if (padoff >= trailerlen)

		return op;



	if ((mv_cesa_get_op_cfg(&creq->op_tmpl) & CESA_SA_DESC_CFG_FRAG_MSK) !=

	    CESA_SA_DESC_CFG_FIRST_FRAG)

	if (!mv_cesa_mac_op_is_first_frag(&creq->op_tmpl))

		mv_cesa_update_op_cfg(&creq->op_tmpl,

				      CESA_SA_DESC_CFG_MID_FRAG,

				      CESA_SA_DESC_CFG_FRAG_MSK);