Commit 2ca86c34 authored by Mark Brown's avatar Mark Brown Committed by Catalin Marinas

arm64: crypto: Modernize some extra assembly annotations

A couple of functions were missed in the modernisation of assembly macros,
update them too.
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent f8788d86
...@@ -587,20 +587,20 @@ CPU_LE( rev w8, w8 ) ...@@ -587,20 +587,20 @@ CPU_LE( rev w8, w8 )
* struct ghash_key const *k, u64 dg[], u8 ctr[], * struct ghash_key const *k, u64 dg[], u8 ctr[],
* int rounds, u8 tag) * int rounds, u8 tag)
*/ */
ENTRY(pmull_gcm_encrypt) SYM_FUNC_START(pmull_gcm_encrypt)
pmull_gcm_do_crypt 1 pmull_gcm_do_crypt 1
ENDPROC(pmull_gcm_encrypt) SYM_FUNC_END(pmull_gcm_encrypt)
/* /*
* void pmull_gcm_decrypt(int blocks, u8 dst[], const u8 src[], * void pmull_gcm_decrypt(int blocks, u8 dst[], const u8 src[],
* struct ghash_key const *k, u64 dg[], u8 ctr[], * struct ghash_key const *k, u64 dg[], u8 ctr[],
* int rounds, u8 tag) * int rounds, u8 tag)
*/ */
ENTRY(pmull_gcm_decrypt) SYM_FUNC_START(pmull_gcm_decrypt)
pmull_gcm_do_crypt 0 pmull_gcm_do_crypt 0
ENDPROC(pmull_gcm_decrypt) SYM_FUNC_END(pmull_gcm_decrypt)
pmull_gcm_ghash_4x: SYM_FUNC_START_LOCAL(pmull_gcm_ghash_4x)
movi MASK.16b, #0xe1 movi MASK.16b, #0xe1
shl MASK.2d, MASK.2d, #57 shl MASK.2d, MASK.2d, #57
...@@ -681,9 +681,9 @@ pmull_gcm_ghash_4x: ...@@ -681,9 +681,9 @@ pmull_gcm_ghash_4x:
eor XL.16b, XL.16b, T2.16b eor XL.16b, XL.16b, T2.16b
ret ret
ENDPROC(pmull_gcm_ghash_4x) SYM_FUNC_END(pmull_gcm_ghash_4x)
pmull_gcm_enc_4x: SYM_FUNC_START_LOCAL(pmull_gcm_enc_4x)
ld1 {KS0.16b}, [x5] // load upper counter ld1 {KS0.16b}, [x5] // load upper counter
sub w10, w8, #4 sub w10, w8, #4
sub w11, w8, #3 sub w11, w8, #3
...@@ -746,7 +746,7 @@ pmull_gcm_enc_4x: ...@@ -746,7 +746,7 @@ pmull_gcm_enc_4x:
eor INP3.16b, INP3.16b, KS3.16b eor INP3.16b, INP3.16b, KS3.16b
ret ret
ENDPROC(pmull_gcm_enc_4x) SYM_FUNC_END(pmull_gcm_enc_4x)
.section ".rodata", "a" .section ".rodata", "a"
.align 6 .align 6
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment