Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13b79b97 authored by Huang Ying's avatar Huang Ying Committed by Herbert Xu
Browse files

crypto: aesni-intel - Fix irq_fpu_usable usage 



When renaming kernel_fpu_using to irq_fpu_usable, the semantics of the
function is changed too, from mesuring whether kernel is using FPU,
that is, the FPU is NOT available, to measuring whether FPU is usable,
that is, the FPU is available.

But the usage of irq_fpu_usable in aesni-intel_glue.c is not changed
accordingly. This patch fixes this.

Signed-off-by: default avatarHuang Ying <ying.huang@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 4c6ab3ee

arch/x86/crypto/aesni-intel_glue.c

+5 −5
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static int aes_set_key_common(struct crypto_tfm *tfm, void *raw_ctx, 
		return -EINVAL;

	}



	if (irq_fpu_usable())

	if (!irq_fpu_usable())

		err = crypto_aes_expand_key(ctx, in_key, key_len);

	else {

		kernel_fpu_begin();
@@ -103,7 +103,7 @@ static void aes_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) 
{

	struct crypto_aes_ctx *ctx = aes_ctx(crypto_tfm_ctx(tfm));



	if (irq_fpu_usable())

	if (!irq_fpu_usable())

		crypto_aes_encrypt_x86(ctx, dst, src);

	else {

		kernel_fpu_begin();
@@ -116,7 +116,7 @@ static void aes_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) 
{

	struct crypto_aes_ctx *ctx = aes_ctx(crypto_tfm_ctx(tfm));



	if (irq_fpu_usable())

	if (!irq_fpu_usable())

		crypto_aes_decrypt_x86(ctx, dst, src);

	else {

		kernel_fpu_begin();
@@ -342,7 +342,7 @@ static int ablk_encrypt(struct ablkcipher_request *req) 
	struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(req);

	struct async_aes_ctx *ctx = crypto_ablkcipher_ctx(tfm);



	if (irq_fpu_usable()) {

	if (!irq_fpu_usable()) {

		struct ablkcipher_request *cryptd_req =

			ablkcipher_request_ctx(req);

		memcpy(cryptd_req, req, sizeof(*req));
@@ -363,7 +363,7 @@ static int ablk_decrypt(struct ablkcipher_request *req) 
	struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(req);

	struct async_aes_ctx *ctx = crypto_ablkcipher_ctx(tfm);



	if (irq_fpu_usable()) {

	if (!irq_fpu_usable()) {

		struct ablkcipher_request *cryptd_req =

			ablkcipher_request_ctx(req);

		memcpy(cryptd_req, req, sizeof(*req));