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

Commit 343e44b1 authored by Russell King's avatar Russell King Committed by Herbert Xu
Browse files

crypto: caam - replace sec4_sg pointer with array 



Since the extended descriptor includes the hardware descriptor, and the
sec4 scatterlist immediately follows this, we can declare it as a array
at the very end of the extended descriptor.  This allows us to get rid
of an initialiser for every site where we allocate an extended
descriptor.

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

drivers/crypto/caam/caamhash.c

+3 −9
Original line number Original line Diff line number Diff line
@@ -595,16 +595,16 @@ static int ahash_setkey(struct crypto_ahash *ahash, 
 * @sec4_sg_dma: physical mapped address of h/w link table

 * @sec4_sg_dma: physical mapped address of h/w link table

 * @src_nents: number of segments in input scatterlist

 * @src_nents: number of segments in input scatterlist

 * @sec4_sg_bytes: length of dma mapped sec4_sg space

 * @sec4_sg_bytes: length of dma mapped sec4_sg space

 * @sec4_sg: pointer to h/w link table

 * @hw_desc: the h/w job descriptor followed by any referenced link tables

 * @hw_desc: the h/w job descriptor followed by any referenced link tables

 * @sec4_sg: h/w link table

 */

 */

struct ahash_edesc {

struct ahash_edesc {

	dma_addr_t dst_dma;

	dma_addr_t dst_dma;

	dma_addr_t sec4_sg_dma;

	dma_addr_t sec4_sg_dma;

	int src_nents;

	int src_nents;

	int sec4_sg_bytes;

	int sec4_sg_bytes;

	struct sec4_sg_entry *sec4_sg;

	u32 hw_desc[DESC_JOB_IO_LEN / sizeof(u32)] ____cacheline_aligned;

	u32 hw_desc[DESC_JOB_IO_LEN / sizeof(u32)] ____cacheline_aligned;

	struct sec4_sg_entry sec4_sg[0];

};

};





static inline void ahash_unmap(struct device *dev,

static inline void ahash_unmap(struct device *dev,
@@ -825,7 +825,6 @@ static int ahash_update_ctx(struct ahash_request *req) 




		edesc->src_nents = src_nents;

		edesc->src_nents = src_nents;

		edesc->sec4_sg_bytes = sec4_sg_bytes;

		edesc->sec4_sg_bytes = sec4_sg_bytes;

		edesc->sec4_sg = (void *)(edesc + 1);





		ret = ctx_map_to_sec4_sg(desc, jrdev, state, ctx->ctx_len,

		ret = ctx_map_to_sec4_sg(desc, jrdev, state, ctx->ctx_len,

					 edesc->sec4_sg, DMA_BIDIRECTIONAL);

					 edesc->sec4_sg, DMA_BIDIRECTIONAL);
@@ -935,7 +934,6 @@ static int ahash_final_ctx(struct ahash_request *req) 
	init_job_desc_shared(desc, ptr, sh_len, HDR_SHARE_DEFER | HDR_REVERSE);

	init_job_desc_shared(desc, ptr, sh_len, HDR_SHARE_DEFER | HDR_REVERSE);





	edesc->sec4_sg_bytes = sec4_sg_bytes;

	edesc->sec4_sg_bytes = sec4_sg_bytes;

	edesc->sec4_sg = (void *)(edesc + 1);

	edesc->src_nents = 0;

	edesc->src_nents = 0;





	ret = ctx_map_to_sec4_sg(desc, jrdev, state, ctx->ctx_len,

	ret = ctx_map_to_sec4_sg(desc, jrdev, state, ctx->ctx_len,
@@ -1025,7 +1023,6 @@ static int ahash_finup_ctx(struct ahash_request *req) 




	edesc->src_nents = src_nents;

	edesc->src_nents = src_nents;

	edesc->sec4_sg_bytes = sec4_sg_bytes;

	edesc->sec4_sg_bytes = sec4_sg_bytes;

	edesc->sec4_sg = (void *)(edesc + 1);





	ret = ctx_map_to_sec4_sg(desc, jrdev, state, ctx->ctx_len,

	ret = ctx_map_to_sec4_sg(desc, jrdev, state, ctx->ctx_len,

				 edesc->sec4_sg, DMA_TO_DEVICE);

				 edesc->sec4_sg, DMA_TO_DEVICE);
@@ -1106,7 +1103,7 @@ static int ahash_digest(struct ahash_request *req) 
		dev_err(jrdev, "could not allocate extended descriptor\n");

		dev_err(jrdev, "could not allocate extended descriptor\n");

		return -ENOMEM;

		return -ENOMEM;

	}

	}

	edesc->sec4_sg = (void *)(edesc + 1);



	edesc->sec4_sg_bytes = sec4_sg_bytes;

	edesc->sec4_sg_bytes = sec4_sg_bytes;

	edesc->src_nents = src_nents;

	edesc->src_nents = src_nents;
@@ -1264,7 +1261,6 @@ static int ahash_update_no_ctx(struct ahash_request *req) 




		edesc->src_nents = src_nents;

		edesc->src_nents = src_nents;

		edesc->sec4_sg_bytes = sec4_sg_bytes;

		edesc->sec4_sg_bytes = sec4_sg_bytes;

		edesc->sec4_sg = (void *)(edesc + 1);

		edesc->dst_dma = 0;

		edesc->dst_dma = 0;





		state->buf_dma = buf_map_to_sec4_sg(jrdev, edesc->sec4_sg,

		state->buf_dma = buf_map_to_sec4_sg(jrdev, edesc->sec4_sg,
@@ -1375,7 +1371,6 @@ static int ahash_finup_no_ctx(struct ahash_request *req) 




	edesc->src_nents = src_nents;

	edesc->src_nents = src_nents;

	edesc->sec4_sg_bytes = sec4_sg_bytes;

	edesc->sec4_sg_bytes = sec4_sg_bytes;

	edesc->sec4_sg = (void *)(edesc + 1);





	state->buf_dma = try_buf_map_to_sec4_sg(jrdev, edesc->sec4_sg, buf,

	state->buf_dma = try_buf_map_to_sec4_sg(jrdev, edesc->sec4_sg, buf,

						state->buf_dma, buflen,

						state->buf_dma, buflen,
@@ -1470,7 +1465,6 @@ static int ahash_update_first(struct ahash_request *req) 




		edesc->src_nents = src_nents;

		edesc->src_nents = src_nents;

		edesc->sec4_sg_bytes = sec4_sg_bytes;

		edesc->sec4_sg_bytes = sec4_sg_bytes;

		edesc->sec4_sg = (void *)(edesc + 1);

		edesc->dst_dma = 0;

		edesc->dst_dma = 0;





		if (src_nents > 1) {

		if (src_nents > 1) {