[PATCH v5 12/19] crypto: talitos - Remove alg settings in talitos_register_common()
From: Paul Louvel
Date: Mon Sep 07 2026 - 09:45:34 EST
Algorithm properties are now set at compile time for those who are not
dependent on runtime features.
Remove now-unused function and struct member.
---
drivers/crypto/talitos/talitos-aead.c | 128 ++++++++++++++++++++++++++--------
drivers/crypto/talitos/talitos-hash.c | 72 +++++++++++++++----
drivers/crypto/talitos/talitos.c | 23 ------
drivers/crypto/talitos/talitos.h | 1 -
4 files changed, 160 insertions(+), 64 deletions(-)
diff --git a/drivers/crypto/talitos/talitos-aead.c b/drivers/crypto/talitos/talitos-aead.c
index 40d048de0502..0504b8575e26 100644
--- a/drivers/crypto/talitos/talitos-aead.c
+++ b/drivers/crypto/talitos/talitos-aead.c
@@ -413,7 +413,11 @@ static const struct talitos_alg_template aead_driver_algs[] = {
.cra_driver_name = "authenc-hmac-sha1-"
"cbc-aes-talitos",
.cra_blocksize = AES_BLOCK_SIZE,
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY,
},
.ivsize = AES_BLOCK_SIZE,
@@ -428,14 +432,17 @@ static const struct talitos_alg_template aead_driver_algs[] = {
DESC_HDR_MODE1_MDEU_SHA1_HMAC,
},
{ .type = CRYPTO_ALG_TYPE_AEAD,
- .priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
.alg.aead = {
.base = {
.cra_name = "authenc(hmac(sha1),cbc(aes))",
.cra_driver_name = "authenc-hmac-sha1-"
"cbc-aes-talitos-hsna",
.cra_blocksize = AES_BLOCK_SIZE,
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY,
},
.ivsize = AES_BLOCK_SIZE,
@@ -457,7 +464,11 @@ static const struct talitos_alg_template aead_driver_algs[] = {
.cra_driver_name = "authenc-hmac-sha1-"
"cbc-3des-talitos",
.cra_blocksize = DES3_EDE_BLOCK_SIZE,
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY,
},
.ivsize = DES3_EDE_BLOCK_SIZE,
@@ -474,7 +485,6 @@ static const struct talitos_alg_template aead_driver_algs[] = {
DESC_HDR_MODE1_MDEU_SHA1_HMAC,
},
{ .type = CRYPTO_ALG_TYPE_AEAD,
- .priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
.alg.aead = {
.base = {
.cra_name = "authenc(hmac(sha1),"
@@ -482,7 +492,11 @@ static const struct talitos_alg_template aead_driver_algs[] = {
.cra_driver_name = "authenc-hmac-sha1-"
"cbc-3des-talitos-hsna",
.cra_blocksize = DES3_EDE_BLOCK_SIZE,
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY,
},
.ivsize = DES3_EDE_BLOCK_SIZE,
@@ -505,7 +519,11 @@ static const struct talitos_alg_template aead_driver_algs[] = {
.cra_driver_name = "authenc-hmac-sha224-"
"cbc-aes-talitos",
.cra_blocksize = AES_BLOCK_SIZE,
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY,
},
.ivsize = AES_BLOCK_SIZE,
@@ -520,14 +538,17 @@ static const struct talitos_alg_template aead_driver_algs[] = {
DESC_HDR_MODE1_MDEU_SHA224_HMAC,
},
{ .type = CRYPTO_ALG_TYPE_AEAD,
- .priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
.alg.aead = {
.base = {
.cra_name = "authenc(hmac(sha224),cbc(aes))",
.cra_driver_name = "authenc-hmac-sha224-"
"cbc-aes-talitos-hsna",
.cra_blocksize = AES_BLOCK_SIZE,
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY,
},
.ivsize = AES_BLOCK_SIZE,
@@ -549,7 +570,11 @@ static const struct talitos_alg_template aead_driver_algs[] = {
.cra_driver_name = "authenc-hmac-sha224-"
"cbc-3des-talitos",
.cra_blocksize = DES3_EDE_BLOCK_SIZE,
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY,
},
.ivsize = DES3_EDE_BLOCK_SIZE,
@@ -566,7 +591,6 @@ static const struct talitos_alg_template aead_driver_algs[] = {
DESC_HDR_MODE1_MDEU_SHA224_HMAC,
},
{ .type = CRYPTO_ALG_TYPE_AEAD,
- .priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
.alg.aead = {
.base = {
.cra_name = "authenc(hmac(sha224),"
@@ -574,7 +598,11 @@ static const struct talitos_alg_template aead_driver_algs[] = {
.cra_driver_name = "authenc-hmac-sha224-"
"cbc-3des-talitos-hsna",
.cra_blocksize = DES3_EDE_BLOCK_SIZE,
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY,
},
.ivsize = DES3_EDE_BLOCK_SIZE,
@@ -597,7 +625,11 @@ static const struct talitos_alg_template aead_driver_algs[] = {
.cra_driver_name = "authenc-hmac-sha256-"
"cbc-aes-talitos",
.cra_blocksize = AES_BLOCK_SIZE,
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY,
},
.ivsize = AES_BLOCK_SIZE,
@@ -612,14 +644,17 @@ static const struct talitos_alg_template aead_driver_algs[] = {
DESC_HDR_MODE1_MDEU_SHA256_HMAC,
},
{ .type = CRYPTO_ALG_TYPE_AEAD,
- .priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
.alg.aead = {
.base = {
.cra_name = "authenc(hmac(sha256),cbc(aes))",
.cra_driver_name = "authenc-hmac-sha256-"
"cbc-aes-talitos-hsna",
.cra_blocksize = AES_BLOCK_SIZE,
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY,
},
.ivsize = AES_BLOCK_SIZE,
@@ -641,7 +676,11 @@ static const struct talitos_alg_template aead_driver_algs[] = {
.cra_driver_name = "authenc-hmac-sha256-"
"cbc-3des-talitos",
.cra_blocksize = DES3_EDE_BLOCK_SIZE,
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY,
},
.ivsize = DES3_EDE_BLOCK_SIZE,
@@ -658,7 +697,6 @@ static const struct talitos_alg_template aead_driver_algs[] = {
DESC_HDR_MODE1_MDEU_SHA256_HMAC,
},
{ .type = CRYPTO_ALG_TYPE_AEAD,
- .priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
.alg.aead = {
.base = {
.cra_name = "authenc(hmac(sha256),"
@@ -666,7 +704,11 @@ static const struct talitos_alg_template aead_driver_algs[] = {
.cra_driver_name = "authenc-hmac-sha256-"
"cbc-3des-talitos-hsna",
.cra_blocksize = DES3_EDE_BLOCK_SIZE,
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY,
},
.ivsize = DES3_EDE_BLOCK_SIZE,
@@ -689,7 +731,11 @@ static const struct talitos_alg_template aead_driver_algs[] = {
.cra_driver_name = "authenc-hmac-sha384-"
"cbc-aes-talitos",
.cra_blocksize = AES_BLOCK_SIZE,
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY,
},
.ivsize = AES_BLOCK_SIZE,
@@ -711,7 +757,11 @@ static const struct talitos_alg_template aead_driver_algs[] = {
.cra_driver_name = "authenc-hmac-sha384-"
"cbc-3des-talitos",
.cra_blocksize = DES3_EDE_BLOCK_SIZE,
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY,
},
.ivsize = DES3_EDE_BLOCK_SIZE,
@@ -734,7 +784,11 @@ static const struct talitos_alg_template aead_driver_algs[] = {
.cra_driver_name = "authenc-hmac-sha512-"
"cbc-aes-talitos",
.cra_blocksize = AES_BLOCK_SIZE,
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY,
},
.ivsize = AES_BLOCK_SIZE,
@@ -756,7 +810,11 @@ static const struct talitos_alg_template aead_driver_algs[] = {
.cra_driver_name = "authenc-hmac-sha512-"
"cbc-3des-talitos",
.cra_blocksize = DES3_EDE_BLOCK_SIZE,
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY,
},
.ivsize = DES3_EDE_BLOCK_SIZE,
@@ -779,7 +837,11 @@ static const struct talitos_alg_template aead_driver_algs[] = {
.cra_driver_name = "authenc-hmac-md5-"
"cbc-aes-talitos",
.cra_blocksize = AES_BLOCK_SIZE,
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY,
},
.ivsize = AES_BLOCK_SIZE,
@@ -794,14 +856,17 @@ static const struct talitos_alg_template aead_driver_algs[] = {
DESC_HDR_MODE1_MDEU_MD5_HMAC,
},
{ .type = CRYPTO_ALG_TYPE_AEAD,
- .priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
.alg.aead = {
.base = {
.cra_name = "authenc(hmac(md5),cbc(aes))",
.cra_driver_name = "authenc-hmac-md5-"
"cbc-aes-talitos-hsna",
.cra_blocksize = AES_BLOCK_SIZE,
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY,
},
.ivsize = AES_BLOCK_SIZE,
@@ -822,7 +887,11 @@ static const struct talitos_alg_template aead_driver_algs[] = {
.cra_driver_name = "authenc-hmac-md5-"
"cbc-3des-talitos",
.cra_blocksize = DES3_EDE_BLOCK_SIZE,
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY,
},
.ivsize = DES3_EDE_BLOCK_SIZE,
@@ -839,14 +908,17 @@ static const struct talitos_alg_template aead_driver_algs[] = {
DESC_HDR_MODE1_MDEU_MD5_HMAC,
},
{ .type = CRYPTO_ALG_TYPE_AEAD,
- .priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
.alg.aead = {
.base = {
.cra_name = "authenc(hmac(md5),cbc(des3_ede))",
.cra_driver_name = "authenc-hmac-md5-"
"cbc-3des-talitos-hsna",
.cra_blocksize = DES3_EDE_BLOCK_SIZE,
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY,
},
.ivsize = DES3_EDE_BLOCK_SIZE,
diff --git a/drivers/crypto/talitos/talitos-hash.c b/drivers/crypto/talitos/talitos-hash.c
index 4224563ac701..3cfa739dab64 100644
--- a/drivers/crypto/talitos/talitos-hash.c
+++ b/drivers/crypto/talitos/talitos-hash.c
@@ -571,7 +571,11 @@ static const struct talitos_alg_template hash_driver_algs[] = {
.cra_driver_name = "md5-talitos",
.cra_blocksize = MD5_HMAC_BLOCK_SIZE,
.cra_reqsize = sizeof(struct talitos_ahash_req_ctx),
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY |
CRYPTO_AHASH_ALG_BLOCK_ONLY,
}
@@ -589,7 +593,11 @@ static const struct talitos_alg_template hash_driver_algs[] = {
.cra_driver_name = "sha1-talitos",
.cra_blocksize = SHA1_BLOCK_SIZE,
.cra_reqsize = sizeof(struct talitos_ahash_req_ctx),
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY |
CRYPTO_AHASH_ALG_BLOCK_ONLY,
}
@@ -607,7 +615,11 @@ static const struct talitos_alg_template hash_driver_algs[] = {
.cra_driver_name = "sha224-talitos",
.cra_blocksize = SHA224_BLOCK_SIZE,
.cra_reqsize = sizeof(struct talitos_ahash_req_ctx),
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY |
CRYPTO_AHASH_ALG_BLOCK_ONLY,
}
@@ -625,7 +637,11 @@ static const struct talitos_alg_template hash_driver_algs[] = {
.cra_driver_name = "sha256-talitos",
.cra_blocksize = SHA256_BLOCK_SIZE,
.cra_reqsize = sizeof(struct talitos_ahash_req_ctx),
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY |
CRYPTO_AHASH_ALG_BLOCK_ONLY,
}
@@ -643,7 +659,11 @@ static const struct talitos_alg_template hash_driver_algs[] = {
.cra_driver_name = "sha384-talitos",
.cra_blocksize = SHA384_BLOCK_SIZE,
.cra_reqsize = sizeof(struct talitos_ahash_req_ctx),
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY |
CRYPTO_AHASH_ALG_BLOCK_ONLY,
}
@@ -661,7 +681,11 @@ static const struct talitos_alg_template hash_driver_algs[] = {
.cra_driver_name = "sha512-talitos",
.cra_blocksize = SHA512_BLOCK_SIZE,
.cra_reqsize = sizeof(struct talitos_ahash_req_ctx),
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY |
CRYPTO_AHASH_ALG_BLOCK_ONLY,
}
@@ -679,7 +703,11 @@ static const struct talitos_alg_template hash_driver_algs[] = {
.cra_driver_name = "hmac-md5-talitos",
.cra_blocksize = MD5_HMAC_BLOCK_SIZE,
.cra_reqsize = sizeof(struct talitos_ahash_req_ctx),
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY |
CRYPTO_AHASH_ALG_BLOCK_ONLY,
}
@@ -697,7 +725,11 @@ static const struct talitos_alg_template hash_driver_algs[] = {
.cra_driver_name = "hmac-sha1-talitos",
.cra_blocksize = SHA1_BLOCK_SIZE,
.cra_reqsize = sizeof(struct talitos_ahash_req_ctx),
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY |
CRYPTO_AHASH_ALG_BLOCK_ONLY,
}
@@ -715,7 +747,11 @@ static const struct talitos_alg_template hash_driver_algs[] = {
.cra_driver_name = "hmac-sha224-talitos",
.cra_blocksize = SHA224_BLOCK_SIZE,
.cra_reqsize = sizeof(struct talitos_ahash_req_ctx),
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY |
CRYPTO_AHASH_ALG_BLOCK_ONLY,
}
@@ -733,7 +769,11 @@ static const struct talitos_alg_template hash_driver_algs[] = {
.cra_driver_name = "hmac-sha256-talitos",
.cra_blocksize = SHA256_BLOCK_SIZE,
.cra_reqsize = sizeof(struct talitos_ahash_req_ctx),
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY |
CRYPTO_AHASH_ALG_BLOCK_ONLY,
}
@@ -751,7 +791,11 @@ static const struct talitos_alg_template hash_driver_algs[] = {
.cra_driver_name = "hmac-sha384-talitos",
.cra_blocksize = SHA384_BLOCK_SIZE,
.cra_reqsize = sizeof(struct talitos_ahash_req_ctx),
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY |
CRYPTO_AHASH_ALG_BLOCK_ONLY,
}
@@ -769,7 +813,11 @@ static const struct talitos_alg_template hash_driver_algs[] = {
.cra_driver_name = "hmac-sha512-talitos",
.cra_blocksize = SHA512_BLOCK_SIZE,
.cra_reqsize = sizeof(struct talitos_ahash_req_ctx),
- .cra_flags = CRYPTO_ALG_ASYNC |
+ .cra_module = THIS_MODULE,
+ .cra_priority = TALITOS_CRA_PRIORITY,
+ .cra_ctxsize = sizeof(struct talitos_ctx),
+ .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
+ CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ALLOCATES_MEMORY |
CRYPTO_AHASH_ALG_BLOCK_ONLY,
}
diff --git a/drivers/crypto/talitos/talitos.c b/drivers/crypto/talitos/talitos.c
index 52ff5ef46fb6..ff938cc4e837 100644
--- a/drivers/crypto/talitos/talitos.c
+++ b/drivers/crypto/talitos/talitos.c
@@ -1040,23 +1040,6 @@ static void talitos_remove(struct platform_device *ofdev)
tasklet_kill(&priv->done_task[1]);
}
-static void talitos_alg_set_common(struct talitos_private *priv,
- struct crypto_alg *alg, u32 custom_priority,
- u32 type)
-{
- alg->cra_module = THIS_MODULE;
- if (custom_priority)
- alg->cra_priority = custom_priority;
- else
- alg->cra_priority = TALITOS_CRA_PRIORITY;
- if (has_ftr_sec1(priv) && type != CRYPTO_ALG_TYPE_AHASH)
- alg->cra_alignmask = 3;
- else
- alg->cra_alignmask = 0;
- alg->cra_ctxsize = sizeof(struct talitos_ctx);
- alg->cra_flags |= CRYPTO_ALG_KERN_DRIVER_ONLY;
-}
-
int talitos_register_common(struct device *dev,
struct talitos_alg_template *template)
{
@@ -1075,20 +1058,14 @@ int talitos_register_common(struct device *dev,
switch (t_alg->algt.type) {
case CRYPTO_ALG_TYPE_AHASH:
alg = &t_alg->algt.alg.hash.halg.base;
- talitos_alg_set_common(priv, alg, t_alg->algt.priority,
- t_alg->algt.type);
ret = crypto_register_ahash(&t_alg->algt.alg.hash);
break;
case CRYPTO_ALG_TYPE_SKCIPHER:
alg = &t_alg->algt.alg.skcipher.base;
- talitos_alg_set_common(priv, alg, t_alg->algt.priority,
- t_alg->algt.type);
ret = crypto_register_skcipher(&t_alg->algt.alg.skcipher);
break;
case CRYPTO_ALG_TYPE_AEAD:
alg = &t_alg->algt.alg.aead.base;
- talitos_alg_set_common(priv, alg, t_alg->algt.priority,
- t_alg->algt.type);
ret = crypto_register_aead(&t_alg->algt.alg.aead);
break;
default:
diff --git a/drivers/crypto/talitos/talitos.h b/drivers/crypto/talitos/talitos.h
index 8aa3102e9935..c2fc71282c0b 100644
--- a/drivers/crypto/talitos/talitos.h
+++ b/drivers/crypto/talitos/talitos.h
@@ -203,7 +203,6 @@ struct talitos_ctx {
struct talitos_alg_template {
u32 type;
- u32 priority;
union {
struct skcipher_alg skcipher;
struct ahash_alg hash;
--
2.55.0