Commit 3e5e5107 authored Apr 17, 2023 by Heiko Carstens Committed by Vasily Gorbik Apr 19, 2023

s390/crypto,chacha: use SYM* macros instead of ENTRY(), etc.



Consistently use the SYM* family of macros instead of the
deprecated ENTRY(), ENDPROC(), etc. family of macros.

Acked-by: Harald Freudenberger <freude@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

parent ac0c06a1

arch/s390/crypto/chacha-s390.S

+24 −23

Original line number	Diff line number	Diff line
		@@ -14,9 +14,9 @@
		#define FRAME (16 * 8 + 4 * 8)

		.data
		.align 32
		.balign 32

		.Lsigma:
		SYM_DATA_START_LOCAL(sigma)
		.long 0x61707865,0x3320646e,0x79622d32,0x6b206574 # endian-neutral
		.long 1,0,0,0
		.long 2,0,0,0
		@@ -28,6 +28,7 @@
		.long 0x3320646e,0x3320646e,0x3320646e,0x3320646e
		.long 0x79622d32,0x79622d32,0x79622d32,0x79622d32
		.long 0x6b206574,0x6b206574,0x6b206574,0x6b206574
		SYM_DATA_END(sigma)

		.previous

		@@ -78,10 +79,10 @@
		#define XT2 %v29
		#define XT3 %v30

		ENTRY(chacha20_vx_4x)
		SYM_FUNC_START(chacha20_vx_4x)
		stmg %r6,%r7,6*8(SP)

		larl %r7,.Lsigma
		larl %r7,sigma
		lhi %r0,10
		lhi %r1,0

		@@ -403,7 +404,7 @@ ENTRY(chacha20_vx_4x)

		lmg %r6,%r7,6*8(SP)
		BR_EX %r14
		ENDPROC(chacha20_vx_4x)
		SYM_FUNC_END(chacha20_vx_4x)

		#undef OUT
		#undef INP
		@@ -471,7 +472,7 @@ ENDPROC(chacha20_vx_4x)
		#define T2 %v29
		#define T3 %v30

		ENTRY(chacha20_vx)
		SYM_FUNC_START(chacha20_vx)
		clgfi LEN,256
		jle chacha20_vx_4x
		stmg %r6,%r7,6*8(SP)
		@@ -481,7 +482,7 @@ ENTRY(chacha20_vx)
		la SP,0(%r1,SP)
		stg %r0,0(SP) # back-chain

		larl %r7,.Lsigma
		larl %r7,sigma
		lhi %r0,10

		VLM K1,K2,0,KEY,0 # load key
		@@ -902,6 +903,6 @@ ENTRY(chacha20_vx)
		lmg %r6,%r7,FRAME+6*8(SP)
		la SP,FRAME(SP)
		BR_EX %r14
		ENDPROC(chacha20_vx)
		SYM_FUNC_END(chacha20_vx)

		.previous