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

Commit 2b22f6c5 authored by Catalin Vasile's avatar Catalin Vasile Committed by Herbert Xu
Browse files

crypto: caam - add support for ctr(aes) 



Add support for AES working in Counter Mode

Signed-off-by: default avatarCatalin Vasile <catalin.vasile@freescale.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 5d0429a3

drivers/crypto/caam/caamalg.c

+35 −5
Original line number Diff line number Diff line
@@ -1740,11 +1740,21 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher, 
	int ret = 0;

	u32 *key_jump_cmd;

	u32 *desc;

	u32 ctx1_iv_off = 0;

	const bool ctr_mode = ((ctx->class1_alg_type & OP_ALG_AAI_MASK) ==

			       OP_ALG_AAI_CTR_MOD128);



#ifdef DEBUG

	print_hex_dump(KERN_ERR, "key in @"__stringify(__LINE__)": ",

		       DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1);

#endif

	/*

	 * AES-CTR needs to load IV in CONTEXT1 reg

	 * at an offset of 128bits (16bytes)

	 * CONTEXT1[255:128] = IV

	 */

	if (ctr_mode)

		ctx1_iv_off = 16;



	memcpy(ctx->key, key, keylen);

	ctx->key_dma = dma_map_single(jrdev, ctx->key, keylen,
@@ -1770,8 +1780,8 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher, 
	set_jump_tgt_here(desc, key_jump_cmd);



	/* Load iv */

	append_cmd(desc, CMD_SEQ_LOAD | LDST_SRCDST_BYTE_CONTEXT |

		   LDST_CLASS_1_CCB | tfm->ivsize);

	append_seq_load(desc, tfm->ivsize, LDST_SRCDST_BYTE_CONTEXT |

			LDST_CLASS_1_CCB | (ctx1_iv_off << LDST_OFFSET_SHIFT));



	/* Load operation */

	append_operation(desc, ctx->class1_alg_type |
@@ -1809,10 +1819,14 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher, 
	set_jump_tgt_here(desc, key_jump_cmd);



	/* load IV */

	append_cmd(desc, CMD_SEQ_LOAD | LDST_SRCDST_BYTE_CONTEXT |

		   LDST_CLASS_1_CCB | tfm->ivsize);

	append_seq_load(desc, tfm->ivsize, LDST_SRCDST_BYTE_CONTEXT |

			LDST_CLASS_1_CCB | (ctx1_iv_off << LDST_OFFSET_SHIFT));



	/* Choose operation */

	if (ctr_mode)

		append_operation(desc, ctx->class1_alg_type |

				 OP_ALG_AS_INITFINAL | OP_ALG_DECRYPT);

	else

		append_dec_op1(desc, ctx->class1_alg_type);



	/* Perform operation */
@@ -3533,6 +3547,22 @@ static struct caam_alg_template driver_algs[] = { 
			.ivsize = DES_BLOCK_SIZE,

			},

		.class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC,

	},

	{

		.name = "ctr(aes)",

		.driver_name = "ctr-aes-caam",

		.blocksize = 1,

		.type = CRYPTO_ALG_TYPE_ABLKCIPHER,

		.template_ablkcipher = {

			.setkey = ablkcipher_setkey,

			.encrypt = ablkcipher_encrypt,

			.decrypt = ablkcipher_decrypt,

			.geniv = "chainiv",

			.min_keysize = AES_MIN_KEY_SIZE,

			.max_keysize = AES_MAX_KEY_SIZE,

			.ivsize = AES_BLOCK_SIZE,

			},

		.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CTR_MOD128,

	}

};

drivers/crypto/caam/desc_constr.h

+2 −0
Original line number Diff line number Diff line
@@ -192,6 +192,8 @@ static inline void append_##cmd(u32 *desc, unsigned int len, u32 options) \ 
	PRINT_POS; \

	append_cmd(desc, CMD_##op | len | options); \

}



APPEND_CMD_LEN(seq_load, SEQ_LOAD)

APPEND_CMD_LEN(seq_store, SEQ_STORE)

APPEND_CMD_LEN(seq_fifo_load, SEQ_FIFO_LOAD)

APPEND_CMD_LEN(seq_fifo_store, SEQ_FIFO_STORE)