ARM: dts: STiH407-family: Supply Mailbox properties to delta RProc

[karo-tx-linux.git] / crypto / tcrypt.c

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index 68064fc9c8ee3fe32ec78934910e6c4c1e8c435a..ae22f05d5936c724f830cd00afee303a85836dd5 100644 (file)
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -486,8 +486,10 @@ static void test_mb_ahash_speed(const char *algo, unsigned int sec,
 
                for (k = 0; k < 8; k++) {
                        ret = crypto_ahash_digest(data[k].req);
-                       if (ret == -EINPROGRESS)
+                       if (ret == -EINPROGRESS) {
+                               ret = 0;
                                continue;
+                       }
 
                        if (ret)
                                break;
@@ -1311,6 +1313,22 @@ static int do_test(const char *alg, u32 type, u32 mask, int m)
                ret += tcrypt_test("hmac(crc32)");
                break;
 
+       case 111:
+               ret += tcrypt_test("hmac(sha3-224)");
+               break;
+
+       case 112:
+               ret += tcrypt_test("hmac(sha3-256)");
+               break;
+
+       case 113:
+               ret += tcrypt_test("hmac(sha3-384)");
+               break;
+
+       case 114:
+               ret += tcrypt_test("hmac(sha3-512)");
+               break;
+
        case 150:
                ret += tcrypt_test("ansi_cprng");
                break;
@@ -1389,6 +1407,10 @@ static int do_test(const char *alg, u32 type, u32 mask, int m)
                                speed_template_32_48_64);
                test_cipher_speed("xts(aes)", DECRYPT, sec, NULL, 0,
                                speed_template_32_48_64);
+               test_cipher_speed("cts(cbc(aes))", ENCRYPT, sec, NULL, 0,
+                               speed_template_16_24_32);
+               test_cipher_speed("cts(cbc(aes))", DECRYPT, sec, NULL, 0,
+                               speed_template_16_24_32);
                test_cipher_speed("ctr(aes)", ENCRYPT, sec, NULL, 0,
                                speed_template_16_24_32);
                test_cipher_speed("ctr(aes)", DECRYPT, sec, NULL, 0,
@@ -1818,6 +1840,10 @@ static int do_test(const char *alg, u32 type, u32 mask, int m)
                                   speed_template_32_48_64);
                test_acipher_speed("xts(aes)", DECRYPT, sec, NULL, 0,
                                   speed_template_32_48_64);
+               test_acipher_speed("cts(cbc(aes))", ENCRYPT, sec, NULL, 0,
+                                  speed_template_16_24_32);
+               test_acipher_speed("cts(cbc(aes))", DECRYPT, sec, NULL, 0,
+                                  speed_template_16_24_32);
                test_acipher_speed("ctr(aes)", ENCRYPT, sec, NULL, 0,
                                   speed_template_16_24_32);
                test_acipher_speed("ctr(aes)", DECRYPT, sec, NULL, 0,