Commit 032d197e authored by Christophe Leroy's avatar Christophe Leroy Committed by Herbert Xu
Browse files

crypto: talitos - Refactor the sg in/out chain allocation 



This patch refactors the handling of the input and output data that is quite
similar in several functions

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 2529bc37

drivers/crypto/talitos.c

+81 −78
Original line number Diff line number Diff line
@@ -1327,16 +1327,23 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *cipher, 
	return 0;

}



static void unmap_sg_talitos_ptr(struct device *dev, struct scatterlist *src,

				 struct scatterlist *dst, unsigned int len,

				 struct talitos_edesc *edesc)

{

	talitos_sg_unmap(dev, edesc, src, dst);

}



static void common_nonsnoop_unmap(struct device *dev,

				  struct talitos_edesc *edesc,

				  struct ablkcipher_request *areq)

{

	unmap_single_talitos_ptr(dev, &edesc->desc.ptr[5], DMA_FROM_DEVICE);



	unmap_sg_talitos_ptr(dev, areq->src, areq->dst, areq->nbytes, edesc);

	unmap_single_talitos_ptr(dev, &edesc->desc.ptr[2], DMA_TO_DEVICE);

	unmap_single_talitos_ptr(dev, &edesc->desc.ptr[1], DMA_TO_DEVICE);



	talitos_sg_unmap(dev, edesc, areq->src, areq->dst);



	if (edesc->dma_len)

		dma_unmap_single(dev, edesc->dma_link_tbl, edesc->dma_len,

				 DMA_BIDIRECTIONAL);
@@ -1358,6 +1365,65 @@ static void ablkcipher_done(struct device *dev, 
	areq->base.complete(&areq->base, err);

}



int map_sg_in_talitos_ptr(struct device *dev, struct scatterlist *src,

			  unsigned int len, struct talitos_edesc *edesc,

			  enum dma_data_direction dir, struct talitos_ptr *ptr)

{

	int sg_count;



	ptr->len = cpu_to_be16(len);

	ptr->j_extent = 0;



	sg_count = talitos_map_sg(dev, src, edesc->src_nents ? : 1, dir,

				  edesc->src_chained);



	if (sg_count == 1) {

		to_talitos_ptr(ptr, sg_dma_address(src));

	} else {

		sg_count = sg_to_link_tbl(src, sg_count, len,

					  &edesc->link_tbl[0]);

		if (sg_count > 1) {

			to_talitos_ptr(ptr, edesc->dma_link_tbl);

			ptr->j_extent |= DESC_PTR_LNKTBL_JUMP;

			dma_sync_single_for_device(dev, edesc->dma_link_tbl,

						   edesc->dma_len,

						   DMA_BIDIRECTIONAL);

		} else {

			/* Only one segment now, so no link tbl needed */

			to_talitos_ptr(ptr, sg_dma_address(src));

		}

	}

	return sg_count;

}



void map_sg_out_talitos_ptr(struct device *dev, struct scatterlist *dst,

			    unsigned int len, struct talitos_edesc *edesc,

			    enum dma_data_direction dir,

			    struct talitos_ptr *ptr, int sg_count)

{

	ptr->len = cpu_to_be16(len);

	ptr->j_extent = 0;



	if (dir != DMA_NONE)

		sg_count = talitos_map_sg(dev, dst, edesc->dst_nents ? : 1,

					  dir, edesc->dst_chained);



	if (sg_count == 1) {

		to_talitos_ptr(ptr, sg_dma_address(dst));

	} else {

		struct talitos_ptr *link_tbl_ptr =

			&edesc->link_tbl[edesc->src_nents + 1];



		to_talitos_ptr(ptr, edesc->dma_link_tbl +

					      (edesc->src_nents + 1) *

					      sizeof(struct talitos_ptr));

		ptr->j_extent |= DESC_PTR_LNKTBL_JUMP;

		sg_count = sg_to_link_tbl(dst, sg_count, len, link_tbl_ptr);

		dma_sync_single_for_device(dev, edesc->dma_link_tbl,

					   edesc->dma_len, DMA_BIDIRECTIONAL);

	}

}



static int common_nonsnoop(struct talitos_edesc *edesc,

			   struct ablkcipher_request *areq,

			   void (*callback) (struct device *dev,
@@ -1387,56 +1453,16 @@ static int common_nonsnoop(struct talitos_edesc *edesc, 
	/*

	 * cipher in

	 */

	desc->ptr[3].len = cpu_to_be16(cryptlen);

	desc->ptr[3].j_extent = 0;



	sg_count = talitos_map_sg(dev, areq->src, edesc->src_nents ? : 1,

				  (areq->src == areq->dst) ? DMA_BIDIRECTIONAL

							   : DMA_TO_DEVICE,

				  edesc->src_chained);



	if (sg_count == 1) {

		to_talitos_ptr(&desc->ptr[3], sg_dma_address(areq->src));

	} else {

		sg_count = sg_to_link_tbl(areq->src, sg_count, cryptlen,

					  &edesc->link_tbl[0]);

		if (sg_count > 1) {

			to_talitos_ptr(&desc->ptr[3], edesc->dma_link_tbl);

			desc->ptr[3].j_extent |= DESC_PTR_LNKTBL_JUMP;

			dma_sync_single_for_device(dev, edesc->dma_link_tbl,

						   edesc->dma_len,

						   DMA_BIDIRECTIONAL);

		} else {

			/* Only one segment now, so no link tbl needed */

			to_talitos_ptr(&desc->ptr[3],

				       sg_dma_address(areq->src));

		}

	}

	sg_count = map_sg_in_talitos_ptr(dev, areq->src, cryptlen, edesc,

					 (areq->src == areq->dst) ?

					  DMA_BIDIRECTIONAL : DMA_TO_DEVICE,

					  &desc->ptr[3]);



	/* cipher out */

	desc->ptr[4].len = cpu_to_be16(cryptlen);

	desc->ptr[4].j_extent = 0;



	if (areq->src != areq->dst)

		sg_count = talitos_map_sg(dev, areq->dst,

					  edesc->dst_nents ? : 1,

					  DMA_FROM_DEVICE, edesc->dst_chained);



	if (sg_count == 1) {

		to_talitos_ptr(&desc->ptr[4], sg_dma_address(areq->dst));

	} else {

		struct talitos_ptr *link_tbl_ptr =

			&edesc->link_tbl[edesc->src_nents + 1];



		to_talitos_ptr(&desc->ptr[4], edesc->dma_link_tbl +

					      (edesc->src_nents + 1) *

					      sizeof(struct talitos_ptr));

		desc->ptr[4].j_extent |= DESC_PTR_LNKTBL_JUMP;

		sg_count = sg_to_link_tbl(areq->dst, sg_count, cryptlen,

					  link_tbl_ptr);

		dma_sync_single_for_device(ctx->dev, edesc->dma_link_tbl,

					   edesc->dma_len, DMA_BIDIRECTIONAL);

	}

	map_sg_out_talitos_ptr(dev, areq->dst, cryptlen, edesc,

			       (areq->src == areq->dst) ? DMA_NONE

							: DMA_FROM_DEVICE,

			       &desc->ptr[4], sg_count);



	/* iv out */

	map_single_talitos_ptr(dev, &desc->ptr[5], ivsize, ctx->iv, 0,
@@ -1506,6 +1532,8 @@ static void common_nonsnoop_hash_unmap(struct device *dev, 


	unmap_single_talitos_ptr(dev, &edesc->desc.ptr[5], DMA_FROM_DEVICE);



	unmap_sg_talitos_ptr(dev, req_ctx->psrc, NULL, 0, edesc);



	/* When using hashctx-in, must unmap it. */

	if (edesc->desc.ptr[1].len)

		unmap_single_talitos_ptr(dev, &edesc->desc.ptr[1],
@@ -1515,8 +1543,6 @@ static void common_nonsnoop_hash_unmap(struct device *dev, 
		unmap_single_talitos_ptr(dev, &edesc->desc.ptr[2],

					 DMA_TO_DEVICE);



	talitos_sg_unmap(dev, edesc, req_ctx->psrc, NULL);



	if (edesc->dma_len)

		dma_unmap_single(dev, edesc->dma_link_tbl, edesc->dma_len,

				 DMA_BIDIRECTIONAL);
@@ -1555,7 +1581,7 @@ static int common_nonsnoop_hash(struct talitos_edesc *edesc, 
	struct talitos_ahash_req_ctx *req_ctx = ahash_request_ctx(areq);

	struct device *dev = ctx->dev;

	struct talitos_desc *desc = &edesc->desc;

	int sg_count, ret;

	int ret;



	/* first DWORD empty */

	desc->ptr[0] = zero_entry;
@@ -1583,31 +1609,8 @@ static int common_nonsnoop_hash(struct talitos_edesc *edesc, 
	/*

	 * data in

	 */

	desc->ptr[3].len = cpu_to_be16(length);

	desc->ptr[3].j_extent = 0;



	sg_count = talitos_map_sg(dev, req_ctx->psrc,

				  edesc->src_nents ? : 1,

				  DMA_TO_DEVICE, edesc->src_chained);



	if (sg_count == 1) {

		to_talitos_ptr(&desc->ptr[3], sg_dma_address(req_ctx->psrc));

	} else {

		sg_count = sg_to_link_tbl(req_ctx->psrc, sg_count, length,

					  &edesc->link_tbl[0]);

		if (sg_count > 1) {

			desc->ptr[3].j_extent |= DESC_PTR_LNKTBL_JUMP;

			to_talitos_ptr(&desc->ptr[3], edesc->dma_link_tbl);

			dma_sync_single_for_device(ctx->dev,

						   edesc->dma_link_tbl,

						   edesc->dma_len,

						   DMA_BIDIRECTIONAL);

		} else {

			/* Only one segment now, so no link tbl needed */

			to_talitos_ptr(&desc->ptr[3],

				       sg_dma_address(req_ctx->psrc));

		}

	}

	map_sg_in_talitos_ptr(dev, req_ctx->psrc, length, edesc,

			      DMA_TO_DEVICE, &desc->ptr[3]);



	/* fifth DWORD empty */

	desc->ptr[4] = zero_entry;