Commit 323abf25 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: s5p-sss - use the new scatterwalk functions 



s5p_sg_copy_buf() open-coded a copy from/to a scatterlist using
scatterwalk_* functions that are planned for removal.  Replace it with
the new functions memcpy_from_sglist() and memcpy_to_sglist() instead.
Also take the opportunity to replace calls to scatterwalk_map_and_copy()
in the same file; this eliminates the confusing 'out' argument.

Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Vladimir Zapolskiy <vz@mleia.com>
Cc: linux-samsung-soc@vger.kernel.org
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent e7d5d8a8

drivers/crypto/s5p-sss.c

+11 −27
Original line number Diff line number Diff line
@@ -458,19 +458,6 @@ static void s5p_free_sg_cpy(struct s5p_aes_dev *dev, struct scatterlist **sg) 
	*sg = NULL;

}



static void s5p_sg_copy_buf(void *buf, struct scatterlist *sg,

			    unsigned int nbytes, int out)

{

	struct scatter_walk walk;



	if (!nbytes)

		return;



	scatterwalk_start(&walk, sg);

	scatterwalk_copychunks(buf, &walk, nbytes, out);

	scatterwalk_done(&walk, out, 0);

}



static void s5p_sg_done(struct s5p_aes_dev *dev)

{

	struct skcipher_request *req = dev->req;
@@ -480,8 +467,8 @@ static void s5p_sg_done(struct s5p_aes_dev *dev) 
		dev_dbg(dev->dev,

			"Copying %d bytes of output data back to original place\n",

			dev->req->cryptlen);

		s5p_sg_copy_buf(sg_virt(dev->sg_dst_cpy), dev->req->dst,

				dev->req->cryptlen, 1);

		memcpy_to_sglist(dev->req->dst, 0, sg_virt(dev->sg_dst_cpy),

				 dev->req->cryptlen);

	}

	s5p_free_sg_cpy(dev, &dev->sg_src_cpy);

	s5p_free_sg_cpy(dev, &dev->sg_dst_cpy);
@@ -526,7 +513,7 @@ static int s5p_make_sg_cpy(struct s5p_aes_dev *dev, struct scatterlist *src, 
		return -ENOMEM;

	}



	s5p_sg_copy_buf(pages, src, dev->req->cryptlen, 0);

	memcpy_from_sglist(pages, src, 0, dev->req->cryptlen);



	sg_init_table(*dst, 1);

	sg_set_buf(*dst, pages, len);
@@ -1035,8 +1022,7 @@ static int s5p_hash_copy_sgs(struct s5p_hash_reqctx *ctx, 
	if (ctx->bufcnt)

		memcpy(buf, ctx->dd->xmit_buf, ctx->bufcnt);



	scatterwalk_map_and_copy(buf + ctx->bufcnt, sg, ctx->skip,

				 new_len, 0);

	memcpy_from_sglist(buf + ctx->bufcnt, sg, ctx->skip, new_len);

	sg_init_table(ctx->sgl, 1);

	sg_set_buf(ctx->sgl, buf, len);

	ctx->sg = ctx->sgl;
@@ -1229,8 +1215,7 @@ static int s5p_hash_prepare_request(struct ahash_request *req, bool update) 
		if (len > nbytes)

			len = nbytes;



		scatterwalk_map_and_copy(ctx->buffer + ctx->bufcnt, req->src,

					 0, len, 0);

		memcpy_from_sglist(ctx->buffer + ctx->bufcnt, req->src, 0, len);

		ctx->bufcnt += len;

		nbytes -= len;

		ctx->skip = len;
@@ -1253,9 +1238,8 @@ static int s5p_hash_prepare_request(struct ahash_request *req, bool update) 
		hash_later = ctx->total - xmit_len;

		/* copy hash_later bytes from end of req->src */

		/* previous bytes are in xmit_buf, so no overwrite */

		scatterwalk_map_and_copy(ctx->buffer, req->src,

					 req->nbytes - hash_later,

					 hash_later, 0);

		memcpy_from_sglist(ctx->buffer, req->src,

				   req->nbytes - hash_later, hash_later);

	}



	if (xmit_len > BUFLEN) {
@@ -1267,8 +1251,8 @@ static int s5p_hash_prepare_request(struct ahash_request *req, bool update) 
		/* have buffered data only */

		if (unlikely(!ctx->bufcnt)) {

			/* first update didn't fill up buffer */

			scatterwalk_map_and_copy(ctx->dd->xmit_buf, req->src,

						 0, xmit_len, 0);

			memcpy_from_sglist(ctx->dd->xmit_buf, req->src,

					   0, xmit_len);

		}



		sg_init_table(ctx->sgl, 1);
@@ -1506,8 +1490,8 @@ static int s5p_hash_update(struct ahash_request *req) 
		return 0;



	if (ctx->bufcnt + req->nbytes <= BUFLEN) {

		scatterwalk_map_and_copy(ctx->buffer + ctx->bufcnt, req->src,

					 0, req->nbytes, 0);

		memcpy_from_sglist(ctx->buffer + ctx->bufcnt, req->src,

				   0, req->nbytes);

		ctx->bufcnt += req->nbytes;

		return 0;

	}