Commit 49b9258b authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: qce - fix priority to be less than ARMv8 CE 



As QCE is an order of magnitude slower than the ARMv8 Crypto Extensions
on the CPU, and is also less well tested, give it a lower priority.
Previously the QCE SHA algorithms had higher priority than the ARMv8 CE
equivalents, and the ciphers such as AES-XTS had the same priority which
meant the QCE versions were chosen if they happened to be loaded later.

Fixes: ec8f5d8f ("crypto: qce - Qualcomm crypto engine driver")
Cc: stable@vger.kernel.org
Cc: Bartosz Golaszewski <brgl@bgdev.pl>
Cc: Neil Armstrong <neil.armstrong@linaro.org>
Cc: Thara Gopinath <thara.gopinath@gmail.com>
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Reviewed-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent f1e532d0

drivers/crypto/qce/aead.c

+1 −1
Original line number Diff line number Diff line
@@ -786,7 +786,7 @@ static int qce_aead_register_one(const struct qce_aead_def *def, struct qce_devi 
	alg->init			= qce_aead_init;

	alg->exit			= qce_aead_exit;



	alg->base.cra_priority		= 300;

	alg->base.cra_priority		= 275;

	alg->base.cra_flags		= CRYPTO_ALG_ASYNC |

					  CRYPTO_ALG_ALLOCATES_MEMORY |

					  CRYPTO_ALG_KERN_DRIVER_ONLY |

drivers/crypto/qce/sha.c

+1 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ static int qce_ahash_register_one(const struct qce_ahash_def *def, 


	base = &alg->halg.base;

	base->cra_blocksize = def->blocksize;

	base->cra_priority = 300;

	base->cra_priority = 175;

	base->cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY;

	base->cra_ctxsize = sizeof(struct qce_sha_ctx);

	base->cra_alignmask = 0;

drivers/crypto/qce/skcipher.c

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ static int qce_skcipher_register_one(const struct qce_skcipher_def *def, 
	alg->encrypt			= qce_skcipher_encrypt;

	alg->decrypt			= qce_skcipher_decrypt;



	alg->base.cra_priority		= 300;

	alg->base.cra_priority		= 275;

	alg->base.cra_flags		= CRYPTO_ALG_ASYNC |

					  CRYPTO_ALG_ALLOCATES_MEMORY |

					  CRYPTO_ALG_KERN_DRIVER_ONLY;