Commit be6d6993 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu
Browse files

crypto: arm/aes-neonbs - avoid loading reorder argument on encryption 



Reordering the tweak is never necessary for encryption, so avoid the
argument load on the encryption path.

Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 45a4777e

arch/arm/crypto/aes-neonbs-core.S

+3 −2
Original line number Diff line number Diff line
@@ -956,8 +956,7 @@ ENDPROC(__xts_prepare8) 
	push		{r4-r8, lr}

	mov		r5, sp			// preserve sp

	ldrd		r6, r7, [sp, #24]	// get blocks and iv args

	ldr		r8, [sp, #32]		// reorder final tweak?

	rsb		r8, r8, #1

	rsb		r8, ip, #1

	sub		ip, sp, #128		// make room for 8x tweak

	bic		ip, ip, #0xf		// align sp to 16 bytes

	mov		sp, ip
@@ -1013,9 +1012,11 @@ ENDPROC(__xts_prepare8) 
	.endm



ENTRY(aesbs_xts_encrypt)

	mov		ip, #0			// never reorder final tweak

	__xts_crypt	aesbs_encrypt8, q0, q1, q4, q6, q3, q7, q2, q5

ENDPROC(aesbs_xts_encrypt)



ENTRY(aesbs_xts_decrypt)

	ldr		ip, [sp, #8]		// reorder final tweak?

	__xts_crypt	aesbs_decrypt8, q0, q1, q6, q4, q2, q7, q3, q5

ENDPROC(aesbs_xts_decrypt)