kernel: bump 4.9 to 4.9.137

[openwrt/staging/wigyori.git] / target / linux / layerscape / patches-4.9 / 804-crypto-support-layerscape.patch

diff --git a/target/linux/layerscape/patches-4.9/804-crypto-support-layerscape.patch b/target/linux/layerscape/patches-4.9/804-crypto-support-layerscape.patch
index 56a3dc01c48a91dac3a7db1d563bc930bbb85957..714fba3a7e6b14b7e7a2fbfdcdba3f7088ec62dd 100644 (file)
--- a/target/linux/layerscape/patches-4.9/804-crypto-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.9/804-crypto-support-layerscape.patch
@@ -782,7 +782,7 @@ Singed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  };
  
  struct tcrypt_result {
-@@ -1333,6 +1333,10 @@ static int do_test(const char *alg, u32
+@@ -1336,6 +1336,10 @@ static int do_test(const char *alg, u32
                ret += tcrypt_test("hmac(sha3-512)");
                break;
  
@@ -793,7 +793,7 @@ Singed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        case 150:
                ret += tcrypt_test("ansi_cprng");
                break;
-@@ -1394,6 +1398,9 @@ static int do_test(const char *alg, u32
+@@ -1397,6 +1401,9 @@ static int do_test(const char *alg, u32
        case 190:
                ret += tcrypt_test("authenc(hmac(sha512),cbc(des3_ede))");
                break;
@@ -803,7 +803,7 @@ Singed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        case 200:
                test_cipher_speed("ecb(aes)", ENCRYPT, sec, NULL, 0,
                                speed_template_16_24_32);
-@@ -1408,9 +1415,9 @@ static int do_test(const char *alg, u32
+@@ -1411,9 +1418,9 @@ static int do_test(const char *alg, u32
                test_cipher_speed("lrw(aes)", DECRYPT, sec, NULL, 0,
                                speed_template_32_40_48);
                test_cipher_speed("xts(aes)", ENCRYPT, sec, NULL, 0,
@@ -815,7 +815,7 @@ Singed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
                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,
-@@ -1841,9 +1848,9 @@ static int do_test(const char *alg, u32
+@@ -1844,9 +1851,9 @@ static int do_test(const char *alg, u32
                test_acipher_speed("lrw(aes)", DECRYPT, sec, NULL, 0,
                                   speed_template_32_40_48);
                test_acipher_speed("xts(aes)", ENCRYPT, sec, NULL, 0,
@@ -28208,8 +28208,8 @@ Singed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  extern bool caam_little_end;
 +extern bool caam_imx;
  
- #define caam_to_cpu(len)                              \
- static inline u##len caam##len ## _to_cpu(u##len val) \
+ #define caam_to_cpu(len)                                              \
+ static inline u##len caam##len ## _to_cpu(u##len val)                 \
 @@ -154,13 +156,10 @@ static inline u64 rd_reg64(void __iomem
  #else /* CONFIG_64BIT */
  static inline void wr_reg64(void __iomem *reg, u64 data)