Commit 3cfb3019 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Russell King (Oracle)
Browse files

ARM: 9197/1: spectre-bhb: fix loop8 sequence for Thumb2 



In Thumb2, 'b . + 4' produces a branch instruction that uses a narrow
encoding, and so it does not jump to the following instruction as
expected. So use W(b) instead.

Fixes: 6c7cb60b ("ARM: fix Thumb2 regression with Spectre BHB")
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
parent 0dc14aa9

arch/arm/kernel/entry-armv.S

+1 −1
Original line number Diff line number Diff line
@@ -1145,7 +1145,7 @@ vector_bhb_loop8_\name: 


	@ bhb workaround

	mov	r0, #8

3:	b	. + 4

3:	W(b)	. + 4

	subs	r0, r0, #1

	bne	3b

	dsb