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: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index 1598ce7b6cf1a697301086793be02737c5b3e658..1efa6f5b62cf5aa698e69a7c275a5e28de48dd9c 100644 (file)
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -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);
 

diff --git a/drivers/crypto/caam/caamalg_qi.c b/drivers/crypto/caam/caamalg_qi.c
index 742b111e3c6e6b11a9fef4a8132b0fe83e52a74f..490a2bbdbb932645431f41fc5248bc17ec45f2a6 100644 (file)
--- a/drivers/crypto/caam/caamalg_qi.c
+++ b/drivers/crypto/caam/caamalg_qi.c
@@ -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);
 

diff --git a/drivers/crypto/caam/caamalg_qi2.c b/drivers/crypto/caam/caamalg_qi2.c
index c5d869ea95c5225343a9045bea09bedb2de0602d..2621d657048a351f4031e151a0f8672bfe3eaeeb 100644 (file)
--- a/drivers/crypto/caam/caamalg_qi2.c
+++ b/drivers/crypto/caam/caamalg_qi2.c
@@ -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);
 

diff --git a/drivers/crypto/caam/error.c b/drivers/crypto/caam/error.c
index 4da844e4b61defab2ebb520ac5ab6eab602519d8..4f0d45865aa2d2cbcd91db042f8857655bf13082 100644 (file)
--- a/drivers/crypto/caam/error.c
+++ b/drivers/crypto/caam/error.c
@@ -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,15 +35,15 @@ 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,
-                              groupsize, buf, len, ascii);
+               print_hex_dump_debug(prefix_str, prefix_type, rowsize,
+                                    groupsize, buf, len, ascii);
                tlen -= len;
 
                kunmap_atomic(it_page);
        }
 }
 #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)
 {}

diff --git a/drivers/crypto/caam/error.h b/drivers/crypto/caam/error.h
index 8c6b83e02a70add5256b87dc37d3da026bac6c13..d9726e66edbf97a1339b2ee507731205c94dae17 100644 (file)
--- a/drivers/crypto/caam/error.h
+++ b/drivers/crypto/caam/error.h
@@ -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);