Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

[linux.git] / drivers / crypto / caam / caamhash.c

diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c
index 84573b4d6f92809d5cd98fa968f6dd1a617482d3..e732bd962e98cc715db6463c7587dbb2511707e3 100644 (file)
--- a/drivers/crypto/caam/caamhash.c
+++ b/drivers/crypto/caam/caamhash.c
@@ -72,8 +72,6 @@
 #define CAAM_MAX_HASH_DIGEST_SIZE      SHA512_DIGEST_SIZE
 
 /* length of descriptors text */
-#define DESC_JOB_IO_LEN                        (CAAM_CMD_SZ * 5 + CAAM_PTR_SZ * 3)
-
 #define DESC_AHASH_BASE                        (4 * CAAM_CMD_SZ)
 #define DESC_AHASH_UPDATE_LEN          (6 * CAAM_CMD_SZ)
 #define DESC_AHASH_UPDATE_FIRST_LEN    (DESC_AHASH_BASE + 4 * CAAM_CMD_SZ)
@@ -91,8 +89,6 @@
 
 #ifdef DEBUG
 /* for print_hex_dumps with line references */
-#define xstr(s) str(s)
-#define str(s) #s
 #define debug(format, arg...) printk(format, arg)
 #else
 #define debug(format, arg...)
@@ -331,7 +327,8 @@ static int ahash_set_sh_desc(struct crypto_ahash *ahash)
                return -ENOMEM;
        }
 #ifdef DEBUG
-       print_hex_dump(KERN_ERR, "ahash update shdesc@"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR,
+                      "ahash update shdesc@"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);
 #endif
 
@@ -349,7 +346,8 @@ static int ahash_set_sh_desc(struct crypto_ahash *ahash)
                return -ENOMEM;
        }
 #ifdef DEBUG
-       print_hex_dump(KERN_ERR, "ahash update first shdesc@"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR,
+                      "ahash update first shdesc@"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);
 #endif
 
@@ -366,7 +364,7 @@ static int ahash_set_sh_desc(struct crypto_ahash *ahash)
                return -ENOMEM;
        }
 #ifdef DEBUG
-       print_hex_dump(KERN_ERR, "ahash final shdesc@"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR, "ahash final shdesc@"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, desc,
                       desc_bytes(desc), 1);
 #endif
@@ -384,7 +382,7 @@ static int ahash_set_sh_desc(struct crypto_ahash *ahash)
                return -ENOMEM;
        }
 #ifdef DEBUG
-       print_hex_dump(KERN_ERR, "ahash finup shdesc@"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR, "ahash finup shdesc@"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, desc,
                       desc_bytes(desc), 1);
 #endif
@@ -403,7 +401,8 @@ static int ahash_set_sh_desc(struct crypto_ahash *ahash)
                return -ENOMEM;
        }
 #ifdef DEBUG
-       print_hex_dump(KERN_ERR, "ahash digest shdesc@"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR,
+                      "ahash digest shdesc@"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, desc,
                       desc_bytes(desc), 1);
 #endif
@@ -464,9 +463,9 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, const u8 *key_in,
                         LDST_SRCDST_BYTE_CONTEXT);
 
 #ifdef DEBUG
-       print_hex_dump(KERN_ERR, "key_in@"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR, "key_in@"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, key_in, *keylen, 1);
-       print_hex_dump(KERN_ERR, "jobdesc@"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);
 #endif
 
@@ -479,7 +478,8 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, const u8 *key_in,
                wait_for_completion_interruptible(&result.completion);
                ret = result.err;
 #ifdef DEBUG
-               print_hex_dump(KERN_ERR, "digested key@"xstr(__LINE__)": ",
+               print_hex_dump(KERN_ERR,
+                              "digested key@"__stringify(__LINE__)": ",
                               DUMP_PREFIX_ADDRESS, 16, 4, key_in,
                               digestsize, 1);
 #endif
@@ -530,7 +530,7 @@ static int ahash_setkey(struct crypto_ahash *ahash,
 #ifdef DEBUG
        printk(KERN_ERR "split_key_len %d split_key_pad_len %d\n",
               ctx->split_key_len, ctx->split_key_pad_len);
-       print_hex_dump(KERN_ERR, "key in @"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR, "key in @"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1);
 #endif
 
@@ -545,7 +545,7 @@ static int ahash_setkey(struct crypto_ahash *ahash,
                return -ENOMEM;
        }
 #ifdef DEBUG
-       print_hex_dump(KERN_ERR, "ctx.key@"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR, "ctx.key@"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, ctx->key,
                       ctx->split_key_pad_len, 1);
 #endif
@@ -638,11 +638,11 @@ static void ahash_done(struct device *jrdev, u32 *desc, u32 err,
        kfree(edesc);
 
 #ifdef DEBUG
-       print_hex_dump(KERN_ERR, "ctx@"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR, "ctx@"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, state->caam_ctx,
                       ctx->ctx_len, 1);
        if (req->result)
-               print_hex_dump(KERN_ERR, "result@"xstr(__LINE__)": ",
+               print_hex_dump(KERN_ERR, "result@"__stringify(__LINE__)": ",
                               DUMP_PREFIX_ADDRESS, 16, 4, req->result,
                               digestsize, 1);
 #endif
@@ -676,11 +676,11 @@ static void ahash_done_bi(struct device *jrdev, u32 *desc, u32 err,
        kfree(edesc);
 
 #ifdef DEBUG
-       print_hex_dump(KERN_ERR, "ctx@"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR, "ctx@"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, state->caam_ctx,
                       ctx->ctx_len, 1);
        if (req->result)
-               print_hex_dump(KERN_ERR, "result@"xstr(__LINE__)": ",
+               print_hex_dump(KERN_ERR, "result@"__stringify(__LINE__)": ",
                               DUMP_PREFIX_ADDRESS, 16, 4, req->result,
                               digestsize, 1);
 #endif
@@ -714,11 +714,11 @@ static void ahash_done_ctx_src(struct device *jrdev, u32 *desc, u32 err,
        kfree(edesc);
 
 #ifdef DEBUG
-       print_hex_dump(KERN_ERR, "ctx@"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR, "ctx@"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, state->caam_ctx,
                       ctx->ctx_len, 1);
        if (req->result)
-               print_hex_dump(KERN_ERR, "result@"xstr(__LINE__)": ",
+               print_hex_dump(KERN_ERR, "result@"__stringify(__LINE__)": ",
                               DUMP_PREFIX_ADDRESS, 16, 4, req->result,
                               digestsize, 1);
 #endif
@@ -752,11 +752,11 @@ static void ahash_done_ctx_dst(struct device *jrdev, u32 *desc, u32 err,
        kfree(edesc);
 
 #ifdef DEBUG
-       print_hex_dump(KERN_ERR, "ctx@"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR, "ctx@"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, state->caam_ctx,
                       ctx->ctx_len, 1);
        if (req->result)
-               print_hex_dump(KERN_ERR, "result@"xstr(__LINE__)": ",
+               print_hex_dump(KERN_ERR, "result@"__stringify(__LINE__)": ",
                               DUMP_PREFIX_ADDRESS, 16, 4, req->result,
                               digestsize, 1);
 #endif
@@ -852,7 +852,7 @@ static int ahash_update_ctx(struct ahash_request *req)
                append_seq_out_ptr(desc, state->ctx_dma, ctx->ctx_len, 0);
 
 #ifdef DEBUG
-               print_hex_dump(KERN_ERR, "jobdesc@"xstr(__LINE__)": ",
+               print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ",
                               DUMP_PREFIX_ADDRESS, 16, 4, desc,
                               desc_bytes(desc), 1);
 #endif
@@ -871,9 +871,9 @@ static int ahash_update_ctx(struct ahash_request *req)
                *next_buflen = last_buflen;
        }
 #ifdef DEBUG
-       print_hex_dump(KERN_ERR, "buf@"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR, "buf@"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, buf, *buflen, 1);
-       print_hex_dump(KERN_ERR, "next buf@"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR, "next buf@"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, next_buf,
                       *next_buflen, 1);
 #endif
@@ -937,7 +937,7 @@ static int ahash_final_ctx(struct ahash_request *req)
                                                digestsize);
 
 #ifdef DEBUG
-       print_hex_dump(KERN_ERR, "jobdesc@"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);
 #endif
 
@@ -1016,7 +1016,7 @@ static int ahash_finup_ctx(struct ahash_request *req)
                                                digestsize);
 
 #ifdef DEBUG
-       print_hex_dump(KERN_ERR, "jobdesc@"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);
 #endif
 
@@ -1086,7 +1086,7 @@ static int ahash_digest(struct ahash_request *req)
                                                digestsize);
 
 #ifdef DEBUG
-       print_hex_dump(KERN_ERR, "jobdesc@"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);
 #endif
 
@@ -1140,7 +1140,7 @@ static int ahash_final_no_ctx(struct ahash_request *req)
        edesc->src_nents = 0;
 
 #ifdef DEBUG
-       print_hex_dump(KERN_ERR, "jobdesc@"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);
 #endif
 
@@ -1228,7 +1228,7 @@ static int ahash_update_no_ctx(struct ahash_request *req)
                map_seq_out_ptr_ctx(desc, jrdev, state, ctx->ctx_len);
 
 #ifdef DEBUG
-               print_hex_dump(KERN_ERR, "jobdesc@"xstr(__LINE__)": ",
+               print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ",
                               DUMP_PREFIX_ADDRESS, 16, 4, desc,
                               desc_bytes(desc), 1);
 #endif
@@ -1250,9 +1250,9 @@ static int ahash_update_no_ctx(struct ahash_request *req)
                *next_buflen = 0;
        }
 #ifdef DEBUG
-       print_hex_dump(KERN_ERR, "buf@"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR, "buf@"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, buf, *buflen, 1);
-       print_hex_dump(KERN_ERR, "next buf@"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR, "next buf@"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, next_buf,
                       *next_buflen, 1);
 #endif
@@ -1321,7 +1321,7 @@ static int ahash_finup_no_ctx(struct ahash_request *req)
                                                digestsize);
 
 #ifdef DEBUG
-       print_hex_dump(KERN_ERR, "jobdesc@"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);
 #endif
 
@@ -1414,7 +1414,7 @@ static int ahash_update_first(struct ahash_request *req)
                map_seq_out_ptr_ctx(desc, jrdev, state, ctx->ctx_len);
 
 #ifdef DEBUG
-               print_hex_dump(KERN_ERR, "jobdesc@"xstr(__LINE__)": ",
+               print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ",
                               DUMP_PREFIX_ADDRESS, 16, 4, desc,
                               desc_bytes(desc), 1);
 #endif
@@ -1438,7 +1438,7 @@ static int ahash_update_first(struct ahash_request *req)
                sg_copy(next_buf, req->src, req->nbytes);
        }
 #ifdef DEBUG
-       print_hex_dump(KERN_ERR, "next buf@"xstr(__LINE__)": ",
+       print_hex_dump(KERN_ERR, "next buf@"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, next_buf,
                       *next_buflen, 1);
 #endif