Commit b8e50548 authored by Mark Brown's avatar Mark Brown Committed by Catalin Marinas
Browse files

arm64: crypto: Modernize names for AES function macros 



Now that the rest of the code has been converted to the modern START/END
macros the AES_ENTRY() and AES_ENDPROC() macros look out of place and
like they need updating. Rename them to AES_FUNC_START() and AES_FUNC_END()
to line up with the modern style assembly macros.

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 2ca86c34

arch/arm64/crypto/aes-ce.S

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 
#include <linux/linkage.h>

#include <asm/assembler.h>



#define AES_ENTRY(func)		SYM_FUNC_START(ce_ ## func)

#define AES_ENDPROC(func)	SYM_FUNC_END(ce_ ## func)

#define AES_FUNC_START(func)		SYM_FUNC_START(ce_ ## func)

#define AES_FUNC_END(func)		SYM_FUNC_END(ce_ ## func)



	.arch		armv8-a+crypto

arch/arm64/crypto/aes-modes.S

+24 −24
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ SYM_FUNC_END(aes_decrypt_block5x) 
	 *		   int blocks)

	 */



AES_ENTRY(aes_ecb_encrypt)

AES_FUNC_START(aes_ecb_encrypt)

	stp		x29, x30, [sp, #-16]!

	mov		x29, sp
@@ -79,10 +79,10 @@ ST5( st1 {v4.16b}, [x0], #16 ) 
.Lecbencout:

	ldp		x29, x30, [sp], #16

	ret

AES_ENDPROC(aes_ecb_encrypt)

AES_FUNC_END(aes_ecb_encrypt)





AES_ENTRY(aes_ecb_decrypt)

AES_FUNC_START(aes_ecb_decrypt)

	stp		x29, x30, [sp, #-16]!

	mov		x29, sp
@@ -110,7 +110,7 @@ ST5( st1 {v4.16b}, [x0], #16 ) 
.Lecbdecout:

	ldp		x29, x30, [sp], #16

	ret

AES_ENDPROC(aes_ecb_decrypt)

AES_FUNC_END(aes_ecb_decrypt)





	/*
@@ -126,7 +126,7 @@ AES_ENDPROC(aes_ecb_decrypt) 
	 *			 u32 const rk2[]);

	 */



AES_ENTRY(aes_essiv_cbc_encrypt)

AES_FUNC_START(aes_essiv_cbc_encrypt)

	ld1		{v4.16b}, [x5]			/* get iv */



	mov		w8, #14				/* AES-256: 14 rounds */
@@ -135,7 +135,7 @@ AES_ENTRY(aes_essiv_cbc_encrypt) 
	enc_switch_key	w3, x2, x6

	b		.Lcbcencloop4x



AES_ENTRY(aes_cbc_encrypt)

AES_FUNC_START(aes_cbc_encrypt)

	ld1		{v4.16b}, [x5]			/* get iv */

	enc_prepare	w3, x2, x6
@@ -167,10 +167,10 @@ AES_ENTRY(aes_cbc_encrypt) 
.Lcbcencout:

	st1		{v4.16b}, [x5]			/* return iv */

	ret

AES_ENDPROC(aes_cbc_encrypt)

AES_ENDPROC(aes_essiv_cbc_encrypt)

AES_FUNC_END(aes_cbc_encrypt)

AES_FUNC_END(aes_essiv_cbc_encrypt)



AES_ENTRY(aes_essiv_cbc_decrypt)

AES_FUNC_START(aes_essiv_cbc_decrypt)

	stp		x29, x30, [sp, #-16]!

	mov		x29, sp
@@ -181,7 +181,7 @@ AES_ENTRY(aes_essiv_cbc_decrypt) 
	encrypt_block	cbciv, w8, x6, x7, w9

	b		.Lessivcbcdecstart



AES_ENTRY(aes_cbc_decrypt)

AES_FUNC_START(aes_cbc_decrypt)

	stp		x29, x30, [sp, #-16]!

	mov		x29, sp
@@ -238,8 +238,8 @@ ST5( st1 {v4.16b}, [x0], #16 ) 
	st1		{cbciv.16b}, [x5]		/* return iv */

	ldp		x29, x30, [sp], #16

	ret

AES_ENDPROC(aes_cbc_decrypt)

AES_ENDPROC(aes_essiv_cbc_decrypt)

AES_FUNC_END(aes_cbc_decrypt)

AES_FUNC_END(aes_essiv_cbc_decrypt)





	/*
@@ -249,7 +249,7 @@ AES_ENDPROC(aes_essiv_cbc_decrypt) 
	 *		       int rounds, int bytes, u8 const iv[])

	 */



AES_ENTRY(aes_cbc_cts_encrypt)

AES_FUNC_START(aes_cbc_cts_encrypt)

	adr_l		x8, .Lcts_permute_table

	sub		x4, x4, #16

	add		x9, x8, #32
@@ -276,9 +276,9 @@ AES_ENTRY(aes_cbc_cts_encrypt) 
	st1		{v0.16b}, [x4]			/* overlapping stores */

	st1		{v1.16b}, [x0]

	ret

AES_ENDPROC(aes_cbc_cts_encrypt)

AES_FUNC_END(aes_cbc_cts_encrypt)



AES_ENTRY(aes_cbc_cts_decrypt)

AES_FUNC_START(aes_cbc_cts_decrypt)

	adr_l		x8, .Lcts_permute_table

	sub		x4, x4, #16

	add		x9, x8, #32
@@ -305,7 +305,7 @@ AES_ENTRY(aes_cbc_cts_decrypt) 
	st1		{v2.16b}, [x4]			/* overlapping stores */

	st1		{v0.16b}, [x0]

	ret

AES_ENDPROC(aes_cbc_cts_decrypt)

AES_FUNC_END(aes_cbc_cts_decrypt)



	.section	".rodata", "a"

	.align		6
@@ -324,7 +324,7 @@ AES_ENDPROC(aes_cbc_cts_decrypt) 
	 *		   int blocks, u8 ctr[])

	 */



AES_ENTRY(aes_ctr_encrypt)

AES_FUNC_START(aes_ctr_encrypt)

	stp		x29, x30, [sp, #-16]!

	mov		x29, sp
@@ -409,7 +409,7 @@ ST5( st1 {v4.16b}, [x0], #16 ) 
	rev		x7, x7

	ins		vctr.d[0], x7

	b		.Lctrcarrydone

AES_ENDPROC(aes_ctr_encrypt)

AES_FUNC_END(aes_ctr_encrypt)





	/*
@@ -433,7 +433,7 @@ AES_ENDPROC(aes_ctr_encrypt) 
	uzp1		xtsmask.4s, xtsmask.4s, \tmp\().4s

	.endm



AES_ENTRY(aes_xts_encrypt)

AES_FUNC_START(aes_xts_encrypt)

	stp		x29, x30, [sp, #-16]!

	mov		x29, sp
@@ -518,9 +518,9 @@ AES_ENTRY(aes_xts_encrypt) 
	st1		{v2.16b}, [x4]			/* overlapping stores */

	mov		w4, wzr

	b		.Lxtsencctsout

AES_ENDPROC(aes_xts_encrypt)

AES_FUNC_END(aes_xts_encrypt)



AES_ENTRY(aes_xts_decrypt)

AES_FUNC_START(aes_xts_decrypt)

	stp		x29, x30, [sp, #-16]!

	mov		x29, sp
@@ -612,13 +612,13 @@ AES_ENTRY(aes_xts_decrypt) 
	st1		{v2.16b}, [x4]			/* overlapping stores */

	mov		w4, wzr

	b		.Lxtsdecctsout

AES_ENDPROC(aes_xts_decrypt)

AES_FUNC_END(aes_xts_decrypt)



	/*

	 * aes_mac_update(u8 const in[], u32 const rk[], int rounds,

	 *		  int blocks, u8 dg[], int enc_before, int enc_after)

	 */

AES_ENTRY(aes_mac_update)

AES_FUNC_START(aes_mac_update)

	frame_push	6



	mov		x19, x0
@@ -676,4 +676,4 @@ AES_ENTRY(aes_mac_update) 
	ld1		{v0.16b}, [x23]			/* get dg */

	enc_prepare	w21, x20, x0

	b		.Lmacloop4x

AES_ENDPROC(aes_mac_update)
 
AES_FUNC_END(aes_mac_update)

arch/arm64/crypto/aes-neon.S

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 
#include <linux/linkage.h>

#include <asm/assembler.h>



#define AES_ENTRY(func)		SYM_FUNC_START(neon_ ## func)

#define AES_ENDPROC(func)	SYM_FUNC_END(neon_ ## func)

#define AES_FUNC_START(func)		SYM_FUNC_START(neon_ ## func)

#define AES_FUNC_END(func)		SYM_FUNC_END(neon_ ## func)



	xtsmask		.req	v7

	cbciv		.req	v7

CRA Git | Maintained and supported by SUSTech CRA and CCSE