Revert "crypto: twofish - add AVX2/x86_64 assembler implementation of twofish cipher"

This reverts commit cf1521a1a5e21fd1e79a458605c4282fbfbbeee2.

Instruction (vpgatherdd) that this implementation relied on turned out to be
slow performer on real hardware (i5-4570). The previous 8-way twofish/AVX
implementation is therefore faster and this implementation should be removed.

Converting this implementation to use the same method as in twofish/AVX for
table look-ups would give additional ~3% speed up vs twofish/AVX, but would
hardly be worth of the added code and binary size.

Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

2 files changed, 0 insertions, 36 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 4ef0ee715171..904ffe838567 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -1297,30 +1297,6 @@ config CRYPTO_TWOFISH_AVX_X86_64
           See also:
           <http://www.schneier.com/twofish.html>
 
-config CRYPTO_TWOFISH_AVX2_X86_64
-        tristate "Twofish cipher algorithm (x86_64/AVX2)"
-        depends on X86 && 64BIT
-        select CRYPTO_ALGAPI
-        select CRYPTO_CRYPTD
-        select CRYPTO_ABLK_HELPER_X86
-        select CRYPTO_GLUE_HELPER_X86
-        select CRYPTO_TWOFISH_COMMON
-        select CRYPTO_TWOFISH_X86_64
-        select CRYPTO_TWOFISH_X86_64_3WAY
-        select CRYPTO_TWOFISH_AVX_X86_64
-        select CRYPTO_LRW
-        select CRYPTO_XTS
-        help
-          Twofish cipher algorithm (x86_64/AVX2).
-
-          Twofish was submitted as an AES (Advanced Encryption Standard)
-          candidate cipher by researchers at CounterPane Systems.  It is a
-          16 round block cipher supporting key sizes of 128, 192, and 256
-          bits.
-
-          See also:
-          <http://www.schneier.com/twofish.html>
-
 comment "Compression"
 
 config CRYPTO_DEFLATE
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 27f111876523..b2bc5334c170 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -1654,9 +1654,6 @@ static const struct alg_test_desc alg_test_descs[] = {
                 .alg = "__cbc-twofish-avx",
                 .test = alg_test_null,
         }, {
-                .alg = "__cbc-twofish-avx2",
-                .test = alg_test_null,
-        }, {
                 .alg = "__driver-cbc-aes-aesni",
                 .test = alg_test_null,
                 .fips_allowed = 1,
@@ -1685,9 +1682,6 @@ static const struct alg_test_desc alg_test_descs[] = {
                 .alg = "__driver-cbc-twofish-avx",
                 .test = alg_test_null,
         }, {
-                .alg = "__driver-cbc-twofish-avx2",
-                .test = alg_test_null,
-        }, {
                 .alg = "__driver-ecb-aes-aesni",
                 .test = alg_test_null,
                 .fips_allowed = 1,
@@ -1716,9 +1710,6 @@ static const struct alg_test_desc alg_test_descs[] = {
                 .alg = "__driver-ecb-twofish-avx",
                 .test = alg_test_null,
         }, {
-                .alg = "__driver-ecb-twofish-avx2",
-                .test = alg_test_null,
-        }, {
                 .alg = "__ghash-pclmulqdqni",
                 .test = alg_test_null,
                 .fips_allowed = 1,
@@ -2019,9 +2010,6 @@ static const struct alg_test_desc alg_test_descs[] = {
                 .alg = "cryptd(__driver-ecb-twofish-avx)",
                 .test = alg_test_null,
         }, {
-                .alg = "cryptd(__driver-ecb-twofish-avx2)",
-                .test = alg_test_null,
-        }, {
                 .alg = "cryptd(__driver-gcm-aes-aesni)",
                 .test = alg_test_null,
                 .fips_allowed = 1,