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

staging: ccree: fold common code into service func 



Fold common code in hash call into service functions.

Signed-off-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0d207bd4

drivers/staging/ccree/ssi_hash.c

+116 −223
Original line number Diff line number Diff line
@@ -319,6 +319,84 @@ static void cc_hash_complete(struct device *dev, void *cc_req, int err) 
	req->base.complete(&req->base, err);

}



static int cc_fin_result(struct cc_hw_desc *desc, struct ahash_request *req,

			 int idx)

{

	struct ahash_req_ctx *state = ahash_request_ctx(req);

	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);

	struct cc_hash_ctx *ctx = crypto_ahash_ctx(tfm);

	u32 digestsize = crypto_ahash_digestsize(tfm);



	/* Get final MAC result */

	hw_desc_init(&desc[idx]);

	set_cipher_mode(&desc[idx], ctx->hw_mode);

	/* TODO */

	set_dout_dlli(&desc[idx], state->digest_result_dma_addr, digestsize,

		      NS_BIT, 1);

	set_queue_last_ind(&desc[idx]);

	set_flow_mode(&desc[idx], S_HASH_to_DOUT);

	set_setup_mode(&desc[idx], SETUP_WRITE_STATE0);

	set_cipher_config1(&desc[idx], HASH_PADDING_DISABLED);

	cc_set_endianity(ctx->hash_mode, &desc[idx]);

	idx++;



	return idx;

}



static int cc_fin_hmac(struct cc_hw_desc *desc, struct ahash_request *req,

		       int idx)

{

	struct ahash_req_ctx *state = ahash_request_ctx(req);

	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);

	struct cc_hash_ctx *ctx = crypto_ahash_ctx(tfm);

	u32 digestsize = crypto_ahash_digestsize(tfm);



	/* store the hash digest result in the context */

	hw_desc_init(&desc[idx]);

	set_cipher_mode(&desc[idx], ctx->hw_mode);

	set_dout_dlli(&desc[idx], state->digest_buff_dma_addr, digestsize,

		      NS_BIT, 0);

	set_flow_mode(&desc[idx], S_HASH_to_DOUT);

	cc_set_endianity(ctx->hash_mode, &desc[idx]);

	set_setup_mode(&desc[idx], SETUP_WRITE_STATE0);

	idx++;



	/* Loading hash opad xor key state */

	hw_desc_init(&desc[idx]);

	set_cipher_mode(&desc[idx], ctx->hw_mode);

	set_din_type(&desc[idx], DMA_DLLI, state->opad_digest_dma_addr,

		     ctx->inter_digestsize, NS_BIT);

	set_flow_mode(&desc[idx], S_DIN_to_HASH);

	set_setup_mode(&desc[idx], SETUP_LOAD_STATE0);

	idx++;



	/* Load the hash current length */

	hw_desc_init(&desc[idx]);

	set_cipher_mode(&desc[idx], ctx->hw_mode);

	set_din_sram(&desc[idx],

		     cc_digest_len_addr(ctx->drvdata, ctx->hash_mode),

		     HASH_LEN_SIZE);

	set_cipher_config1(&desc[idx], HASH_PADDING_ENABLED);

	set_flow_mode(&desc[idx], S_DIN_to_HASH);

	set_setup_mode(&desc[idx], SETUP_LOAD_KEY0);

	idx++;



	/* Memory Barrier: wait for IPAD/OPAD axi write to complete */

	hw_desc_init(&desc[idx]);

	set_din_no_dma(&desc[idx], 0, 0xfffff0);

	set_dout_no_dma(&desc[idx], 0, 0, 1);

	idx++;



	/* Perform HASH update */

	hw_desc_init(&desc[idx]);

	set_din_type(&desc[idx], DMA_DLLI, state->digest_buff_dma_addr,

		     digestsize, NS_BIT);

	set_flow_mode(&desc[idx], DIN_HASH);

	idx++;



	return idx;

}



static int cc_hash_digest(struct ahash_request *req)

{

	struct ahash_req_ctx *state = ahash_request_ctx(req);
@@ -414,71 +492,46 @@ static int cc_hash_digest(struct ahash_request *req) 
		set_cipher_do(&desc[idx], DO_PAD);

		idx++;



		/* store the hash digest result in the context */

		hw_desc_init(&desc[idx]);

		set_cipher_mode(&desc[idx], ctx->hw_mode);

		set_dout_dlli(&desc[idx], state->digest_buff_dma_addr,

			      digestsize, NS_BIT, 0);

		set_flow_mode(&desc[idx], S_HASH_to_DOUT);

		cc_set_endianity(ctx->hash_mode, &desc[idx]);

		set_setup_mode(&desc[idx], SETUP_WRITE_STATE0);

		idx++;

		idx = cc_fin_hmac(desc, req, idx);

	}



		/* Loading hash opad xor key state */

	idx = cc_fin_result(desc, req, idx);



	rc = cc_send_request(ctx->drvdata, &cc_req, desc, idx, &req->base);

	if (rc != -EINPROGRESS && rc != -EBUSY) {

		dev_err(dev, "send_request() failed (rc=%d)\n", rc);

		cc_unmap_hash_request(dev, state, src, true);

		cc_unmap_result(dev, state, digestsize, result);

		cc_unmap_req(dev, state, ctx);

	}

	return rc;

}



static int cc_restore_hash(struct cc_hw_desc *desc, struct cc_hash_ctx *ctx,

			   struct ahash_req_ctx *state, int idx)

{

	/* Restore hash digest */

	hw_desc_init(&desc[idx]);

	set_cipher_mode(&desc[idx], ctx->hw_mode);

		set_din_type(&desc[idx], DMA_DLLI, state->opad_digest_dma_addr,

	set_din_type(&desc[idx], DMA_DLLI, state->digest_buff_dma_addr,

		     ctx->inter_digestsize, NS_BIT);

	set_flow_mode(&desc[idx], S_DIN_to_HASH);

	set_setup_mode(&desc[idx], SETUP_LOAD_STATE0);

	idx++;



		/* Load the hash current length */

	/* Restore hash current length */

	hw_desc_init(&desc[idx]);

	set_cipher_mode(&desc[idx], ctx->hw_mode);

		set_din_sram(&desc[idx],

			     cc_digest_len_addr(ctx->drvdata, ctx->hash_mode),

			     HASH_LEN_SIZE);

		set_cipher_config1(&desc[idx], HASH_PADDING_ENABLED);

	set_cipher_config1(&desc[idx], HASH_PADDING_DISABLED);

	set_din_type(&desc[idx], DMA_DLLI, state->digest_bytes_len_dma_addr,

		     HASH_LEN_SIZE, NS_BIT);

	set_flow_mode(&desc[idx], S_DIN_to_HASH);

	set_setup_mode(&desc[idx], SETUP_LOAD_KEY0);

	idx++;



		/* Memory Barrier: wait for IPAD/OPAD axi write to complete */

		hw_desc_init(&desc[idx]);

		set_din_no_dma(&desc[idx], 0, 0xfffff0);

		set_dout_no_dma(&desc[idx], 0, 0, 1);

		idx++;



		/* Perform HASH update */

		hw_desc_init(&desc[idx]);

		set_din_type(&desc[idx], DMA_DLLI, state->digest_buff_dma_addr,

			     digestsize, NS_BIT);

		set_flow_mode(&desc[idx], DIN_HASH);

		idx++;

	}



	/* Get final MAC result */

	hw_desc_init(&desc[idx]);

	set_cipher_mode(&desc[idx], ctx->hw_mode);

	/* TODO */

	set_dout_dlli(&desc[idx], state->digest_result_dma_addr, digestsize,

		      NS_BIT, 1);

	set_queue_last_ind(&desc[idx]);

	set_flow_mode(&desc[idx], S_HASH_to_DOUT);

	set_setup_mode(&desc[idx], SETUP_WRITE_STATE0);

	set_cipher_config1(&desc[idx], HASH_PADDING_DISABLED);

	cc_set_endianity(ctx->hash_mode, &desc[idx]);

	idx++;

	cc_set_desc(state, ctx, DIN_HASH, desc, false, &idx);



	rc = cc_send_request(ctx->drvdata, &cc_req, desc, idx, &req->base);

	if (rc != -EINPROGRESS && rc != -EBUSY) {

		dev_err(dev, "send_request() failed (rc=%d)\n", rc);

		cc_unmap_hash_request(dev, state, src, true);

		cc_unmap_result(dev, state, digestsize, result);

		cc_unmap_req(dev, state, ctx);

	}

	return rc;

	return idx;

}



static int cc_hash_update(struct ahash_request *req)
@@ -527,24 +580,7 @@ static int cc_hash_update(struct ahash_request *req) 
	cc_req.user_cb = cc_update_complete;

	cc_req.user_arg = req;



	/* Restore hash digest */

	hw_desc_init(&desc[idx]);

	set_cipher_mode(&desc[idx], ctx->hw_mode);

	set_din_type(&desc[idx], DMA_DLLI, state->digest_buff_dma_addr,

		     ctx->inter_digestsize, NS_BIT);

	set_flow_mode(&desc[idx], S_DIN_to_HASH);

	set_setup_mode(&desc[idx], SETUP_LOAD_STATE0);

	idx++;

	/* Restore hash current length */

	hw_desc_init(&desc[idx]);

	set_cipher_mode(&desc[idx], ctx->hw_mode);

	set_din_type(&desc[idx], DMA_DLLI, state->digest_bytes_len_dma_addr,

		     HASH_LEN_SIZE, NS_BIT);

	set_flow_mode(&desc[idx], S_DIN_to_HASH);

	set_setup_mode(&desc[idx], SETUP_LOAD_KEY0);

	idx++;



	cc_set_desc(state, ctx, DIN_HASH, desc, false, &idx);

	idx = cc_restore_hash(desc, ctx, state, idx);



	/* store the hash digest result in context */

	hw_desc_init(&desc[idx]);
@@ -616,84 +652,12 @@ static int cc_hash_finup(struct ahash_request *req) 
	cc_req.user_cb = cc_hash_complete;

	cc_req.user_arg = req;



	/* Restore hash digest */

	hw_desc_init(&desc[idx]);

	set_cipher_mode(&desc[idx], ctx->hw_mode);

	set_din_type(&desc[idx], DMA_DLLI, state->digest_buff_dma_addr,

		     ctx->inter_digestsize, NS_BIT);

	set_flow_mode(&desc[idx], S_DIN_to_HASH);

	set_setup_mode(&desc[idx], SETUP_LOAD_STATE0);

	idx++;



	/* Restore hash current length */

	hw_desc_init(&desc[idx]);

	set_cipher_mode(&desc[idx], ctx->hw_mode);

	set_cipher_config1(&desc[idx], HASH_PADDING_ENABLED);

	set_din_type(&desc[idx], DMA_DLLI, state->digest_bytes_len_dma_addr,

		     HASH_LEN_SIZE, NS_BIT);

	set_flow_mode(&desc[idx], S_DIN_to_HASH);

	set_setup_mode(&desc[idx], SETUP_LOAD_KEY0);

	idx++;



	cc_set_desc(state, ctx, DIN_HASH, desc, false, &idx);



	if (is_hmac) {

		/* Store the hash digest result in the context */

		hw_desc_init(&desc[idx]);

		set_cipher_mode(&desc[idx], ctx->hw_mode);

		set_dout_dlli(&desc[idx], state->digest_buff_dma_addr,

			      digestsize, NS_BIT, 0);

		cc_set_endianity(ctx->hash_mode, &desc[idx]);

		set_flow_mode(&desc[idx], S_HASH_to_DOUT);

		set_setup_mode(&desc[idx], SETUP_WRITE_STATE0);

		idx++;



		/* Loading hash OPAD xor key state */

		hw_desc_init(&desc[idx]);

		set_cipher_mode(&desc[idx], ctx->hw_mode);

		set_din_type(&desc[idx], DMA_DLLI, state->opad_digest_dma_addr,

			     ctx->inter_digestsize, NS_BIT);

		set_flow_mode(&desc[idx], S_DIN_to_HASH);

		set_setup_mode(&desc[idx], SETUP_LOAD_STATE0);

		idx++;



		/* Load the hash current length */

		hw_desc_init(&desc[idx]);

		set_cipher_mode(&desc[idx], ctx->hw_mode);

		set_din_sram(&desc[idx],

			     cc_digest_len_addr(ctx->drvdata, ctx->hash_mode),

			     HASH_LEN_SIZE);

		set_cipher_config1(&desc[idx], HASH_PADDING_ENABLED);

		set_flow_mode(&desc[idx], S_DIN_to_HASH);

		set_setup_mode(&desc[idx], SETUP_LOAD_KEY0);

		idx++;



		/* Memory Barrier: wait for IPAD/OPAD axi write to complete */

		hw_desc_init(&desc[idx]);

		set_din_no_dma(&desc[idx], 0, 0xfffff0);

		set_dout_no_dma(&desc[idx], 0, 0, 1);

		idx++;

	idx = cc_restore_hash(desc, ctx, state, idx);



		/* Perform HASH update on last digest */

		hw_desc_init(&desc[idx]);

		set_din_type(&desc[idx], DMA_DLLI, state->digest_buff_dma_addr,

			     digestsize, NS_BIT);

		set_flow_mode(&desc[idx], DIN_HASH);

		idx++;

	}

	if (is_hmac)

		idx = cc_fin_hmac(desc, req, idx);



	/* Get final MAC result */

	hw_desc_init(&desc[idx]);

	/* TODO */

	set_dout_dlli(&desc[idx], state->digest_result_dma_addr, digestsize,

		      NS_BIT, 1);

	set_queue_last_ind(&desc[idx]);

	set_flow_mode(&desc[idx], S_HASH_to_DOUT);

	set_cipher_config1(&desc[idx], HASH_PADDING_DISABLED);

	set_setup_mode(&desc[idx], SETUP_WRITE_STATE0);

	cc_set_endianity(ctx->hash_mode, &desc[idx]);

	set_cipher_mode(&desc[idx], ctx->hw_mode);

	idx++;

	idx = cc_fin_result(desc, req, idx);



	rc = cc_send_request(ctx->drvdata, &cc_req, desc, idx, &req->base);

	if (rc != -EINPROGRESS && rc != -EBUSY) {
@@ -748,26 +712,7 @@ static int cc_hash_final(struct ahash_request *req) 
	cc_req.user_cb = cc_hash_complete;

	cc_req.user_arg = req;



	/* Restore hash digest */

	hw_desc_init(&desc[idx]);

	set_cipher_mode(&desc[idx], ctx->hw_mode);

	set_din_type(&desc[idx], DMA_DLLI, state->digest_buff_dma_addr,

		     ctx->inter_digestsize, NS_BIT);

	set_flow_mode(&desc[idx], S_DIN_to_HASH);

	set_setup_mode(&desc[idx], SETUP_LOAD_STATE0);

	idx++;



	/* Restore hash current length */

	hw_desc_init(&desc[idx]);

	set_cipher_mode(&desc[idx], ctx->hw_mode);

	set_cipher_config1(&desc[idx], HASH_PADDING_DISABLED);

	set_din_type(&desc[idx], DMA_DLLI, state->digest_bytes_len_dma_addr,

		     HASH_LEN_SIZE, NS_BIT);

	set_flow_mode(&desc[idx], S_DIN_to_HASH);

	set_setup_mode(&desc[idx], SETUP_LOAD_KEY0);

	idx++;



	cc_set_desc(state, ctx, DIN_HASH, desc, false, &idx);

	idx = cc_restore_hash(desc, ctx, state, idx);



	/* "DO-PAD" must be enabled only when writing current length to HW */

	hw_desc_init(&desc[idx]);
@@ -779,62 +724,10 @@ static int cc_hash_final(struct ahash_request *req) 
	set_flow_mode(&desc[idx], S_HASH_to_DOUT);

	idx++;



	if (is_hmac) {

		/* Store the hash digest result in the context */

		hw_desc_init(&desc[idx]);

		set_cipher_mode(&desc[idx], ctx->hw_mode);

		set_dout_dlli(&desc[idx], state->digest_buff_dma_addr,

			      digestsize, NS_BIT, 0);

		cc_set_endianity(ctx->hash_mode, &desc[idx]);

		set_flow_mode(&desc[idx], S_HASH_to_DOUT);

		set_setup_mode(&desc[idx], SETUP_WRITE_STATE0);

		idx++;



		/* Loading hash OPAD xor key state */

		hw_desc_init(&desc[idx]);

		set_cipher_mode(&desc[idx], ctx->hw_mode);

		set_din_type(&desc[idx], DMA_DLLI, state->opad_digest_dma_addr,

			     ctx->inter_digestsize, NS_BIT);

		set_flow_mode(&desc[idx], S_DIN_to_HASH);

		set_setup_mode(&desc[idx], SETUP_LOAD_STATE0);

		idx++;



		/* Load the hash current length */

		hw_desc_init(&desc[idx]);

		set_cipher_mode(&desc[idx], ctx->hw_mode);

		set_din_sram(&desc[idx],

			     cc_digest_len_addr(ctx->drvdata, ctx->hash_mode),

			     HASH_LEN_SIZE);

		set_cipher_config1(&desc[idx], HASH_PADDING_ENABLED);

		set_flow_mode(&desc[idx], S_DIN_to_HASH);

		set_setup_mode(&desc[idx], SETUP_LOAD_KEY0);

		idx++;



		/* Memory Barrier: wait for IPAD/OPAD axi write to complete */

		hw_desc_init(&desc[idx]);

		set_din_no_dma(&desc[idx], 0, 0xfffff0);

		set_dout_no_dma(&desc[idx], 0, 0, 1);

		idx++;



		/* Perform HASH update on last digest */

		hw_desc_init(&desc[idx]);

		set_din_type(&desc[idx], DMA_DLLI, state->digest_buff_dma_addr,

			     digestsize, NS_BIT);

		set_flow_mode(&desc[idx], DIN_HASH);

		idx++;

	}

	if (is_hmac)

		idx = cc_fin_hmac(desc, req, idx);



	/* Get final MAC result */

	hw_desc_init(&desc[idx]);

	set_dout_dlli(&desc[idx], state->digest_result_dma_addr, digestsize,

		      NS_BIT, 1);

	set_queue_last_ind(&desc[idx]);

	set_flow_mode(&desc[idx], S_HASH_to_DOUT);

	set_cipher_config1(&desc[idx], HASH_PADDING_DISABLED);

	set_setup_mode(&desc[idx], SETUP_WRITE_STATE0);

	cc_set_endianity(ctx->hash_mode, &desc[idx]);

	set_cipher_mode(&desc[idx], ctx->hw_mode);

	idx++;

	idx = cc_fin_result(desc, req, idx);



	rc = cc_send_request(ctx->drvdata, &cc_req, desc, idx, &req->base);

	if (rc != -EINPROGRESS && rc != -EBUSY) {