diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-11-14 12:32:49 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-11-14 16:27:43 +0100 |
| commit | 6f388adef82057675c61b24afb7b2e0d8136c3fd (patch) | |
| tree | 32c9e1d4a4ac202178c185886e96a07a9e407cec /target/linux/layerscape/patches-4.9/804-crypto-support-layerscape.patch | |
| parent | b0d08ec3aef3cc4fb105f1d65681907ebef9be0f (diff) | |
| download | upstream-6f388adef82057675c61b24afb7b2e0d8136c3fd.tar.gz upstream-6f388adef82057675c61b24afb7b2e0d8136c3fd.tar.bz2 upstream-6f388adef82057675c61b24afb7b2e0d8136c3fd.zip | |
kernel: bump 4.9 to 4.9.137
Refreshed all patches.
Removed upstreamed hunks:
- 703-phy-support-layerscape.patch
Compile-tested on: ar71xx
Runtime-tested on: ar71xx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/layerscape/patches-4.9/804-crypto-support-layerscape.patch')
| -rw-r--r-- | target/linux/layerscape/patches-4.9/804-crypto-support-layerscape.patch | 12 |
1 files changed, 6 insertions, 6 deletions
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 a143ad566b..0252713480 100644 --- a/target/linux/layerscape/patches-4.9/804-crypto-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.9/804-crypto-support-layerscape.patch @@ -781,7 +781,7 @@ Signed-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; @@ -792,7 +792,7 @@ Signed-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; @@ -802,7 +802,7 @@ Signed-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, @@ -814,7 +814,7 @@ Signed-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, @@ -27756,8 +27756,8 @@ Signed-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) |