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

Commit 5cfed7b3 authored by Mathias Krause's avatar Mathias Krause Committed by Herbert Xu
Browse files

Revert "crypto: aesni - disable "by8" AVX CTR optimization" 



This reverts commit 7da4b29d.

Now, that the issue is fixed, we can re-enable the code.

Signed-off-by: default avatarMathias Krause <minipli@googlemail.com>
Cc: Chandramouli Narayanan <mouli@linux.intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 9561dccb

arch/x86/crypto/aesni-intel_glue.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -481,7 +481,7 @@ static void ctr_crypt_final(struct crypto_aes_ctx *ctx, 
	crypto_inc(ctrblk, AES_BLOCK_SIZE);

	crypto_inc(ctrblk, AES_BLOCK_SIZE);

}

}





#if 0	/* temporary disabled due to failing crypto tests */

#ifdef CONFIG_AS_AVX

static void aesni_ctr_enc_avx_tfm(struct crypto_aes_ctx *ctx, u8 *out,

static void aesni_ctr_enc_avx_tfm(struct crypto_aes_ctx *ctx, u8 *out,

			      const u8 *in, unsigned int len, u8 *iv)

			      const u8 *in, unsigned int len, u8 *iv)

{

{
@@ -1522,7 +1522,7 @@ static int __init aesni_init(void) 
		aesni_gcm_dec_tfm = aesni_gcm_dec;

		aesni_gcm_dec_tfm = aesni_gcm_dec;

	}

	}

	aesni_ctr_enc_tfm = aesni_ctr_enc;

	aesni_ctr_enc_tfm = aesni_ctr_enc;

#if 0	/* temporary disabled due to failing crypto tests */

#ifdef CONFIG_AS_AVX

	if (cpu_has_avx) {

	if (cpu_has_avx) {

		/* optimize performance of ctr mode encryption transform */

		/* optimize performance of ctr mode encryption transform */

		aesni_ctr_enc_tfm = aesni_ctr_enc_avx_tfm;

		aesni_ctr_enc_tfm = aesni_ctr_enc_avx_tfm;