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

This reverts commit 604880107010a1e5794552d184cd5471ea31b973.

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

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

2 files changed, 0 insertions, 30 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index d1ca6312d798..4ef0ee715171 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -839,24 +839,6 @@ config CRYPTO_BLOWFISH_X86_64
           See also:
           <http://www.schneier.com/blowfish.html>
 
-config CRYPTO_BLOWFISH_AVX2_X86_64
-        tristate "Blowfish cipher algorithm (x86_64/AVX2)"
-        depends on X86 && 64BIT
-        select CRYPTO_ALGAPI
-        select CRYPTO_CRYPTD
-        select CRYPTO_ABLK_HELPER_X86
-        select CRYPTO_BLOWFISH_COMMON
-        select CRYPTO_BLOWFISH_X86_64
-        help
-          Blowfish cipher algorithm (x86_64/AVX2), by Bruce Schneier.
-
-          This is a variable key length cipher which can use keys from 32
-          bits to 448 bits in length.  It's fast, simple and specifically
-          designed for use on "large microprocessors".
-
-          See also:
-          <http://www.schneier.com/blowfish.html>
-
 config CRYPTO_CAMELLIA
         tristate "Camellia cipher algorithms"
         depends on CRYPTO
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index f19a392ade78..27f111876523 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -1661,9 +1661,6 @@ static const struct alg_test_desc alg_test_descs[] = {
                 .test = alg_test_null,
                 .fips_allowed = 1,
         }, {
-                .alg = "__driver-cbc-blowfish-avx2",
-                .test = alg_test_null,
-        }, {
                 .alg = "__driver-cbc-camellia-aesni",
                 .test = alg_test_null,
         }, {
@@ -1695,9 +1692,6 @@ static const struct alg_test_desc alg_test_descs[] = {
                 .test = alg_test_null,
                 .fips_allowed = 1,
         }, {
-                .alg = "__driver-ecb-blowfish-avx2",
-                .test = alg_test_null,
-        }, {
                 .alg = "__driver-ecb-camellia-aesni",
                 .test = alg_test_null,
         }, {
@@ -1988,9 +1982,6 @@ static const struct alg_test_desc alg_test_descs[] = {
                 .test = alg_test_null,
                 .fips_allowed = 1,
         }, {
-                .alg = "cryptd(__driver-cbc-blowfish-avx2)",
-                .test = alg_test_null,
-        }, {
                 .alg = "cryptd(__driver-cbc-camellia-aesni)",
                 .test = alg_test_null,
         }, {
@@ -2004,9 +1995,6 @@ static const struct alg_test_desc alg_test_descs[] = {
                 .test = alg_test_null,
                 .fips_allowed = 1,
         }, {
-                .alg = "cryptd(__driver-ecb-blowfish-avx2)",
-                .test = alg_test_null,
-        }, {
                 .alg = "cryptd(__driver-ecb-camellia-aesni)",
                 .test = alg_test_null,
         }, {