Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01e3b3cb authored by Max Filippov's avatar Max Filippov Committed by Chris Zankel
Browse files

xtensa: fix __delay for small loop count 



Avoid __delay counter underflow for loop counts < 2.

Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Signed-off-by: default avatarChris Zankel <chris@zankel.net>
parent 5515daa9

arch/xtensa/include/asm/delay.h

+6 −3
Original line number Diff line number Diff line
@@ -19,9 +19,12 @@ extern unsigned long loops_per_jiffy; 


static inline void __delay(unsigned long loops)

{

	if (__builtin_constant_p(loops) && loops < 2)

		__asm__ __volatile__ ("nop");

	else if (loops >= 2)

		/* 2 cycles per loop. */

		__asm__ __volatile__ ("1: addi %0, %0, -2; bgeui %0, 2, 1b"

			      : "=r" (loops) : "0" (loops));

				: "+r" (loops));

}



/* For SMP/NUMA systems, change boot_cpu_data to something like