aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2006-08-21 07:18:50 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2006-09-20 21:41:50 -0400
commit65b75c36f4e8422602826c75c803136e0da94122 (patch)
tree4adf5b95aff10656469572425a0ae14196031370
parentf3f632d61ae9af85d436706ee8e33af1a7fb9c28 (diff)
[CRYPTO] s390: Added missing driver name and priority
Accelerated versions of crypto algorithms must carry a distinct driver name and priority in order to distinguish themselves from their generic counter- part. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--arch/s390/crypto/aes_s390.c2
-rw-r--r--arch/s390/crypto/crypt_s390.h2
-rw-r--r--arch/s390/crypto/des_s390.c6
-rw-r--r--arch/s390/crypto/sha1_s390.c2
-rw-r--r--arch/s390/crypto/sha256_s390.c2
5 files changed, 14 insertions, 0 deletions
diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c
index c7c43c9de0d9..220300e760d8 100644
--- a/arch/s390/crypto/aes_s390.c
+++ b/arch/s390/crypto/aes_s390.c
@@ -222,6 +222,8 @@ static unsigned int aes_decrypt_cbc(const struct cipher_desc *desc, u8 *out,
222 222
223static struct crypto_alg aes_alg = { 223static struct crypto_alg aes_alg = {
224 .cra_name = "aes", 224 .cra_name = "aes",
225 .cra_driver_name = "aes-s390",
226 .cra_priority = CRYPT_S390_PRIORITY,
225 .cra_flags = CRYPTO_ALG_TYPE_CIPHER, 227 .cra_flags = CRYPTO_ALG_TYPE_CIPHER,
226 .cra_blocksize = AES_BLOCK_SIZE, 228 .cra_blocksize = AES_BLOCK_SIZE,
227 .cra_ctxsize = sizeof(struct s390_aes_ctx), 229 .cra_ctxsize = sizeof(struct s390_aes_ctx),
diff --git a/arch/s390/crypto/crypt_s390.h b/arch/s390/crypto/crypt_s390.h
index d1c259a7fe33..d1d330797f75 100644
--- a/arch/s390/crypto/crypt_s390.h
+++ b/arch/s390/crypto/crypt_s390.h
@@ -20,6 +20,8 @@
20#define CRYPT_S390_OP_MASK 0xFF00 20#define CRYPT_S390_OP_MASK 0xFF00
21#define CRYPT_S390_FUNC_MASK 0x00FF 21#define CRYPT_S390_FUNC_MASK 0x00FF
22 22
23#define CRYPT_S390_PRIORITY 300
24
23/* s930 cryptographic operations */ 25/* s930 cryptographic operations */
24enum crypt_s390_operations { 26enum crypt_s390_operations {
25 CRYPT_S390_KM = 0x0100, 27 CRYPT_S390_KM = 0x0100,
diff --git a/arch/s390/crypto/des_s390.c b/arch/s390/crypto/des_s390.c
index 170757b3451d..3fd5d37d5e05 100644
--- a/arch/s390/crypto/des_s390.c
+++ b/arch/s390/crypto/des_s390.c
@@ -135,6 +135,8 @@ static unsigned int des_decrypt_cbc(const struct cipher_desc *desc, u8 *out,
135 135
136static struct crypto_alg des_alg = { 136static struct crypto_alg des_alg = {
137 .cra_name = "des", 137 .cra_name = "des",
138 .cra_driver_name = "des-s390",
139 .cra_priority = CRYPT_S390_PRIORITY,
138 .cra_flags = CRYPTO_ALG_TYPE_CIPHER, 140 .cra_flags = CRYPTO_ALG_TYPE_CIPHER,
139 .cra_blocksize = DES_BLOCK_SIZE, 141 .cra_blocksize = DES_BLOCK_SIZE,
140 .cra_ctxsize = sizeof(struct crypt_s390_des_ctx), 142 .cra_ctxsize = sizeof(struct crypt_s390_des_ctx),
@@ -271,6 +273,8 @@ static unsigned int des3_128_decrypt_cbc(const struct cipher_desc *desc,
271 273
272static struct crypto_alg des3_128_alg = { 274static struct crypto_alg des3_128_alg = {
273 .cra_name = "des3_ede128", 275 .cra_name = "des3_ede128",
276 .cra_driver_name = "des3_ede128-s390",
277 .cra_priority = CRYPT_S390_PRIORITY,
274 .cra_flags = CRYPTO_ALG_TYPE_CIPHER, 278 .cra_flags = CRYPTO_ALG_TYPE_CIPHER,
275 .cra_blocksize = DES3_128_BLOCK_SIZE, 279 .cra_blocksize = DES3_128_BLOCK_SIZE,
276 .cra_ctxsize = sizeof(struct crypt_s390_des3_128_ctx), 280 .cra_ctxsize = sizeof(struct crypt_s390_des3_128_ctx),
@@ -411,6 +415,8 @@ static unsigned int des3_192_decrypt_cbc(const struct cipher_desc *desc,
411 415
412static struct crypto_alg des3_192_alg = { 416static struct crypto_alg des3_192_alg = {
413 .cra_name = "des3_ede", 417 .cra_name = "des3_ede",
418 .cra_driver_name = "des3_ede-s390",
419 .cra_priority = CRYPT_S390_PRIORITY,
414 .cra_flags = CRYPTO_ALG_TYPE_CIPHER, 420 .cra_flags = CRYPTO_ALG_TYPE_CIPHER,
415 .cra_blocksize = DES3_192_BLOCK_SIZE, 421 .cra_blocksize = DES3_192_BLOCK_SIZE,
416 .cra_ctxsize = sizeof(struct crypt_s390_des3_192_ctx), 422 .cra_ctxsize = sizeof(struct crypt_s390_des3_192_ctx),
diff --git a/arch/s390/crypto/sha1_s390.c b/arch/s390/crypto/sha1_s390.c
index 9d34a35b1aa5..49ca8690ee39 100644
--- a/arch/s390/crypto/sha1_s390.c
+++ b/arch/s390/crypto/sha1_s390.c
@@ -126,6 +126,8 @@ static void sha1_final(struct crypto_tfm *tfm, u8 *out)
126 126
127static struct crypto_alg alg = { 127static struct crypto_alg alg = {
128 .cra_name = "sha1", 128 .cra_name = "sha1",
129 .cra_driver_name = "sha1-s390",
130 .cra_priority = CRYPT_S390_PRIORITY,
129 .cra_flags = CRYPTO_ALG_TYPE_DIGEST, 131 .cra_flags = CRYPTO_ALG_TYPE_DIGEST,
130 .cra_blocksize = SHA1_BLOCK_SIZE, 132 .cra_blocksize = SHA1_BLOCK_SIZE,
131 .cra_ctxsize = sizeof(struct crypt_s390_sha1_ctx), 133 .cra_ctxsize = sizeof(struct crypt_s390_sha1_ctx),
diff --git a/arch/s390/crypto/sha256_s390.c b/arch/s390/crypto/sha256_s390.c
index f573df30f31d..8e4e67503fe7 100644
--- a/arch/s390/crypto/sha256_s390.c
+++ b/arch/s390/crypto/sha256_s390.c
@@ -127,6 +127,8 @@ static void sha256_final(struct crypto_tfm *tfm, u8 *out)
127 127
128static struct crypto_alg alg = { 128static struct crypto_alg alg = {
129 .cra_name = "sha256", 129 .cra_name = "sha256",
130 .cra_driver_name = "sha256-s390",
131 .cra_priority = CRYPT_S390_PRIORITY,
130 .cra_flags = CRYPTO_ALG_TYPE_DIGEST, 132 .cra_flags = CRYPTO_ALG_TYPE_DIGEST,
131 .cra_blocksize = SHA256_BLOCK_SIZE, 133 .cra_blocksize = SHA256_BLOCK_SIZE,
132 .cra_ctxsize = sizeof(struct s390_sha256_ctx), 134 .cra_ctxsize = sizeof(struct s390_sha256_ctx),