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

Commit 4c1ec1f9 authored by Yuan Kang's avatar Yuan Kang Committed by Herbert Xu
Browse files

crypto: caam - refactor key_gen, sg 



create separate files for split key generation and scatterlist functions.

Signed-off-by: default avatarYuan Kang <Yuan.Kang@freescale.com>
Signed-off-by: default avatarKim Phillips <kim.phillips@freescale.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 8009a383

drivers/crypto/caam/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ 
obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM) += caam.o

obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API) += caamalg.o



caam-objs := ctrl.o jr.o error.o
 
caam-objs := ctrl.o jr.o error.o key_gen.o

drivers/crypto/caam/caamalg.c

+8 −189
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ 
#include "desc_constr.h"

#include "jr.h"

#include "error.h"

#include "sg_link_tbl.h"

#include "key_gen.h"



/*

 * crypto alg
@@ -453,121 +455,12 @@ static int aead_setauthsize(struct crypto_aead *authenc, 
	return 0;

}



struct split_key_result {

	struct completion completion;

	int err;

};



static void split_key_done(struct device *dev, u32 *desc, u32 err,

			   void *context)

static u32 gen_split_aead_key(struct caam_ctx *ctx, const u8 *key_in,

			      u32 authkeylen)

{

	struct split_key_result *res = context;



#ifdef DEBUG

	dev_err(dev, "%s %d: err 0x%x\n", __func__, __LINE__, err);

#endif



	if (err) {

		char tmp[CAAM_ERROR_STR_MAX];



		dev_err(dev, "%08x: %s\n", err, caam_jr_strstatus(tmp, err));

	}



	res->err = err;



	complete(&res->completion);

}



/*

get a split ipad/opad key



Split key generation-----------------------------------------------



[00] 0xb0810008    jobdesc: stidx=1 share=never len=8

[01] 0x04000014        key: class2->keyreg len=20

			@0xffe01000

[03] 0x84410014  operation: cls2-op sha1 hmac init dec

[04] 0x24940000     fifold: class2 msgdata-last2 len=0 imm

[05] 0xa4000001       jump: class2 local all ->1 [06]

[06] 0x64260028    fifostr: class2 mdsplit-jdk len=40

			@0xffe04000

*/

static u32 gen_split_key(struct caam_ctx *ctx, const u8 *key_in, u32 authkeylen)

{

	struct device *jrdev = ctx->jrdev;

	u32 *desc;

	struct split_key_result result;

	dma_addr_t dma_addr_in, dma_addr_out;

	int ret = 0;



	desc = kmalloc(CAAM_CMD_SZ * 6 + CAAM_PTR_SZ * 2, GFP_KERNEL | GFP_DMA);



	init_job_desc(desc, 0);



	dma_addr_in = dma_map_single(jrdev, (void *)key_in, authkeylen,

				     DMA_TO_DEVICE);

	if (dma_mapping_error(jrdev, dma_addr_in)) {

		dev_err(jrdev, "unable to map key input memory\n");

		kfree(desc);

		return -ENOMEM;

	}

	append_key(desc, dma_addr_in, authkeylen, CLASS_2 |

		       KEY_DEST_CLASS_REG);



	/* Sets MDHA up into an HMAC-INIT */

	append_operation(desc, ctx->alg_op | OP_ALG_DECRYPT |

			     OP_ALG_AS_INIT);



	/*

	 * do a FIFO_LOAD of zero, this will trigger the internal key expansion

	   into both pads inside MDHA

	 */

	append_fifo_load_as_imm(desc, NULL, 0, LDST_CLASS_2_CCB |

				FIFOLD_TYPE_MSG | FIFOLD_TYPE_LAST2);



	/*

	 * FIFO_STORE with the explicit split-key content store

	 * (0x26 output type)

	 */

	dma_addr_out = dma_map_single(jrdev, ctx->key, ctx->split_key_pad_len,

				      DMA_FROM_DEVICE);

	if (dma_mapping_error(jrdev, dma_addr_out)) {

		dev_err(jrdev, "unable to map key output memory\n");

		kfree(desc);

		return -ENOMEM;

	}

	append_fifo_store(desc, dma_addr_out, ctx->split_key_len,

			  LDST_CLASS_2_CCB | FIFOST_TYPE_SPLIT_KEK);



#ifdef DEBUG

	print_hex_dump(KERN_ERR, "ctx.key@"xstr(__LINE__)": ",

		       DUMP_PREFIX_ADDRESS, 16, 4, key_in, authkeylen, 1);

	print_hex_dump(KERN_ERR, "jobdesc@"xstr(__LINE__)": ",

		       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);

#endif



	result.err = 0;

	init_completion(&result.completion);



	ret = caam_jr_enqueue(jrdev, desc, split_key_done, &result);

	if (!ret) {

		/* in progress */

		wait_for_completion_interruptible(&result.completion);

		ret = result.err;

#ifdef DEBUG

		print_hex_dump(KERN_ERR, "ctx.key@"xstr(__LINE__)": ",

			       DUMP_PREFIX_ADDRESS, 16, 4, ctx->key,

			       ctx->split_key_pad_len, 1);

#endif

	}



	dma_unmap_single(jrdev, dma_addr_out, ctx->split_key_pad_len,

			 DMA_FROM_DEVICE);

	dma_unmap_single(jrdev, dma_addr_in, authkeylen, DMA_TO_DEVICE);



	kfree(desc);



	return ret;

	return gen_split_key(ctx->jrdev, ctx->key, ctx->split_key_len,

			       ctx->split_key_pad_len, key_in, authkeylen,

			       ctx->alg_op);

}



static int aead_setkey(struct crypto_aead *aead,
@@ -611,7 +504,7 @@ static int aead_setkey(struct crypto_aead *aead, 
		       DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1);

#endif



	ret = gen_split_key(ctx, key, authkeylen);

	ret = gen_split_aead_key(ctx, key, authkeylen);

	if (ret) {

		goto badkey;

	}
@@ -758,14 +651,6 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher, 
	return ret;

}



struct link_tbl_entry {

	u64 ptr;

	u32 len;

	u8 reserved;

	u8 buf_pool_id;

	u16 offset;

};



/*

 * aead_edesc - s/w-extended aead descriptor

 * @assoc_nents: number of segments in associated data (SPI+Seq) scatterlist
@@ -1027,50 +912,6 @@ static void ablkcipher_decrypt_done(struct device *jrdev, u32 *desc, u32 err, 
	ablkcipher_request_complete(req, err);

}



static void sg_to_link_tbl_one(struct link_tbl_entry *link_tbl_ptr,

			       dma_addr_t dma, u32 len, u32 offset)

{

	link_tbl_ptr->ptr = dma;

	link_tbl_ptr->len = len;

	link_tbl_ptr->reserved = 0;

	link_tbl_ptr->buf_pool_id = 0;

	link_tbl_ptr->offset = offset;

#ifdef DEBUG

	print_hex_dump(KERN_ERR, "link_tbl_ptr@"xstr(__LINE__)": ",

		       DUMP_PREFIX_ADDRESS, 16, 4, link_tbl_ptr,

		       sizeof(struct link_tbl_entry), 1);

#endif

}



/*

 * convert scatterlist to h/w link table format

 * but does not have final bit; instead, returns last entry

 */

static struct link_tbl_entry *sg_to_link_tbl(struct scatterlist *sg,

					     int sg_count, struct link_tbl_entry

					     *link_tbl_ptr, u32 offset)

{

	while (sg_count) {

		sg_to_link_tbl_one(link_tbl_ptr, sg_dma_address(sg),

				   sg_dma_len(sg), offset);

		link_tbl_ptr++;

		sg = sg_next(sg);

		sg_count--;

	}

	return link_tbl_ptr - 1;

}



/*

 * convert scatterlist to h/w link table format

 * scatterlist must have been previously dma mapped

 */

static void sg_to_link_tbl_last(struct scatterlist *sg, int sg_count,

				struct link_tbl_entry *link_tbl_ptr, u32 offset)

{

	link_tbl_ptr = sg_to_link_tbl(sg, sg_count, link_tbl_ptr, offset);

	link_tbl_ptr->len |= 0x40000000;

}



/*

 * Fill in aead job descriptor

 */
@@ -1271,28 +1112,6 @@ static void init_ablkcipher_job(u32 *sh_desc, dma_addr_t ptr, 
	append_seq_out_ptr(desc, dst_dma, req->nbytes, out_options);

}



/*

 * derive number of elements in scatterlist

 */

static int sg_count(struct scatterlist *sg_list, int nbytes)

{

	struct scatterlist *sg = sg_list;

	int sg_nents = 0;



	while (nbytes > 0) {

		sg_nents++;

		nbytes -= sg->length;

		if (!sg_is_last(sg) && (sg + 1)->length == 0)

			BUG(); /* Not support chaining */

		sg = scatterwalk_sg_next(sg);

	}



	if (likely(sg_nents == 1))

		return 0;



	return sg_nents;

}



/*

 * allocate and map the aead extended descriptor

 */

drivers/crypto/caam/desc.h

+10 −0
Original line number Diff line number Diff line
@@ -8,6 +8,16 @@ 
#ifndef DESC_H

#define DESC_H



struct link_tbl_entry {

	u64 ptr;

#define LINK_TBL_LEN_FIN 0x40000000

#define LINK_TBL_LEN_EXT 0x80000000

	u32 len;

	u8 reserved;

	u8 buf_pool_id;

	u16 offset;

};



/* Max size of any CAAM descriptor in 32-bit words, inclusive of header */

#define MAX_CAAM_DESCSIZE	64

drivers/crypto/caam/key_gen.c

0 → 100644
+122 −0
Original line number Diff line number Diff line 
/*

 * CAAM/SEC 4.x functions for handling key-generation jobs

 *

 * Copyright 2008-2011 Freescale Semiconductor, Inc.

 *

 */

#include "compat.h"

#include "jr.h"

#include "error.h"

#include "desc_constr.h"

#include "key_gen.h"



void split_key_done(struct device *dev, u32 *desc, u32 err,

			   void *context)

{

	struct split_key_result *res = context;



#ifdef DEBUG

	dev_err(dev, "%s %d: err 0x%x\n", __func__, __LINE__, err);

#endif



	if (err) {

		char tmp[CAAM_ERROR_STR_MAX];



		dev_err(dev, "%08x: %s\n", err, caam_jr_strstatus(tmp, err));

	}



	res->err = err;



	complete(&res->completion);

}

EXPORT_SYMBOL(split_key_done);

/*

get a split ipad/opad key



Split key generation-----------------------------------------------



[00] 0xb0810008    jobdesc: stidx=1 share=never len=8

[01] 0x04000014        key: class2->keyreg len=20

			@0xffe01000

[03] 0x84410014  operation: cls2-op sha1 hmac init dec

[04] 0x24940000     fifold: class2 msgdata-last2 len=0 imm

[05] 0xa4000001       jump: class2 local all ->1 [06]

[06] 0x64260028    fifostr: class2 mdsplit-jdk len=40

			@0xffe04000

*/

u32 gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len,

		  int split_key_pad_len, const u8 *key_in, u32 keylen,

		  u32 alg_op)

{

	u32 *desc;

	struct split_key_result result;

	dma_addr_t dma_addr_in, dma_addr_out;

	int ret = 0;



	desc = kmalloc(CAAM_CMD_SZ * 6 + CAAM_PTR_SZ * 2, GFP_KERNEL | GFP_DMA);



	init_job_desc(desc, 0);



	dma_addr_in = dma_map_single(jrdev, (void *)key_in, keylen,

				     DMA_TO_DEVICE);

	if (dma_mapping_error(jrdev, dma_addr_in)) {

		dev_err(jrdev, "unable to map key input memory\n");

		kfree(desc);

		return -ENOMEM;

	}

	append_key(desc, dma_addr_in, keylen, CLASS_2 | KEY_DEST_CLASS_REG);



	/* Sets MDHA up into an HMAC-INIT */

	append_operation(desc, alg_op | OP_ALG_DECRYPT | OP_ALG_AS_INIT);



	/*

	 * do a FIFO_LOAD of zero, this will trigger the internal key expansion

	 * into both pads inside MDHA

	 */

	append_fifo_load_as_imm(desc, NULL, 0, LDST_CLASS_2_CCB |

				FIFOLD_TYPE_MSG | FIFOLD_TYPE_LAST2);



	/*

	 * FIFO_STORE with the explicit split-key content store

	 * (0x26 output type)

	 */

	dma_addr_out = dma_map_single(jrdev, key_out, split_key_pad_len,

				      DMA_FROM_DEVICE);

	if (dma_mapping_error(jrdev, dma_addr_out)) {

		dev_err(jrdev, "unable to map key output memory\n");

		kfree(desc);

		return -ENOMEM;

	}

	append_fifo_store(desc, dma_addr_out, split_key_len,

			  LDST_CLASS_2_CCB | FIFOST_TYPE_SPLIT_KEK);



#ifdef DEBUG

	print_hex_dump(KERN_ERR, "ctx.key@"xstr(__LINE__)": ",

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

	print_hex_dump(KERN_ERR, "jobdesc@"xstr(__LINE__)": ",

		       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);

#endif



	result.err = 0;

	init_completion(&result.completion);



	ret = caam_jr_enqueue(jrdev, desc, split_key_done, &result);

	if (!ret) {

		/* in progress */

		wait_for_completion_interruptible(&result.completion);

		ret = result.err;

#ifdef DEBUG

		print_hex_dump(KERN_ERR, "ctx.key@"xstr(__LINE__)": ",

			       DUMP_PREFIX_ADDRESS, 16, 4, key_out,

			       split_key_pad_len, 1);

#endif

	}



	dma_unmap_single(jrdev, dma_addr_out, split_key_pad_len,

			 DMA_FROM_DEVICE);

	dma_unmap_single(jrdev, dma_addr_in, keylen, DMA_TO_DEVICE);



	kfree(desc);



	return ret;

}

drivers/crypto/caam/key_gen.h

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/*

 * CAAM/SEC 4.x definitions for handling key-generation jobs

 *

 * Copyright 2008-2011 Freescale Semiconductor, Inc.

 *

 */



struct split_key_result {

	struct completion completion;

	int err;

};



void split_key_done(struct device *dev, u32 *desc, u32 err, void *context);



u32 gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len,

		    int split_key_pad_len, const u8 *key_in, u32 keylen,

		    u32 alg_op);