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

Commit 38cf5533 authored by Christian Lamparter's avatar Christian Lamparter Committed by Herbert Xu
Browse files

crypto: crypto4xx - get rid of redundant using_sd variable 



using_sd is used as a stand-in for sa_command_0.bf.scatter
that we need to set anyway, so we might as well just prevent
double-accounting.

Signed-off-by: default avatarChristian Lamparter <chunkeey@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 9848e4c8

drivers/crypto/amcc/crypto4xx_core.c

+2 −4
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ static void crypto4xx_cipher_done(struct crypto4xx_device *dev, 


	req = skcipher_request_cast(pd_uinfo->async_req);



	if (pd_uinfo->using_sd) {

	if (pd_uinfo->sa_va->sa_command_0.bf.scatter) {

		crypto4xx_copy_pkt_to_dst(dev, pd, pd_uinfo,

					  req->cryptlen, req->dst);

	} else {
@@ -593,7 +593,7 @@ static void crypto4xx_aead_done(struct crypto4xx_device *dev, 
	u32 icv[AES_BLOCK_SIZE];

	int err = 0;



	if (pd_uinfo->using_sd) {

	if (pd_uinfo->sa_va->sa_command_0.bf.scatter) {

		crypto4xx_copy_pkt_to_dst(dev, pd, pd_uinfo,

					  pd->pd_ctl_len.bf.pkt_len,

					  dst);
@@ -887,7 +887,6 @@ int crypto4xx_build_pd(struct crypto_async_request *req, 
		 * we know application give us dst a whole piece of memory

		 * no need to use scatter ring.

		 */

		pd_uinfo->using_sd = 0;

		pd_uinfo->first_sd = 0xffffffff;

		sa->sa_command_0.bf.scatter = 0;

		pd->dest = (u32)dma_map_page(dev->core_dev->device,
@@ -901,7 +900,6 @@ int crypto4xx_build_pd(struct crypto_async_request *req, 
		u32 sd_idx = fst_sd;

		nbytes = datalen;

		sa->sa_command_0.bf.scatter = 1;

		pd_uinfo->using_sd = 1;

		pd_uinfo->first_sd = fst_sd;

		sd = crypto4xx_get_sdp(dev, &sd_dma, sd_idx);

		pd->dest = sd_dma;

drivers/crypto/amcc/crypto4xx_core.h

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ union shadow_sa_buf { 
struct pd_uinfo {

	struct crypto4xx_device *dev;

	u32   state;

	u32 using_sd;

	u32 first_gd;		/* first gather discriptor

				used by this packet */

	u32 num_gd;             /* number of gather discriptor