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

Commit 6e005503 authored by Sascha Hauer's avatar Sascha Hauer Committed by Herbert Xu
Browse files

crypto: caam - print debug messages at debug level 



The CAAM driver used to put its debug messages inside #ifdef DEBUG and
then prints the messages at KERN_ERR level. Replace this with proper
functions printing at KERN_DEBUG level. The #ifdef DEBUG gets
unnecessary when the right functions are used.

This replaces:

- print_hex_dump(KERN_ERR ...) inside #ifdef DEBUG with
  print_hex_dump_debug(...)
- dev_err() inside #ifdef DEBUG with dev_dbg()
- printk(KERN_ERR ...) inside #ifdef DEBUG with dev_dbg()

Some parts of the driver use these functions already, so it is only
consequent to use the debug function consistently.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 32f75e67

drivers/crypto/caam/caamalg.c

+58 −87
Original line number Diff line number Diff line
@@ -576,13 +576,11 @@ static int aead_setkey(struct crypto_aead *aead, 
	if (crypto_authenc_extractkeys(&keys, key, keylen) != 0)

		goto badkey;



#ifdef DEBUG

	printk(KERN_ERR "keylen %d enckeylen %d authkeylen %d\n",

	dev_dbg(jrdev, "keylen %d enckeylen %d authkeylen %d\n",

	       keys.authkeylen + keys.enckeylen, keys.enckeylen,

	       keys.authkeylen);

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

	print_hex_dump_debug("key in @"__stringify(__LINE__)": ",

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

#endif



	/*

	 * If DKP is supported, use it in the shared descriptor to generate
@@ -616,11 +614,10 @@ static int aead_setkey(struct crypto_aead *aead, 
	memcpy(ctx->key + ctx->adata.keylen_pad, keys.enckey, keys.enckeylen);

	dma_sync_single_for_device(jrdev, ctx->key_dma, ctx->adata.keylen_pad +

				   keys.enckeylen, ctx->dir);

#ifdef DEBUG

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



	print_hex_dump_debug("ctx.key@"__stringify(__LINE__)": ",

			     DUMP_PREFIX_ADDRESS, 16, 4, ctx->key,

			     ctx->adata.keylen_pad + keys.enckeylen, 1);

#endif



skip_split_key:

	ctx->cdata.keylen = keys.enckeylen;
@@ -671,10 +668,8 @@ static int gcm_setkey(struct crypto_aead *aead, 
	struct caam_ctx *ctx = crypto_aead_ctx(aead);

	struct device *jrdev = ctx->jrdev;



#ifdef DEBUG

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

	print_hex_dump_debug("key in @"__stringify(__LINE__)": ",

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

#endif



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

	dma_sync_single_for_device(jrdev, ctx->key_dma, keylen, ctx->dir);
@@ -692,10 +687,8 @@ static int rfc4106_setkey(struct crypto_aead *aead, 
	if (keylen < 4)

		return -EINVAL;



#ifdef DEBUG

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

	print_hex_dump_debug("key in @"__stringify(__LINE__)": ",

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

#endif



	memcpy(ctx->key, key, keylen);
@@ -718,10 +711,8 @@ static int rfc4543_setkey(struct crypto_aead *aead, 
	if (keylen < 4)

		return -EINVAL;



#ifdef DEBUG

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

	print_hex_dump_debug("key in @"__stringify(__LINE__)": ",

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

#endif



	memcpy(ctx->key, key, keylen);
@@ -750,10 +741,8 @@ static int skcipher_setkey(struct crypto_skcipher *skcipher, const u8 *key, 
			       OP_ALG_AAI_CTR_MOD128);

	const bool is_rfc3686 = alg->caam.rfc3686;



#ifdef DEBUG

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

	print_hex_dump_debug("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)
@@ -942,9 +931,7 @@ static void aead_encrypt_done(struct device *jrdev, u32 *desc, u32 err, 
	struct aead_request *req = context;

	struct aead_edesc *edesc;



#ifdef DEBUG

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

#endif

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



	edesc = container_of(desc, struct aead_edesc, hw_desc[0]);
@@ -964,9 +951,7 @@ static void aead_decrypt_done(struct device *jrdev, u32 *desc, u32 err, 
	struct aead_request *req = context;

	struct aead_edesc *edesc;



#ifdef DEBUG

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

#endif

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



	edesc = container_of(desc, struct aead_edesc, hw_desc[0]);
@@ -994,9 +979,7 @@ static void skcipher_encrypt_done(struct device *jrdev, u32 *desc, u32 err, 
	struct crypto_skcipher *skcipher = crypto_skcipher_reqtfm(req);

	int ivsize = crypto_skcipher_ivsize(skcipher);



#ifdef DEBUG

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

#endif

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



	edesc = container_of(desc, struct skcipher_edesc, hw_desc[0]);
@@ -1013,12 +996,11 @@ static void skcipher_encrypt_done(struct device *jrdev, u32 *desc, u32 err, 
		scatterwalk_map_and_copy(req->iv, req->dst, req->cryptlen -

					 ivsize, ivsize, 0);



#ifdef DEBUG

	if (ivsize)

		print_hex_dump(KERN_ERR, "dstiv  @"__stringify(__LINE__)": ",

		print_hex_dump_debug("dstiv  @"__stringify(__LINE__)": ",

				     DUMP_PREFIX_ADDRESS, 16, 4, req->iv,

				     edesc->src_nents > 1 ? 100 : ivsize, 1);

#endif



	caam_dump_sg(KERN_ERR, "dst    @" __stringify(__LINE__)": ",

		     DUMP_PREFIX_ADDRESS, 16, 4, req->dst,

		     edesc->dst_nents > 1 ? 100 : req->cryptlen, 1);
@@ -1033,12 +1015,10 @@ static void skcipher_decrypt_done(struct device *jrdev, u32 *desc, u32 err, 
{

	struct skcipher_request *req = context;

	struct skcipher_edesc *edesc;

#ifdef DEBUG

	struct crypto_skcipher *skcipher = crypto_skcipher_reqtfm(req);

	int ivsize = crypto_skcipher_ivsize(skcipher);



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

#endif

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



	edesc = container_of(desc, struct skcipher_edesc, hw_desc[0]);

	if (err)
@@ -1046,10 +1026,8 @@ static void skcipher_decrypt_done(struct device *jrdev, u32 *desc, u32 err, 


	skcipher_unmap(jrdev, edesc, req);



#ifdef DEBUG

	print_hex_dump(KERN_ERR, "dstiv  @"__stringify(__LINE__)": ",

	print_hex_dump_debug("dstiv  @"__stringify(__LINE__)": ",

			     DUMP_PREFIX_ADDRESS, 16, 4, req->iv, ivsize, 1);

#endif

	caam_dump_sg(KERN_ERR, "dst    @" __stringify(__LINE__)": ",

		     DUMP_PREFIX_ADDRESS, 16, 4, req->dst,

		     edesc->dst_nents > 1 ? 100 : req->cryptlen, 1);
@@ -1245,6 +1223,7 @@ static void init_skcipher_job(struct skcipher_request *req, 
{

	struct crypto_skcipher *skcipher = crypto_skcipher_reqtfm(req);

	struct caam_ctx *ctx = crypto_skcipher_ctx(skcipher);

	struct device *jrdev = ctx->jrdev;

	int ivsize = crypto_skcipher_ivsize(skcipher);

	u32 *desc = edesc->hw_desc;

	u32 *sh_desc;
@@ -1252,12 +1231,11 @@ static void init_skcipher_job(struct skcipher_request *req, 
	dma_addr_t src_dma, dst_dma, ptr;

	int len, sec4_sg_index = 0;



#ifdef DEBUG

	print_hex_dump(KERN_ERR, "presciv@"__stringify(__LINE__)": ",

	print_hex_dump_debug("presciv@"__stringify(__LINE__)": ",

			     DUMP_PREFIX_ADDRESS, 16, 4, req->iv, ivsize, 1);

	pr_err("asked=%d, cryptlen%d\n",

	dev_dbg(jrdev, "asked=%d, cryptlen%d\n",

	       (int)edesc->src_nents > 1 ? 100 : req->cryptlen, req->cryptlen);

#endif



	caam_dump_sg(KERN_ERR, "src    @" __stringify(__LINE__)": ",

		     DUMP_PREFIX_ADDRESS, 16, 4, req->src,

		     edesc->src_nents > 1 ? 100 : req->cryptlen, 1);
@@ -1450,11 +1428,10 @@ static int gcm_encrypt(struct aead_request *req) 


	/* Create and submit job descriptor */

	init_gcm_job(req, edesc, all_contig, true);

#ifdef DEBUG

	print_hex_dump(KERN_ERR, "aead jobdesc@"__stringify(__LINE__)": ",



	print_hex_dump_debug("aead jobdesc@"__stringify(__LINE__)": ",

			     DUMP_PREFIX_ADDRESS, 16, 4, edesc->hw_desc,

			     desc_bytes(edesc->hw_desc), 1);

#endif



	desc = edesc->hw_desc;

	ret = caam_jr_enqueue(jrdev, desc, aead_encrypt_done, req);
@@ -1560,11 +1537,10 @@ static int aead_encrypt(struct aead_request *req) 


	/* Create and submit job descriptor */

	init_authenc_job(req, edesc, all_contig, true);

#ifdef DEBUG

	print_hex_dump(KERN_ERR, "aead jobdesc@"__stringify(__LINE__)": ",



	print_hex_dump_debug("aead jobdesc@"__stringify(__LINE__)": ",

			     DUMP_PREFIX_ADDRESS, 16, 4, edesc->hw_desc,

			     desc_bytes(edesc->hw_desc), 1);

#endif



	desc = edesc->hw_desc;

	ret = caam_jr_enqueue(jrdev, desc, aead_encrypt_done, req);
@@ -1595,11 +1571,10 @@ static int gcm_decrypt(struct aead_request *req) 


	/* Create and submit job descriptor*/

	init_gcm_job(req, edesc, all_contig, false);

#ifdef DEBUG

	print_hex_dump(KERN_ERR, "aead jobdesc@"__stringify(__LINE__)": ",



	print_hex_dump_debug("aead jobdesc@"__stringify(__LINE__)": ",

			     DUMP_PREFIX_ADDRESS, 16, 4, edesc->hw_desc,

			     desc_bytes(edesc->hw_desc), 1);

#endif



	desc = edesc->hw_desc;

	ret = caam_jr_enqueue(jrdev, desc, aead_decrypt_done, req);
@@ -1643,11 +1618,10 @@ static int aead_decrypt(struct aead_request *req) 


	/* Create and submit job descriptor*/

	init_authenc_job(req, edesc, all_contig, false);

#ifdef DEBUG

	print_hex_dump(KERN_ERR, "aead jobdesc@"__stringify(__LINE__)": ",



	print_hex_dump_debug("aead jobdesc@"__stringify(__LINE__)": ",

			     DUMP_PREFIX_ADDRESS, 16, 4, edesc->hw_desc,

			     desc_bytes(edesc->hw_desc), 1);

#endif



	desc = edesc->hw_desc;

	ret = caam_jr_enqueue(jrdev, desc, aead_decrypt_done, req);
@@ -1804,11 +1778,9 @@ static struct skcipher_edesc *skcipher_edesc_alloc(struct skcipher_request *req, 


	edesc->iv_dma = iv_dma;



#ifdef DEBUG

	print_hex_dump(KERN_ERR, "skcipher sec4_sg@" __stringify(__LINE__)": ",

	print_hex_dump_debug("skcipher sec4_sg@" __stringify(__LINE__)": ",

			     DUMP_PREFIX_ADDRESS, 16, 4, edesc->sec4_sg,

			     sec4_sg_bytes, 1);

#endif



	return edesc;

}
@@ -1829,11 +1801,11 @@ static int skcipher_encrypt(struct skcipher_request *req) 


	/* Create and submit job descriptor*/

	init_skcipher_job(req, edesc, true);

#ifdef DEBUG

	print_hex_dump(KERN_ERR, "skcipher jobdesc@" __stringify(__LINE__)": ",



	print_hex_dump_debug("skcipher jobdesc@" __stringify(__LINE__)": ",

			     DUMP_PREFIX_ADDRESS, 16, 4, edesc->hw_desc,

			     desc_bytes(edesc->hw_desc), 1);

#endif



	desc = edesc->hw_desc;

	ret = caam_jr_enqueue(jrdev, desc, skcipher_encrypt_done, req);
@@ -1873,11 +1845,10 @@ static int skcipher_decrypt(struct skcipher_request *req) 
	/* Create and submit job descriptor*/

	init_skcipher_job(req, edesc, false);

	desc = edesc->hw_desc;

#ifdef DEBUG

	print_hex_dump(KERN_ERR, "skcipher jobdesc@" __stringify(__LINE__)": ",



	print_hex_dump_debug("skcipher jobdesc@" __stringify(__LINE__)": ",

			     DUMP_PREFIX_ADDRESS, 16, 4, edesc->hw_desc,

			     desc_bytes(edesc->hw_desc), 1);

#endif



	ret = caam_jr_enqueue(jrdev, desc, skcipher_decrypt_done, req);

	if (!ret) {

drivers/crypto/caam/caamalg_desc.c

+45 −71
Original line number Diff line number Diff line
@@ -115,11 +115,9 @@ void cnstr_shdsc_aead_null_encap(u32 * const desc, struct alginfo *adata, 
	append_seq_store(desc, icvsize, LDST_CLASS_2_CCB |

			 LDST_SRCDST_BYTE_CONTEXT);



#ifdef DEBUG

	print_hex_dump(KERN_ERR,

		       "aead null enc shdesc@" __stringify(__LINE__)": ",

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

#endif

	print_hex_dump_debug("aead null enc shdesc@" __stringify(__LINE__)": ",

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

			     1);

}

EXPORT_SYMBOL(cnstr_shdsc_aead_null_encap);
@@ -204,11 +202,9 @@ void cnstr_shdsc_aead_null_decap(u32 * const desc, struct alginfo *adata, 
	append_seq_fifo_load(desc, icvsize, FIFOLD_CLASS_CLASS2 |

			     FIFOLD_TYPE_LAST2 | FIFOLD_TYPE_ICV);



#ifdef DEBUG

	print_hex_dump(KERN_ERR,

		       "aead null dec shdesc@" __stringify(__LINE__)": ",

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

#endif

	print_hex_dump_debug("aead null dec shdesc@" __stringify(__LINE__)": ",

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

			     1);

}

EXPORT_SYMBOL(cnstr_shdsc_aead_null_decap);
@@ -358,10 +354,9 @@ void cnstr_shdsc_aead_encap(u32 * const desc, struct alginfo *cdata, 
	append_seq_store(desc, icvsize, LDST_CLASS_2_CCB |

			 LDST_SRCDST_BYTE_CONTEXT);



#ifdef DEBUG

	print_hex_dump(KERN_ERR, "aead enc shdesc@" __stringify(__LINE__)": ",

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

#endif

	print_hex_dump_debug("aead enc shdesc@" __stringify(__LINE__)": ",

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

			     1);

}

EXPORT_SYMBOL(cnstr_shdsc_aead_encap);
@@ -475,10 +470,9 @@ void cnstr_shdsc_aead_decap(u32 * const desc, struct alginfo *cdata, 
	append_seq_fifo_load(desc, icvsize, FIFOLD_CLASS_CLASS2 |

			     FIFOLD_TYPE_LAST2 | FIFOLD_TYPE_ICV);



#ifdef DEBUG

	print_hex_dump(KERN_ERR, "aead dec shdesc@" __stringify(__LINE__)": ",

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

#endif

	print_hex_dump_debug("aead dec shdesc@" __stringify(__LINE__)": ",

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

			     1);

}

EXPORT_SYMBOL(cnstr_shdsc_aead_decap);
@@ -613,11 +607,9 @@ void cnstr_shdsc_aead_givencap(u32 * const desc, struct alginfo *cdata, 
	append_seq_store(desc, icvsize, LDST_CLASS_2_CCB |

			 LDST_SRCDST_BYTE_CONTEXT);



#ifdef DEBUG

	print_hex_dump(KERN_ERR,

		       "aead givenc shdesc@" __stringify(__LINE__)": ",

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

#endif

	print_hex_dump_debug("aead givenc shdesc@" __stringify(__LINE__)": ",

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

			     1);

}

EXPORT_SYMBOL(cnstr_shdsc_aead_givencap);
@@ -742,10 +734,9 @@ void cnstr_shdsc_gcm_encap(u32 * const desc, struct alginfo *cdata, 
	append_seq_store(desc, icvsize, LDST_CLASS_1_CCB |

			 LDST_SRCDST_BYTE_CONTEXT);



#ifdef DEBUG

	print_hex_dump(KERN_ERR, "gcm enc shdesc@" __stringify(__LINE__)": ",

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

#endif

	print_hex_dump_debug("gcm enc shdesc@" __stringify(__LINE__)": ",

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

			     1);

}

EXPORT_SYMBOL(cnstr_shdsc_gcm_encap);
@@ -838,10 +829,9 @@ void cnstr_shdsc_gcm_decap(u32 * const desc, struct alginfo *cdata, 
	append_seq_fifo_load(desc, icvsize, FIFOLD_CLASS_CLASS1 |

			     FIFOLD_TYPE_ICV | FIFOLD_TYPE_LAST1);



#ifdef DEBUG

	print_hex_dump(KERN_ERR, "gcm dec shdesc@" __stringify(__LINE__)": ",

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

#endif

	print_hex_dump_debug("gcm dec shdesc@" __stringify(__LINE__)": ",

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

			     1);

}

EXPORT_SYMBOL(cnstr_shdsc_gcm_decap);
@@ -933,11 +923,9 @@ void cnstr_shdsc_rfc4106_encap(u32 * const desc, struct alginfo *cdata, 
	append_seq_store(desc, icvsize, LDST_CLASS_1_CCB |

			 LDST_SRCDST_BYTE_CONTEXT);



#ifdef DEBUG

	print_hex_dump(KERN_ERR,

		       "rfc4106 enc shdesc@" __stringify(__LINE__)": ",

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

#endif

	print_hex_dump_debug("rfc4106 enc shdesc@" __stringify(__LINE__)": ",

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

			     1);

}

EXPORT_SYMBOL(cnstr_shdsc_rfc4106_encap);
@@ -1030,11 +1018,9 @@ void cnstr_shdsc_rfc4106_decap(u32 * const desc, struct alginfo *cdata, 
	append_seq_fifo_load(desc, icvsize, FIFOLD_CLASS_CLASS1 |

			     FIFOLD_TYPE_ICV | FIFOLD_TYPE_LAST1);



#ifdef DEBUG

	print_hex_dump(KERN_ERR,

		       "rfc4106 dec shdesc@" __stringify(__LINE__)": ",

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

#endif

	print_hex_dump_debug("rfc4106 dec shdesc@" __stringify(__LINE__)": ",

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

			     1);

}

EXPORT_SYMBOL(cnstr_shdsc_rfc4106_decap);
@@ -1115,11 +1101,9 @@ void cnstr_shdsc_rfc4543_encap(u32 * const desc, struct alginfo *cdata, 
	append_seq_store(desc, icvsize, LDST_CLASS_1_CCB |

			 LDST_SRCDST_BYTE_CONTEXT);



#ifdef DEBUG

	print_hex_dump(KERN_ERR,

		       "rfc4543 enc shdesc@" __stringify(__LINE__)": ",

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

#endif

	print_hex_dump_debug("rfc4543 enc shdesc@" __stringify(__LINE__)": ",

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

			     1);

}

EXPORT_SYMBOL(cnstr_shdsc_rfc4543_encap);
@@ -1205,11 +1189,9 @@ void cnstr_shdsc_rfc4543_decap(u32 * const desc, struct alginfo *cdata, 
	append_seq_fifo_load(desc, icvsize, FIFOLD_CLASS_CLASS1 |

			     FIFOLD_TYPE_ICV | FIFOLD_TYPE_LAST1);



#ifdef DEBUG

	print_hex_dump(KERN_ERR,

		       "rfc4543 dec shdesc@" __stringify(__LINE__)": ",

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

#endif

	print_hex_dump_debug("rfc4543 dec shdesc@" __stringify(__LINE__)": ",

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

			     1);

}

EXPORT_SYMBOL(cnstr_shdsc_rfc4543_decap);
@@ -1416,11 +1398,9 @@ void cnstr_shdsc_skcipher_encap(u32 * const desc, struct alginfo *cdata, 
	/* Perform operation */

	skcipher_append_src_dst(desc);



#ifdef DEBUG

	print_hex_dump(KERN_ERR,

		       "skcipher enc shdesc@" __stringify(__LINE__)": ",

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

#endif

	print_hex_dump_debug("skcipher enc shdesc@" __stringify(__LINE__)": ",

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

			     1);

}

EXPORT_SYMBOL(cnstr_shdsc_skcipher_encap);
@@ -1487,11 +1467,9 @@ void cnstr_shdsc_skcipher_decap(u32 * const desc, struct alginfo *cdata, 
	/* Perform operation */

	skcipher_append_src_dst(desc);



#ifdef DEBUG

	print_hex_dump(KERN_ERR,

		       "skcipher dec shdesc@" __stringify(__LINE__)": ",

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

#endif

	print_hex_dump_debug("skcipher dec shdesc@" __stringify(__LINE__)": ",

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

			     1);

}

EXPORT_SYMBOL(cnstr_shdsc_skcipher_decap);
@@ -1538,11 +1516,9 @@ void cnstr_shdsc_xts_skcipher_encap(u32 * const desc, struct alginfo *cdata) 
	/* Perform operation */

	skcipher_append_src_dst(desc);



#ifdef DEBUG

	print_hex_dump(KERN_ERR,

		       "xts skcipher enc shdesc@" __stringify(__LINE__) ": ",

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

#endif

	print_hex_dump_debug("xts skcipher enc shdesc@" __stringify(__LINE__)

			     ": ", DUMP_PREFIX_ADDRESS, 16, 4,

			     desc, desc_bytes(desc), 1);

}

EXPORT_SYMBOL(cnstr_shdsc_xts_skcipher_encap);
@@ -1588,11 +1564,9 @@ void cnstr_shdsc_xts_skcipher_decap(u32 * const desc, struct alginfo *cdata) 
	/* Perform operation */

	skcipher_append_src_dst(desc);



#ifdef DEBUG

	print_hex_dump(KERN_ERR,

		       "xts skcipher dec shdesc@" __stringify(__LINE__) ": ",

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

#endif

	print_hex_dump_debug("xts skcipher dec shdesc@" __stringify(__LINE__)

			     ": ", DUMP_PREFIX_ADDRESS, 16, 4, desc,

			     desc_bytes(desc), 1);

}

EXPORT_SYMBOL(cnstr_shdsc_xts_skcipher_decap);

drivers/crypto/caam/caamalg_qi.c

+16 −29
Original line number Diff line number Diff line
@@ -214,13 +214,11 @@ static int aead_setkey(struct crypto_aead *aead, const u8 *key, 
	if (crypto_authenc_extractkeys(&keys, key, keylen) != 0)

		goto badkey;



#ifdef DEBUG

	dev_err(jrdev, "keylen %d enckeylen %d authkeylen %d\n",

	dev_dbg(jrdev, "keylen %d enckeylen %d authkeylen %d\n",

		keys.authkeylen + keys.enckeylen, keys.enckeylen,

		keys.authkeylen);

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

	print_hex_dump_debug("key in @" __stringify(__LINE__)": ",

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

#endif



	/*

	 * If DKP is supported, use it in the shared descriptor to generate
@@ -387,10 +385,8 @@ static int gcm_setkey(struct crypto_aead *aead, 
	struct device *jrdev = ctx->jrdev;

	int ret;



#ifdef DEBUG

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

	print_hex_dump_debug("key in @" __stringify(__LINE__)": ",

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

#endif



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

	dma_sync_single_for_device(jrdev->parent, ctx->key_dma, keylen,
@@ -487,10 +483,8 @@ static int rfc4106_setkey(struct crypto_aead *aead, 
	if (keylen < 4)

		return -EINVAL;



#ifdef DEBUG

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

	print_hex_dump_debug("key in @" __stringify(__LINE__)": ",

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

#endif



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

	/*
@@ -591,10 +585,8 @@ static int rfc4543_setkey(struct crypto_aead *aead, 
	if (keylen < 4)

		return -EINVAL;



#ifdef DEBUG

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

	print_hex_dump_debug("key in @" __stringify(__LINE__)": ",

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

#endif



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

	/*
@@ -646,10 +638,9 @@ static int skcipher_setkey(struct crypto_skcipher *skcipher, const u8 *key, 
	const bool is_rfc3686 = alg->caam.rfc3686;

	int ret = 0;



#ifdef DEBUG

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

	print_hex_dump_debug("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)
@@ -1199,23 +1190,19 @@ static void skcipher_done(struct caam_drv_req *drv_req, u32 status) 
	struct device *qidev = caam_ctx->qidev;

	int ivsize = crypto_skcipher_ivsize(skcipher);



#ifdef DEBUG

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

#endif

	dev_dbg(qidev, "%s %d: status 0x%x\n", __func__, __LINE__, status);



	edesc = container_of(drv_req, typeof(*edesc), drv_req);



	if (status)

		caam_jr_strstatus(qidev, status);



#ifdef DEBUG

	print_hex_dump(KERN_ERR, "dstiv  @" __stringify(__LINE__)": ",

	print_hex_dump_debug("dstiv  @" __stringify(__LINE__)": ",

			     DUMP_PREFIX_ADDRESS, 16, 4, req->iv,

			     edesc->src_nents > 1 ? 100 : ivsize, 1);

	caam_dump_sg(KERN_ERR, "dst    @" __stringify(__LINE__)": ",

		     DUMP_PREFIX_ADDRESS, 16, 4, req->dst,

		     edesc->dst_nents > 1 ? 100 : req->cryptlen, 1);

#endif



	skcipher_unmap(qidev, edesc, req);

drivers/crypto/caam/caamhash.c

+93 −132

File changed.

Preview size limit exceeded, changes collapsed.

drivers/crypto/caam/caamrng.c

+10 −12
Original line number Diff line number Diff line
@@ -113,10 +113,8 @@ static void rng_done(struct device *jrdev, u32 *desc, u32 err, void *context) 
	/* Buffer refilled, invalidate cache */

	dma_sync_single_for_cpu(jrdev, bd->addr, RN_BUF_SIZE, DMA_FROM_DEVICE);



#ifdef DEBUG

	print_hex_dump(KERN_ERR, "rng refreshed buf@: ",

		       DUMP_PREFIX_ADDRESS, 16, 4, bd->buf, RN_BUF_SIZE, 1);

#endif

	print_hex_dump_debug("rng refreshed buf@: ", DUMP_PREFIX_ADDRESS, 16, 4,

			     bd->buf, RN_BUF_SIZE, 1);

}



static inline int submit_job(struct caam_rng_ctx *ctx, int to_current)
@@ -209,10 +207,10 @@ static inline int rng_create_sh_desc(struct caam_rng_ctx *ctx) 
		dev_err(jrdev, "unable to map shared descriptor\n");

		return -ENOMEM;

	}

#ifdef DEBUG

	print_hex_dump(KERN_ERR, "rng shdesc@: ", DUMP_PREFIX_ADDRESS, 16, 4,



	print_hex_dump_debug("rng shdesc@: ", DUMP_PREFIX_ADDRESS, 16, 4,

			     desc, desc_bytes(desc), 1);

#endif



	return 0;

}
@@ -233,10 +231,10 @@ static inline int rng_create_job_desc(struct caam_rng_ctx *ctx, int buf_id) 
	}



	append_seq_out_ptr_intlen(desc, bd->addr, RN_BUF_SIZE, 0);

#ifdef DEBUG

	print_hex_dump(KERN_ERR, "rng job desc@: ", DUMP_PREFIX_ADDRESS, 16, 4,



	print_hex_dump_debug("rng job desc@: ", DUMP_PREFIX_ADDRESS, 16, 4,

			     desc, desc_bytes(desc), 1);

#endif



	return 0;

}