crypto: inside-secure - Made .cra_priority value a define

Instead of having a fixed value (of 300) all over the place, the value for
for .cra_priority is now made into a define (SAFEXCEL_CRA_PRIORITY).
This makes it easier to play with, e.g. during development.

Signed-off-by: Pascal van Leeuwen <pvanleeuwen@verimatrix.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/inside-secure/safexcel.h b/drivers/crypto/inside-secure/safexcel.h
index b5ff62f..1e575a1 100644 (file)
--- a/drivers/crypto/inside-secure/safexcel.h
+++ b/drivers/crypto/inside-secure/safexcel.h
@@ -598,6 +598,9 @@ enum safexcel_eip_version {
        EIP197_DEVBRD
 };
 
+/* Priority we use for advertising our algorithms */
+#define SAFEXCEL_CRA_PRIORITY          300
+
 /* EIP algorithm presence flags */
 enum safexcel_eip_algorithms {
        SAFEXCEL_ALG_BC0      = BIT(5),

diff --git a/drivers/crypto/inside-secure/safexcel_cipher.c b/drivers/crypto/inside-secure/safexcel_cipher.c
index e60e797..6e2027e 100644 (file)
--- a/drivers/crypto/inside-secure/safexcel_cipher.c
+++ b/drivers/crypto/inside-secure/safexcel_cipher.c
@@ -1044,7 +1044,7 @@ struct safexcel_alg_template safexcel_alg_ecb_aes = {
                .base = {
                        .cra_name = "ecb(aes)",
                        .cra_driver_name = "safexcel-ecb-aes",
-                       .cra_priority = 300,
+                       .cra_priority = SAFEXCEL_CRA_PRIORITY,
                        .cra_flags = CRYPTO_ALG_ASYNC |
                                     CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = AES_BLOCK_SIZE,
@@ -1080,7 +1080,7 @@ struct safexcel_alg_template safexcel_alg_cbc_aes = {
                .base = {
                        .cra_name = "cbc(aes)",
                        .cra_driver_name = "safexcel-cbc-aes",
-                       .cra_priority = 300,
+                       .cra_priority = SAFEXCEL_CRA_PRIORITY,
                        .cra_flags = CRYPTO_ALG_ASYNC |
                                     CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = AES_BLOCK_SIZE,
@@ -1155,7 +1155,7 @@ struct safexcel_alg_template safexcel_alg_ctr_aes = {
                .base = {
                        .cra_name = "rfc3686(ctr(aes))",
                        .cra_driver_name = "safexcel-ctr-aes",
-                       .cra_priority = 300,
+                       .cra_priority = SAFEXCEL_CRA_PRIORITY,
                        .cra_flags = CRYPTO_ALG_ASYNC |
                                     CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = 1,
@@ -1212,7 +1212,7 @@ struct safexcel_alg_template safexcel_alg_cbc_des = {
                .base = {
                        .cra_name = "cbc(des)",
                        .cra_driver_name = "safexcel-cbc-des",
-                       .cra_priority = 300,
+                       .cra_priority = SAFEXCEL_CRA_PRIORITY,
                        .cra_flags = CRYPTO_ALG_ASYNC |
                                     CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = DES_BLOCK_SIZE,
@@ -1247,7 +1247,7 @@ struct safexcel_alg_template safexcel_alg_ecb_des = {
                .base = {
                        .cra_name = "ecb(des)",
                        .cra_driver_name = "safexcel-ecb-des",
-                       .cra_priority = 300,
+                       .cra_priority = SAFEXCEL_CRA_PRIORITY,
                        .cra_flags = CRYPTO_ALG_ASYNC |
                                     CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = DES_BLOCK_SIZE,
@@ -1306,7 +1306,7 @@ struct safexcel_alg_template safexcel_alg_cbc_des3_ede = {
                .base = {
                        .cra_name = "cbc(des3_ede)",
                        .cra_driver_name = "safexcel-cbc-des3_ede",
-                       .cra_priority = 300,
+                       .cra_priority = SAFEXCEL_CRA_PRIORITY,
                        .cra_flags = CRYPTO_ALG_ASYNC |
                                     CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = DES3_EDE_BLOCK_SIZE,
@@ -1341,7 +1341,7 @@ struct safexcel_alg_template safexcel_alg_ecb_des3_ede = {
                .base = {
                        .cra_name = "ecb(des3_ede)",
                        .cra_driver_name = "safexcel-ecb-des3_ede",
-                       .cra_priority = 300,
+                       .cra_priority = SAFEXCEL_CRA_PRIORITY,
                        .cra_flags = CRYPTO_ALG_ASYNC |
                                     CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = DES3_EDE_BLOCK_SIZE,
@@ -1410,7 +1410,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha1_cbc_aes = {
                .base = {
                        .cra_name = "authenc(hmac(sha1),cbc(aes))",
                        .cra_driver_name = "safexcel-authenc-hmac-sha1-cbc-aes",
-                       .cra_priority = 300,
+                       .cra_priority = SAFEXCEL_CRA_PRIORITY,
                        .cra_flags = CRYPTO_ALG_ASYNC |
                                     CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = AES_BLOCK_SIZE,
@@ -1445,7 +1445,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha256_cbc_aes = {
                .base = {
                        .cra_name = "authenc(hmac(sha256),cbc(aes))",
                        .cra_driver_name = "safexcel-authenc-hmac-sha256-cbc-aes",
-                       .cra_priority = 300,
+                       .cra_priority = SAFEXCEL_CRA_PRIORITY,
                        .cra_flags = CRYPTO_ALG_ASYNC |
                                     CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = AES_BLOCK_SIZE,
@@ -1480,7 +1480,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha224_cbc_aes = {
                .base = {
                        .cra_name = "authenc(hmac(sha224),cbc(aes))",
                        .cra_driver_name = "safexcel-authenc-hmac-sha224-cbc-aes",
-                       .cra_priority = 300,
+                       .cra_priority = SAFEXCEL_CRA_PRIORITY,
                        .cra_flags = CRYPTO_ALG_ASYNC |
                                     CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = AES_BLOCK_SIZE,
@@ -1515,7 +1515,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha512_cbc_aes = {
                .base = {
                        .cra_name = "authenc(hmac(sha512),cbc(aes))",
                        .cra_driver_name = "safexcel-authenc-hmac-sha512-cbc-aes",
-                       .cra_priority = 300,
+                       .cra_priority = SAFEXCEL_CRA_PRIORITY,
                        .cra_flags = CRYPTO_ALG_ASYNC |
                                     CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = AES_BLOCK_SIZE,
@@ -1550,7 +1550,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha384_cbc_aes = {
                .base = {
                        .cra_name = "authenc(hmac(sha384),cbc(aes))",
                        .cra_driver_name = "safexcel-authenc-hmac-sha384-cbc-aes",
-                       .cra_priority = 300,
+                       .cra_priority = SAFEXCEL_CRA_PRIORITY,
                        .cra_flags = CRYPTO_ALG_ASYNC |
                                     CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = AES_BLOCK_SIZE,
@@ -1584,7 +1584,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha1_cbc_des3_ede = {
                .base = {
                        .cra_name = "authenc(hmac(sha1),cbc(des3_ede))",
                        .cra_driver_name = "safexcel-authenc-hmac-sha1-cbc-des3_ede",
-                       .cra_priority = 300,
+                       .cra_priority = SAFEXCEL_CRA_PRIORITY,
                        .cra_flags = CRYPTO_ALG_ASYNC |
                                     CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = DES3_EDE_BLOCK_SIZE,
@@ -1618,7 +1618,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha1_ctr_aes = {
                .base = {
                        .cra_name = "authenc(hmac(sha1),rfc3686(ctr(aes)))",
                        .cra_driver_name = "safexcel-authenc-hmac-sha1-ctr-aes",
-                       .cra_priority = 300,
+                       .cra_priority = SAFEXCEL_CRA_PRIORITY,
                        .cra_flags = CRYPTO_ALG_ASYNC |
                                     CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = 1,
@@ -1652,7 +1652,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha256_ctr_aes = {
                .base = {
                        .cra_name = "authenc(hmac(sha256),rfc3686(ctr(aes)))",
                        .cra_driver_name = "safexcel-authenc-hmac-sha256-ctr-aes",
-                       .cra_priority = 300,
+                       .cra_priority = SAFEXCEL_CRA_PRIORITY,
                        .cra_flags = CRYPTO_ALG_ASYNC |
                                     CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = 1,
@@ -1686,7 +1686,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha224_ctr_aes = {
                .base = {
                        .cra_name = "authenc(hmac(sha224),rfc3686(ctr(aes)))",
                        .cra_driver_name = "safexcel-authenc-hmac-sha224-ctr-aes",
-                       .cra_priority = 300,
+                       .cra_priority = SAFEXCEL_CRA_PRIORITY,
                        .cra_flags = CRYPTO_ALG_ASYNC |
                                     CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = 1,
@@ -1720,7 +1720,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha512_ctr_aes = {
                .base = {
                        .cra_name = "authenc(hmac(sha512),rfc3686(ctr(aes)))",
                        .cra_driver_name = "safexcel-authenc-hmac-sha512-ctr-aes",
-                       .cra_priority = 300,
+                       .cra_priority = SAFEXCEL_CRA_PRIORITY,
                        .cra_flags = CRYPTO_ALG_ASYNC |
                                     CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = 1,
@@ -1754,7 +1754,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha384_ctr_aes = {
                .base = {
                        .cra_name = "authenc(hmac(sha384),rfc3686(ctr(aes)))",
                        .cra_driver_name = "safexcel-authenc-hmac-sha384-ctr-aes",
-                       .cra_priority = 300,
+                       .cra_priority = SAFEXCEL_CRA_PRIORITY,
                        .cra_flags = CRYPTO_ALG_ASYNC |
                                     CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = 1,
@@ -1870,7 +1870,7 @@ struct safexcel_alg_template safexcel_alg_xts_aes = {
                .base = {
                        .cra_name = "xts(aes)",
                        .cra_driver_name = "safexcel-xts-aes",
-                       .cra_priority = 300,
+                       .cra_priority = SAFEXCEL_CRA_PRIORITY,
                        .cra_flags = CRYPTO_ALG_ASYNC |
                                     CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = XTS_BLOCK_SIZE,

diff --git a/drivers/crypto/inside-secure/safexcel_hash.c b/drivers/crypto/inside-secure/safexcel_hash.c
index e60838f..2effb6d 100644 (file)
--- a/drivers/crypto/inside-secure/safexcel_hash.c
+++ b/drivers/crypto/inside-secure/safexcel_hash.c
@@ -860,7 +860,7 @@ struct safexcel_alg_template safexcel_alg_sha1 = {
                        .base = {
                                .cra_name = "sha1",
                                .cra_driver_name = "safexcel-sha1",
-                               .cra_priority = 300,
+                               .cra_priority = SAFEXCEL_CRA_PRIORITY,
                                .cra_flags = CRYPTO_ALG_ASYNC |
                                             CRYPTO_ALG_KERN_DRIVER_ONLY,
                                .cra_blocksize = SHA1_BLOCK_SIZE,
@@ -1102,7 +1102,7 @@ struct safexcel_alg_template safexcel_alg_hmac_sha1 = {
                        .base = {
                                .cra_name = "hmac(sha1)",
                                .cra_driver_name = "safexcel-hmac-sha1",
-                               .cra_priority = 300,
+                               .cra_priority = SAFEXCEL_CRA_PRIORITY,
                                .cra_flags = CRYPTO_ALG_ASYNC |
                                             CRYPTO_ALG_KERN_DRIVER_ONLY,
                                .cra_blocksize = SHA1_BLOCK_SIZE,
@@ -1157,7 +1157,7 @@ struct safexcel_alg_template safexcel_alg_sha256 = {
                        .base = {
                                .cra_name = "sha256",
                                .cra_driver_name = "safexcel-sha256",
-                               .cra_priority = 300,
+                               .cra_priority = SAFEXCEL_CRA_PRIORITY,
                                .cra_flags = CRYPTO_ALG_ASYNC |
                                             CRYPTO_ALG_KERN_DRIVER_ONLY,
                                .cra_blocksize = SHA256_BLOCK_SIZE,
@@ -1212,7 +1212,7 @@ struct safexcel_alg_template safexcel_alg_sha224 = {
                        .base = {
                                .cra_name = "sha224",
                                .cra_driver_name = "safexcel-sha224",
-                               .cra_priority = 300,
+                               .cra_priority = SAFEXCEL_CRA_PRIORITY,
                                .cra_flags = CRYPTO_ALG_ASYNC |
                                             CRYPTO_ALG_KERN_DRIVER_ONLY,
                                .cra_blocksize = SHA224_BLOCK_SIZE,
@@ -1282,7 +1282,7 @@ struct safexcel_alg_template safexcel_alg_hmac_sha224 = {
                        .base = {
                                .cra_name = "hmac(sha224)",
                                .cra_driver_name = "safexcel-hmac-sha224",
-                               .cra_priority = 300,
+                               .cra_priority = SAFEXCEL_CRA_PRIORITY,
                                .cra_flags = CRYPTO_ALG_ASYNC |
                                             CRYPTO_ALG_KERN_DRIVER_ONLY,
                                .cra_blocksize = SHA224_BLOCK_SIZE,
@@ -1352,7 +1352,7 @@ struct safexcel_alg_template safexcel_alg_hmac_sha256 = {
                        .base = {
                                .cra_name = "hmac(sha256)",
                                .cra_driver_name = "safexcel-hmac-sha256",
-                               .cra_priority = 300,
+                               .cra_priority = SAFEXCEL_CRA_PRIORITY,
                                .cra_flags = CRYPTO_ALG_ASYNC |
                                             CRYPTO_ALG_KERN_DRIVER_ONLY,
                                .cra_blocksize = SHA256_BLOCK_SIZE,
@@ -1407,7 +1407,7 @@ struct safexcel_alg_template safexcel_alg_sha512 = {
                        .base = {
                                .cra_name = "sha512",
                                .cra_driver_name = "safexcel-sha512",
-                               .cra_priority = 300,
+                               .cra_priority = SAFEXCEL_CRA_PRIORITY,
                                .cra_flags = CRYPTO_ALG_ASYNC |
                                             CRYPTO_ALG_KERN_DRIVER_ONLY,
                                .cra_blocksize = SHA512_BLOCK_SIZE,
@@ -1462,7 +1462,7 @@ struct safexcel_alg_template safexcel_alg_sha384 = {
                        .base = {
                                .cra_name = "sha384",
                                .cra_driver_name = "safexcel-sha384",
-                               .cra_priority = 300,
+                               .cra_priority = SAFEXCEL_CRA_PRIORITY,
                                .cra_flags = CRYPTO_ALG_ASYNC |
                                             CRYPTO_ALG_KERN_DRIVER_ONLY,
                                .cra_blocksize = SHA384_BLOCK_SIZE,
@@ -1532,7 +1532,7 @@ struct safexcel_alg_template safexcel_alg_hmac_sha512 = {
                        .base = {
                                .cra_name = "hmac(sha512)",
                                .cra_driver_name = "safexcel-hmac-sha512",
-                               .cra_priority = 300,
+                               .cra_priority = SAFEXCEL_CRA_PRIORITY,
                                .cra_flags = CRYPTO_ALG_ASYNC |
                                             CRYPTO_ALG_KERN_DRIVER_ONLY,
                                .cra_blocksize = SHA512_BLOCK_SIZE,
@@ -1602,7 +1602,7 @@ struct safexcel_alg_template safexcel_alg_hmac_sha384 = {
                        .base = {
                                .cra_name = "hmac(sha384)",
                                .cra_driver_name = "safexcel-hmac-sha384",
-                               .cra_priority = 300,
+                               .cra_priority = SAFEXCEL_CRA_PRIORITY,
                                .cra_flags = CRYPTO_ALG_ASYNC |
                                             CRYPTO_ALG_KERN_DRIVER_ONLY,
                                .cra_blocksize = SHA384_BLOCK_SIZE,
@@ -1657,7 +1657,7 @@ struct safexcel_alg_template safexcel_alg_md5 = {
                        .base = {
                                .cra_name = "md5",
                                .cra_driver_name = "safexcel-md5",
-                               .cra_priority = 300,
+                               .cra_priority = SAFEXCEL_CRA_PRIORITY,
                                .cra_flags = CRYPTO_ALG_ASYNC |
                                             CRYPTO_ALG_KERN_DRIVER_ONLY,
                                .cra_blocksize = MD5_HMAC_BLOCK_SIZE,
@@ -1728,7 +1728,7 @@ struct safexcel_alg_template safexcel_alg_hmac_md5 = {
                        .base = {
                                .cra_name = "hmac(md5)",
                                .cra_driver_name = "safexcel-hmac-md5",
-                               .cra_priority = 300,
+                               .cra_priority = SAFEXCEL_CRA_PRIORITY,
                                .cra_flags = CRYPTO_ALG_ASYNC |
                                             CRYPTO_ALG_KERN_DRIVER_ONLY,
                                .cra_blocksize = MD5_HMAC_BLOCK_SIZE,