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

Commit 8a82451b authored by Sascha Hauer's avatar Sascha Hauer Committed by Herbert Xu
Browse files

crypto: caam - print messages in caam_dump_sg at debug level 



caam_dump_sg() is only compiled in when DEBUG is defined, hence the
messages are debug messages. Remove the @level argument from
caam_dump_sg() and print all messages at debug level.

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

drivers/crypto/caam/caamalg.c

+4 −4
Original line number Diff line number Diff line
@@ -1001,7 +1001,7 @@ static void skcipher_encrypt_done(struct device *jrdev, u32 *desc, u32 err, 
				     DUMP_PREFIX_ADDRESS, 16, 4, req->iv,

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



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

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

		     DUMP_PREFIX_ADDRESS, 16, 4, req->dst,

		     edesc->dst_nents > 1 ? 100 : req->cryptlen, 1);
@@ -1028,7 +1028,7 @@ static void skcipher_decrypt_done(struct device *jrdev, u32 *desc, u32 err, 


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

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

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

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

		     DUMP_PREFIX_ADDRESS, 16, 4, req->dst,

		     edesc->dst_nents > 1 ? 100 : req->cryptlen, 1);
@@ -1236,7 +1236,7 @@ static void init_skcipher_job(struct skcipher_request *req, 
	dev_dbg(jrdev, "asked=%d, cryptlen%d\n",

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



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

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

		     DUMP_PREFIX_ADDRESS, 16, 4, req->src,

		     edesc->src_nents > 1 ? 100 : req->cryptlen, 1);
@@ -1606,7 +1606,7 @@ static int aead_decrypt(struct aead_request *req) 
	u32 *desc;

	int ret = 0;



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

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

		     DUMP_PREFIX_ADDRESS, 16, 4, req->src,

		     req->assoclen + req->cryptlen, 1);

drivers/crypto/caam/caamalg_qi.c

+1 −1
Original line number Diff line number Diff line
@@ -1200,7 +1200,7 @@ static void skcipher_done(struct caam_drv_req *drv_req, u32 status) 
	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__)": ",

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

		     DUMP_PREFIX_ADDRESS, 16, 4, req->dst,

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

drivers/crypto/caam/caamalg_qi2.c

+2 −2
Original line number Diff line number Diff line
@@ -1366,7 +1366,7 @@ static void skcipher_encrypt_done(void *cbk_ctx, u32 status) 
	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_DEBUG, "dst    @" __stringify(__LINE__)": ",

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

		     DUMP_PREFIX_ADDRESS, 16, 4, req->dst,

		     edesc->dst_nents > 1 ? 100 : req->cryptlen, 1);
@@ -1404,7 +1404,7 @@ static void skcipher_decrypt_done(void *cbk_ctx, u32 status) 
	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_DEBUG, "dst    @" __stringify(__LINE__)": ",

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

		     DUMP_PREFIX_ADDRESS, 16, 4, req->dst,

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

drivers/crypto/caam/error.c

+4 −4
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#ifdef DEBUG

#include <linux/highmem.h>



void caam_dump_sg(const char *level, const char *prefix_str, int prefix_type,

void caam_dump_sg(const char *prefix_str, int prefix_type,

		  int rowsize, int groupsize, struct scatterlist *sg,

		  size_t tlen, bool ascii)

{
@@ -35,7 +35,7 @@ void caam_dump_sg(const char *level, const char *prefix_str, int prefix_type, 


		buf = it_page + it->offset;

		len = min_t(size_t, tlen, it->length);

		print_hex_dump(level, prefix_str, prefix_type, rowsize,

		print_hex_dump_debug(prefix_str, prefix_type, rowsize,

				     groupsize, buf, len, ascii);

		tlen -= len;
@@ -43,7 +43,7 @@ void caam_dump_sg(const char *level, const char *prefix_str, int prefix_type, 
	}

}

#else

void caam_dump_sg(const char *level, const char *prefix_str, int prefix_type,

void caam_dump_sg(const char *prefix_str, int prefix_type,

		  int rowsize, int groupsize, struct scatterlist *sg,

		  size_t tlen, bool ascii)

{}

drivers/crypto/caam/error.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ void caam_strstatus(struct device *dev, u32 status, bool qi_v2); 
#define caam_jr_strstatus(jrdev, status) caam_strstatus(jrdev, status, false)

#define caam_qi2_strstatus(qidev, status) caam_strstatus(qidev, status, true)



void caam_dump_sg(const char *level, const char *prefix_str, int prefix_type,

void caam_dump_sg(const char *prefix_str, int prefix_type,

		  int rowsize, int groupsize, struct scatterlist *sg,

		  size_t tlen, bool ascii);