crypto: ccree - Rename arrays to avoid conflict with crypto/sha256.h

Rename the algo_init arrays to cc_algo_init so that they do not conflict
with the functions declared in crypto/sha256.h.

This is a preparation patch for folding crypto/sha256.h into crypto/sha.h.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Gilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/ccree/cc_hash.c b/drivers/crypto/ccree/cc_hash.c
index a6abe4e3bb0e78977fefe8664d64d25224a8f2fe..bc71bdf44a9ff195ee4d64b72e5fd8a1fff940e7 100644 (file)
--- a/drivers/crypto/ccree/cc_hash.c
+++ b/drivers/crypto/ccree/cc_hash.c
@@ -25,27 +25,27 @@ struct cc_hash_handle {
        struct list_head hash_list;
 };
 
-static const u32 digest_len_init[] = {
+static const u32 cc_digest_len_init[] = {
        0x00000040, 0x00000000, 0x00000000, 0x00000000 };
-static const u32 md5_init[] = {
+static const u32 cc_md5_init[] = {
        SHA1_H3, SHA1_H2, SHA1_H1, SHA1_H0 };
-static const u32 sha1_init[] = {
+static const u32 cc_sha1_init[] = {
        SHA1_H4, SHA1_H3, SHA1_H2, SHA1_H1, SHA1_H0 };
-static const u32 sha224_init[] = {
+static const u32 cc_sha224_init[] = {
        SHA224_H7, SHA224_H6, SHA224_H5, SHA224_H4,
        SHA224_H3, SHA224_H2, SHA224_H1, SHA224_H0 };
-static const u32 sha256_init[] = {
+static const u32 cc_sha256_init[] = {
        SHA256_H7, SHA256_H6, SHA256_H5, SHA256_H4,
        SHA256_H3, SHA256_H2, SHA256_H1, SHA256_H0 };
-static const u32 digest_len_sha512_init[] = {
+static const u32 cc_digest_len_sha512_init[] = {
        0x00000080, 0x00000000, 0x00000000, 0x00000000 };
-static u64 sha384_init[] = {
+static u64 cc_sha384_init[] = {
        SHA384_H7, SHA384_H6, SHA384_H5, SHA384_H4,
        SHA384_H3, SHA384_H2, SHA384_H1, SHA384_H0 };
-static u64 sha512_init[] = {
+static u64 cc_sha512_init[] = {
        SHA512_H7, SHA512_H6, SHA512_H5, SHA512_H4,
        SHA512_H3, SHA512_H2, SHA512_H1, SHA512_H0 };
-static const u32 sm3_init[] = {
+static const u32 cc_sm3_init[] = {
        SM3_IVH, SM3_IVG, SM3_IVF, SM3_IVE,
        SM3_IVD, SM3_IVC, SM3_IVB, SM3_IVA };
 
@@ -144,10 +144,11 @@ static void cc_init_req(struct device *dev, struct ahash_req_ctx *state,
                        if (ctx->hash_mode == DRV_HASH_SHA512 ||
                            ctx->hash_mode == DRV_HASH_SHA384)
                                memcpy(state->digest_bytes_len,
-                                      digest_len_sha512_init,
+                                      cc_digest_len_sha512_init,
                                       ctx->hash_len);
                        else
-                               memcpy(state->digest_bytes_len, digest_len_init,
+                               memcpy(state->digest_bytes_len,
+                                      cc_digest_len_init,
                                       ctx->hash_len);
                }
 
@@ -1873,26 +1874,26 @@ int cc_init_hash_sram(struct cc_drvdata *drvdata)
        int rc = 0;
 
        /* Copy-to-sram digest-len */
-       cc_set_sram_desc(digest_len_init, sram_buff_ofs,
-                        ARRAY_SIZE(digest_len_init), larval_seq,
+       cc_set_sram_desc(cc_digest_len_init, sram_buff_ofs,
+                        ARRAY_SIZE(cc_digest_len_init), larval_seq,
                         &larval_seq_len);
        rc = send_request_init(drvdata, larval_seq, larval_seq_len);
        if (rc)
                goto init_digest_const_err;
 
-       sram_buff_ofs += sizeof(digest_len_init);
+       sram_buff_ofs += sizeof(cc_digest_len_init);
        larval_seq_len = 0;
 
        if (large_sha_supported) {
                /* Copy-to-sram digest-len for sha384/512 */
-               cc_set_sram_desc(digest_len_sha512_init, sram_buff_ofs,
-                                ARRAY_SIZE(digest_len_sha512_init),
+               cc_set_sram_desc(cc_digest_len_sha512_init, sram_buff_ofs,
+                                ARRAY_SIZE(cc_digest_len_sha512_init),
                                 larval_seq, &larval_seq_len);
                rc = send_request_init(drvdata, larval_seq, larval_seq_len);
                if (rc)
                        goto init_digest_const_err;
 
-               sram_buff_ofs += sizeof(digest_len_sha512_init);
+               sram_buff_ofs += sizeof(cc_digest_len_sha512_init);
                larval_seq_len = 0;
        }
 
@@ -1900,64 +1901,64 @@ int cc_init_hash_sram(struct cc_drvdata *drvdata)
        hash_handle->larval_digest_sram_addr = sram_buff_ofs;
 
        /* Copy-to-sram initial SHA* digests */
-       cc_set_sram_desc(md5_init, sram_buff_ofs, ARRAY_SIZE(md5_init),
+       cc_set_sram_desc(cc_md5_init, sram_buff_ofs, ARRAY_SIZE(cc_md5_init),
                         larval_seq, &larval_seq_len);
        rc = send_request_init(drvdata, larval_seq, larval_seq_len);
        if (rc)
                goto init_digest_const_err;
-       sram_buff_ofs += sizeof(md5_init);
+       sram_buff_ofs += sizeof(cc_md5_init);
        larval_seq_len = 0;
 
-       cc_set_sram_desc(sha1_init, sram_buff_ofs,
-                        ARRAY_SIZE(sha1_init), larval_seq,
+       cc_set_sram_desc(cc_sha1_init, sram_buff_ofs,
+                        ARRAY_SIZE(cc_sha1_init), larval_seq,
                         &larval_seq_len);
        rc = send_request_init(drvdata, larval_seq, larval_seq_len);
        if (rc)
                goto init_digest_const_err;
-       sram_buff_ofs += sizeof(sha1_init);
+       sram_buff_ofs += sizeof(cc_sha1_init);
        larval_seq_len = 0;
 
-       cc_set_sram_desc(sha224_init, sram_buff_ofs,
-                        ARRAY_SIZE(sha224_init), larval_seq,
+       cc_set_sram_desc(cc_sha224_init, sram_buff_ofs,
+                        ARRAY_SIZE(cc_sha224_init), larval_seq,
                         &larval_seq_len);
        rc = send_request_init(drvdata, larval_seq, larval_seq_len);
        if (rc)
                goto init_digest_const_err;
-       sram_buff_ofs += sizeof(sha224_init);
+       sram_buff_ofs += sizeof(cc_sha224_init);
        larval_seq_len = 0;
 
-       cc_set_sram_desc(sha256_init, sram_buff_ofs,
-                        ARRAY_SIZE(sha256_init), larval_seq,
+       cc_set_sram_desc(cc_sha256_init, sram_buff_ofs,
+                        ARRAY_SIZE(cc_sha256_init), larval_seq,
                         &larval_seq_len);
        rc = send_request_init(drvdata, larval_seq, larval_seq_len);
        if (rc)
                goto init_digest_const_err;
-       sram_buff_ofs += sizeof(sha256_init);
+       sram_buff_ofs += sizeof(cc_sha256_init);
        larval_seq_len = 0;
 
        if (sm3_supported) {
-               cc_set_sram_desc(sm3_init, sram_buff_ofs,
-                                ARRAY_SIZE(sm3_init), larval_seq,
+               cc_set_sram_desc(cc_sm3_init, sram_buff_ofs,
+                                ARRAY_SIZE(cc_sm3_init), larval_seq,
                                 &larval_seq_len);
                rc = send_request_init(drvdata, larval_seq, larval_seq_len);
                if (rc)
                        goto init_digest_const_err;
-               sram_buff_ofs += sizeof(sm3_init);
+               sram_buff_ofs += sizeof(cc_sm3_init);
                larval_seq_len = 0;
        }
 
        if (large_sha_supported) {
-               cc_set_sram_desc((u32 *)sha384_init, sram_buff_ofs,
-                                (ARRAY_SIZE(sha384_init) * 2), larval_seq,
+               cc_set_sram_desc((u32 *)cc_sha384_init, sram_buff_ofs,
+                                (ARRAY_SIZE(cc_sha384_init) * 2), larval_seq,
                                 &larval_seq_len);
                rc = send_request_init(drvdata, larval_seq, larval_seq_len);
                if (rc)
                        goto init_digest_const_err;
-               sram_buff_ofs += sizeof(sha384_init);
+               sram_buff_ofs += sizeof(cc_sha384_init);
                larval_seq_len = 0;
 
-               cc_set_sram_desc((u32 *)sha512_init, sram_buff_ofs,
-                                (ARRAY_SIZE(sha512_init) * 2), larval_seq,
+               cc_set_sram_desc((u32 *)cc_sha512_init, sram_buff_ofs,
+                                (ARRAY_SIZE(cc_sha512_init) * 2), larval_seq,
                                 &larval_seq_len);
                rc = send_request_init(drvdata, larval_seq, larval_seq_len);
                if (rc)
@@ -1986,8 +1987,8 @@ static void __init cc_swap_dwords(u32 *buf, unsigned long size)
  */
 void __init cc_hash_global_init(void)
 {
-       cc_swap_dwords((u32 *)&sha384_init, (ARRAY_SIZE(sha384_init) * 2));
-       cc_swap_dwords((u32 *)&sha512_init, (ARRAY_SIZE(sha512_init) * 2));
+       cc_swap_dwords((u32 *)&cc_sha384_init, (ARRAY_SIZE(cc_sha384_init) * 2));
+       cc_swap_dwords((u32 *)&cc_sha512_init, (ARRAY_SIZE(cc_sha512_init) * 2));
 }
 
 int cc_hash_alloc(struct cc_drvdata *drvdata)
@@ -2006,18 +2007,18 @@ int cc_hash_alloc(struct cc_drvdata *drvdata)
        INIT_LIST_HEAD(&hash_handle->hash_list);
        drvdata->hash_handle = hash_handle;
 
-       sram_size_to_alloc = sizeof(digest_len_init) +
-                       sizeof(md5_init) +
-                       sizeof(sha1_init) +
-                       sizeof(sha224_init) +
-                       sizeof(sha256_init);
+       sram_size_to_alloc = sizeof(cc_digest_len_init) +
+                       sizeof(cc_md5_init) +
+                       sizeof(cc_sha1_init) +
+                       sizeof(cc_sha224_init) +
+                       sizeof(cc_sha256_init);
 
        if (drvdata->hw_rev >= CC_HW_REV_713)
-               sram_size_to_alloc += sizeof(sm3_init);
+               sram_size_to_alloc += sizeof(cc_sm3_init);
 
        if (drvdata->hw_rev >= CC_HW_REV_712)
-               sram_size_to_alloc += sizeof(digest_len_sha512_init) +
-                       sizeof(sha384_init) + sizeof(sha512_init);
+               sram_size_to_alloc += sizeof(cc_digest_len_sha512_init) +
+                       sizeof(cc_sha384_init) + sizeof(cc_sha512_init);
 
        sram_buff = cc_sram_alloc(drvdata, sram_size_to_alloc);
        if (sram_buff == NULL_SRAM_ADDR) {
@@ -2258,22 +2259,22 @@ static const void *cc_larval_digest(struct device *dev, u32 mode)
 {
        switch (mode) {
        case DRV_HASH_MD5:
-               return md5_init;
+               return cc_md5_init;
        case DRV_HASH_SHA1:
-               return sha1_init;
+               return cc_sha1_init;
        case DRV_HASH_SHA224:
-               return sha224_init;
+               return cc_sha224_init;
        case DRV_HASH_SHA256:
-               return sha256_init;
+               return cc_sha256_init;
        case DRV_HASH_SHA384:
-               return sha384_init;
+               return cc_sha384_init;
        case DRV_HASH_SHA512:
-               return sha512_init;
+               return cc_sha512_init;
        case DRV_HASH_SM3:
-               return sm3_init;
+               return cc_sm3_init;
        default:
                dev_err(dev, "Invalid hash mode (%d)\n", mode);
-               return md5_init;
+               return cc_md5_init;
        }
 }
 
@@ -2301,40 +2302,40 @@ cc_sram_addr_t cc_larval_digest_addr(void *drvdata, u32 mode)
                return (hash_handle->larval_digest_sram_addr);
        case DRV_HASH_SHA1:
                return (hash_handle->larval_digest_sram_addr +
-                       sizeof(md5_init));
+                       sizeof(cc_md5_init));
        case DRV_HASH_SHA224:
                return (hash_handle->larval_digest_sram_addr +
-                       sizeof(md5_init) +
-                       sizeof(sha1_init));
+                       sizeof(cc_md5_init) +
+                       sizeof(cc_sha1_init));
        case DRV_HASH_SHA256:
                return (hash_handle->larval_digest_sram_addr +
-                       sizeof(md5_init) +
-                       sizeof(sha1_init) +
-                       sizeof(sha224_init));
+                       sizeof(cc_md5_init) +
+                       sizeof(cc_sha1_init) +
+                       sizeof(cc_sha224_init));
        case DRV_HASH_SM3:
                return (hash_handle->larval_digest_sram_addr +
-                       sizeof(md5_init) +
-                       sizeof(sha1_init) +
-                       sizeof(sha224_init) +
-                       sizeof(sha256_init));
+                       sizeof(cc_md5_init) +
+                       sizeof(cc_sha1_init) +
+                       sizeof(cc_sha224_init) +
+                       sizeof(cc_sha256_init));
        case DRV_HASH_SHA384:
                addr = (hash_handle->larval_digest_sram_addr +
-                       sizeof(md5_init) +
-                       sizeof(sha1_init) +
-                       sizeof(sha224_init) +
-                       sizeof(sha256_init));
+                       sizeof(cc_md5_init) +
+                       sizeof(cc_sha1_init) +
+                       sizeof(cc_sha224_init) +
+                       sizeof(cc_sha256_init));
                if (sm3_supported)
-                       addr += sizeof(sm3_init);
+                       addr += sizeof(cc_sm3_init);
                return addr;
        case DRV_HASH_SHA512:
                addr = (hash_handle->larval_digest_sram_addr +
-                       sizeof(md5_init) +
-                       sizeof(sha1_init) +
-                       sizeof(sha224_init) +
-                       sizeof(sha256_init) +
-                       sizeof(sha384_init));
+                       sizeof(cc_md5_init) +
+                       sizeof(cc_sha1_init) +
+                       sizeof(cc_sha224_init) +
+                       sizeof(cc_sha256_init) +
+                       sizeof(cc_sha384_init));
                if (sm3_supported)
-                       addr += sizeof(sm3_init);
+                       addr += sizeof(cc_sm3_init);
                return addr;
        default:
                dev_err(dev, "Invalid hash mode (%d)\n", mode);
@@ -2360,7 +2361,7 @@ cc_digest_len_addr(void *drvdata, u32 mode)
 #if (CC_DEV_SHA_MAX > 256)
        case DRV_HASH_SHA384:
        case DRV_HASH_SHA512:
-               return  digest_len_addr + sizeof(digest_len_init);
+               return  digest_len_addr + sizeof(cc_digest_len_init);
 #endif
        default:
                return digest_len_addr; /*to avoid kernel crash*/