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

Commit 02e6f40c authored by Gilad Ben-Yossef's avatar Gilad Ben-Yossef Committed by Greg Kroah-Hartman
Browse files

staging: ccree: fold common code into function 



Fold common code copying MAC to/from a temp. buffer
into an inline function instead of keeping multiple
open coded versions of same.

Signed-off-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 33bb30c3

drivers/staging/ccree/ssi_buffer_mgr.c

+37 −52
Original line number Diff line number Diff line
@@ -64,6 +64,27 @@ struct buffer_array { 
	u32 *mlli_nents[MAX_NUM_OF_BUFFERS_IN_MLLI];

};



/**

 * cc_copy_mac() - Copy MAC to temporary location

 *

 * @dev: device object

 * @req: aead request object

 * @dir: [IN] copy from/to sgl

 */

static inline void cc_copy_mac(struct device *dev, struct aead_request *req,

			       enum ssi_sg_cpy_direct dir)

{

	struct aead_req_ctx *areq_ctx = aead_request_ctx(req);

	struct crypto_aead *tfm = crypto_aead_reqtfm(req);

	u32 skip = req->assoclen + req->cryptlen;



	if (areq_ctx->is_gcm4543)

		skip += crypto_aead_ivsize(tfm);



	cc_copy_sg_portion(dev, areq_ctx->backup_mac, req->src,

			   (skip - areq_ctx->req_authsize), skip, dir);

}



/**

 * cc_get_sgl_nents() - Get scatterlist number of entries.

 *
@@ -670,19 +691,11 @@ void cc_unmap_aead_request(struct device *dev, struct aead_request *req) 
	if (drvdata->coherent &&

	    (areq_ctx->gen_ctx.op_type == DRV_CRYPTO_DIRECTION_DECRYPT) &&

	    likely(req->src == req->dst)) {

		u32 size_to_skip = req->assoclen;



		if (areq_ctx->is_gcm4543)

			size_to_skip += crypto_aead_ivsize(tfm);



		/* copy mac to a temporary location to deal with possible

		/* copy back mac from temporary location to deal with possible

		 * data memory overriding that caused by cache coherence problem.

		 */

		cc_copy_sg_portion(dev, areq_ctx->backup_mac, req->src,

				   (size_to_skip + req->cryptlen -

				    areq_ctx->req_authsize),

				   (size_to_skip + req->cryptlen),

				   SSI_SG_FROM_BUF);

		cc_copy_mac(dev, req, SSI_SG_FROM_BUF);

	}

}
@@ -918,7 +931,6 @@ static inline int cc_prepare_aead_data_mlli( 
	enum drv_crypto_direction direct = areq_ctx->gen_ctx.op_type;

	unsigned int authsize = areq_ctx->req_authsize;

	int rc = 0, icv_nents;

	struct crypto_aead *tfm = crypto_aead_reqtfm(req);

	struct device *dev = drvdata_to_dev(drvdata);



	if (likely(req->src == req->dst)) {
@@ -943,24 +955,14 @@ static inline int cc_prepare_aead_data_mlli( 
			 * MAC verification upon request completion

			 */

			if (direct == DRV_CRYPTO_DIRECTION_DECRYPT) {

				if (!drvdata->coherent) {

				/* In coherent platforms (e.g. ACP)

				 * already copying ICV for any

				 * INPLACE-DECRYPT operation, hence

				 * we must neglect this code.

				 */

					u32 skip = req->assoclen;



					if (areq_ctx->is_gcm4543)

						skip += crypto_aead_ivsize(tfm);

				if (!drvdata->coherent)

					cc_copy_mac(dev, req, SSI_SG_TO_BUF);



					cc_copy_sg_portion(dev,

							   areq_ctx->backup_mac,

							   req->src,

							   (skip + req->cryptlen - areq_ctx->req_authsize),

							   (skip + req->cryptlen),

							   SSI_SG_TO_BUF);

				}

				areq_ctx->icv_virt_addr = areq_ctx->backup_mac;

			} else {

				areq_ctx->icv_virt_addr = areq_ctx->mac_buf;
@@ -996,22 +998,14 @@ static inline int cc_prepare_aead_data_mlli( 
			goto prepare_data_mlli_exit;

		}



		if (unlikely(areq_ctx->is_icv_fragmented)) {

		/* Backup happens only when ICV is fragmented, ICV

		 * verification is made by CPU compare in order to simplify

		 * MAC verification upon request completion

		 */

			u32 size_to_skip = req->assoclen;



			if (areq_ctx->is_gcm4543)

				size_to_skip += crypto_aead_ivsize(tfm);



			  cc_copy_sg_portion(dev, areq_ctx->backup_mac,

					     req->src,

					     (size_to_skip + req->cryptlen - areq_ctx->req_authsize),

					     (size_to_skip + req->cryptlen),

					     SSI_SG_TO_BUF);

		if (unlikely(areq_ctx->is_icv_fragmented)) {

			cc_copy_mac(dev, req, SSI_SG_TO_BUF);

			areq_ctx->icv_virt_addr = areq_ctx->backup_mac;



		} else { /* Contig. ICV */

			/*Should hanlde if the sg is not contig.*/

			areq_ctx->icv_dma_addr = sg_dma_address(
@@ -1249,22 +1243,13 @@ int cc_map_aead_request( 
	mlli_params->curr_pool = NULL;

	sg_data.num_of_buffers = 0;



	if (drvdata->coherent &&

	    (areq_ctx->gen_ctx.op_type == DRV_CRYPTO_DIRECTION_DECRYPT) &&

	    likely(req->src == req->dst)) {

		u32 size_to_skip = req->assoclen;



		if (is_gcm4543)

			size_to_skip += crypto_aead_ivsize(tfm);



	/* copy mac to a temporary location to deal with possible

	 * data memory overriding that caused by cache coherence problem.

	 */

		cc_copy_sg_portion(dev, areq_ctx->backup_mac, req->src,

				   (size_to_skip + req->cryptlen - areq_ctx->req_authsize),

				   (size_to_skip + req->cryptlen),

				   SSI_SG_TO_BUF);

	}

	if (drvdata->coherent &&

	    (areq_ctx->gen_ctx.op_type == DRV_CRYPTO_DIRECTION_DECRYPT) &&

	    likely(req->src == req->dst))

		cc_copy_mac(dev, req, SSI_SG_TO_BUF);



	/* cacluate the size for cipher remove ICV in decrypt*/

	areq_ctx->cryptlen = (areq_ctx->gen_ctx.op_type ==