Commit 3284cd63 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge remote-tracking branch 'arm64/for-next/neon-softirqs-disabled' into kvmarm-master/next 



Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents 83208329 13150149

arch/arm64/crypto/aes-modes.S

+1 −1
Original line number Diff line number Diff line
@@ -700,7 +700,7 @@ AES_FUNC_START(aes_mac_update) 
	cbz		w5, .Lmacout

	encrypt_block	v0, w2, x1, x7, w8

	st1		{v0.16b}, [x4]			/* return dg */

	cond_yield	.Lmacout, x7

	cond_yield	.Lmacout, x7, x8

	b		.Lmacloop4x

.Lmac1x:

	add		w3, w3, #4

arch/arm64/crypto/sha1-ce-core.S

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ CPU_LE( rev32 v11.16b, v11.16b ) 
	add		dgav.4s, dgav.4s, dg0v.4s



	cbz		w2, 2f

	cond_yield	3f, x5

	cond_yield	3f, x5, x6

	b		0b



	/*

arch/arm64/crypto/sha2-ce-core.S

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ CPU_LE( rev32 v19.16b, v19.16b ) 


	/* handled all input blocks? */

	cbz		w2, 2f

	cond_yield	3f, x5

	cond_yield	3f, x5, x6

	b		0b



	/*

arch/arm64/crypto/sha3-ce-core.S

+2 −2
Original line number Diff line number Diff line
@@ -184,11 +184,11 @@ SYM_FUNC_START(sha3_ce_transform) 
	eor	 v0.16b,  v0.16b, v31.16b



	cbnz	w8, 3b

	cond_yield 3f, x8

	cond_yield 4f, x8, x9

	cbnz	w2, 0b



	/* save state */

3:	st1	{ v0.1d- v3.1d}, [x0], #32

4:	st1	{ v0.1d- v3.1d}, [x0], #32

	st1	{ v4.1d- v7.1d}, [x0], #32

	st1	{ v8.1d-v11.1d}, [x0], #32

	st1	{v12.1d-v15.1d}, [x0], #32

arch/arm64/crypto/sha512-ce-core.S

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ CPU_LE( rev64 v19.16b, v19.16b ) 
	add		v10.2d, v10.2d, v2.2d

	add		v11.2d, v11.2d, v3.2d



	cond_yield	3f, x4

	cond_yield	3f, x4, x5

	/* handled all input blocks? */

	cbnz		w2, 0b