Commit 4e0146a9 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: arm64/sha256 - fix build when CONFIG_PREEMPT_VOLUNTARY=y 



Fix the build of sha256-ce.S when CONFIG_PREEMPT_VOLUNTARY=y by passing
the correct label to the cond_yield macro.  Also adjust the code to
execute only one branch instruction when CONFIG_PREEMPT_VOLUNTARY=n.

Fixes: 6e36be51 ("crypto: arm64/sha256 - implement library instead of shash")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202505071811.yYpLUbav-lkp@intel.com/


Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 3bbc902e

arch/arm64/lib/crypto/sha256-ce.S

+4 −3
Original line number Diff line number Diff line
@@ -123,10 +123,11 @@ CPU_LE( rev32 v19.16b, v19.16b ) 
	add		dgav.4s, dgav.4s, dg0v.4s

	add		dgbv.4s, dgbv.4s, dg1v.4s



	/* return early if voluntary preemption is needed */

	cond_yield	1f, x5, x6



	/* handled all input blocks? */

	cbz		x2, 1f

	cond_yield	3f, x5, x6

	b		0b

	cbnz		x2, 0b



	/* store new state */

1:	st1		{dgav.4s, dgbv.4s}, [x0]