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

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

staging: ccree: add IV generation support 



Add CryptoCell IV hardware generation support.

This patch adds the needed support to drive the HW but does not expose
the ability via the kernel crypto API yet.

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

drivers/staging/ccree/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_CRYPTO_DEV_CCREE) := ccree.o

ccree-y := ssi_driver.o ssi_sysfs.o ssi_buffer_mgr.o ssi_request_mgr.o ssi_cipher.o ssi_hash.o ssi_sram_mgr.o ssi_pm.o ssi_pm_ext.o
 
ccree-y := ssi_driver.o ssi_sysfs.o ssi_buffer_mgr.o ssi_request_mgr.o ssi_cipher.o ssi_hash.o ssi_ivgen.o ssi_sram_mgr.o ssi_pm.o ssi_pm_ext.o

drivers/staging/ccree/ssi_buffer_mgr.c

+2 −0
Original line number Diff line number Diff line
@@ -534,6 +534,7 @@ void ssi_buffer_mgr_unmap_blkcipher_request( 
		SSI_RESTORE_DMA_ADDR_TO_48BIT(req_ctx->gen_ctx.iv_dma_addr);

		dma_unmap_single(dev, req_ctx->gen_ctx.iv_dma_addr, 

				 ivsize, 

				 req_ctx->is_giv ? DMA_BIDIRECTIONAL :

				 DMA_TO_DEVICE);

	}

	/* Release pool */
@@ -587,6 +588,7 @@ int ssi_buffer_mgr_map_blkcipher_request( 
		req_ctx->gen_ctx.iv_dma_addr = 

			dma_map_single(dev, (void *)info, 

				       ivsize, 

				       req_ctx->is_giv ? DMA_BIDIRECTIONAL:

				       DMA_TO_DEVICE);

		if (unlikely(dma_mapping_error(dev, 

					req_ctx->gen_ctx.iv_dma_addr))) {

drivers/staging/ccree/ssi_cipher.c

+11 −0
Original line number Diff line number Diff line
@@ -819,6 +819,13 @@ static int ssi_blkcipher_process( 
			      areq,

			      desc, &seq_len);



	/* do we need to generate IV? */

	if (req_ctx->is_giv == true) {

		ssi_req.ivgen_dma_addr[0] = req_ctx->gen_ctx.iv_dma_addr;

		ssi_req.ivgen_dma_addr_len = 1;

		/* set the IV size (8/16 B long)*/

		ssi_req.ivgen_size = ivsize;

	}

	END_CYCLE_COUNT(ssi_req.op_type, STAT_PHASE_2);



	/* STAT_PHASE_3: Lock HW and push sequence */
@@ -901,6 +908,7 @@ static int ssi_sblkcipher_encrypt(struct blkcipher_desc *desc, 
	unsigned int ivsize = crypto_blkcipher_ivsize(blk_tfm);



	req_ctx->backup_info = desc->info;

	req_ctx->is_giv = false;



	return ssi_blkcipher_process(tfm, req_ctx, dst, src, nbytes, desc->info, ivsize, NULL, DRV_CRYPTO_DIRECTION_ENCRYPT);

}
@@ -916,6 +924,7 @@ static int ssi_sblkcipher_decrypt(struct blkcipher_desc *desc, 
	unsigned int ivsize = crypto_blkcipher_ivsize(blk_tfm);



	req_ctx->backup_info = desc->info;

	req_ctx->is_giv = false;



	return ssi_blkcipher_process(tfm, req_ctx, dst, src, nbytes, desc->info, ivsize, NULL, DRV_CRYPTO_DIRECTION_DECRYPT);

}
@@ -948,6 +957,7 @@ static int ssi_ablkcipher_encrypt(struct ablkcipher_request *req) 
	unsigned int ivsize = crypto_ablkcipher_ivsize(ablk_tfm);



	req_ctx->backup_info = req->info;

	req_ctx->is_giv = false;



	return ssi_blkcipher_process(tfm, req_ctx, req->dst, req->src, req->nbytes, req->info, ivsize, (void *)req, DRV_CRYPTO_DIRECTION_ENCRYPT);

}
@@ -960,6 +970,7 @@ static int ssi_ablkcipher_decrypt(struct ablkcipher_request *req) 
	unsigned int ivsize = crypto_ablkcipher_ivsize(ablk_tfm);



	req_ctx->backup_info = req->info;

	req_ctx->is_giv = false;

	return ssi_blkcipher_process(tfm, req_ctx, req->dst, req->src, req->nbytes, req->info, ivsize, (void *)req, DRV_CRYPTO_DIRECTION_DECRYPT);

}

drivers/staging/ccree/ssi_cipher.h

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ struct blkcipher_req_ctx { 
	uint32_t out_nents;

	uint32_t out_mlli_nents;

	uint8_t *backup_info; /*store iv for generated IV flow*/

	bool is_giv;

	struct mlli_params mlli_params;

};

drivers/staging/ccree/ssi_driver.c

+9 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
#include "ssi_sysfs.h"

#include "ssi_cipher.h"

#include "ssi_hash.h"

#include "ssi_ivgen.h"

#include "ssi_sram_mgr.h"

#include "ssi_pm.h"
@@ -348,6 +349,12 @@ static int init_cc_resources(struct platform_device *plat_dev) 
		goto init_cc_res_err;

	}



	rc = ssi_ivgen_init(new_drvdata);

	if (unlikely(rc != 0)) {

		SSI_LOG_ERR("ssi_ivgen_init failed\n");

		goto init_cc_res_err;

	}



	/* Allocate crypto algs */

	rc = ssi_ablkcipher_alloc(new_drvdata);

	if (unlikely(rc != 0)) {
@@ -369,6 +376,7 @@ static int init_cc_resources(struct platform_device *plat_dev) 
	if (new_drvdata != NULL) {

		ssi_hash_free(new_drvdata);

		ssi_ablkcipher_free(new_drvdata);

		ssi_ivgen_fini(new_drvdata);

		ssi_power_mgr_fini(new_drvdata);

		ssi_buffer_mgr_fini(new_drvdata);

		request_mgr_fini(new_drvdata);
@@ -410,6 +418,7 @@ static void cleanup_cc_resources(struct platform_device *plat_dev) 


        ssi_hash_free(drvdata);

        ssi_ablkcipher_free(drvdata);

	ssi_ivgen_fini(drvdata);

	ssi_power_mgr_fini(drvdata);

	ssi_buffer_mgr_fini(drvdata);

	request_mgr_fini(drvdata);