ARM: 9197/1: spectre-bhb: fix loop8 sequence for Thumb2
authorArd Biesheuvel <ardb@kernel.org>
Wed, 20 Apr 2022 08:46:17 +0000 (09:46 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 May 2022 07:59:10 +0000 (09:59 +0200)
commitdbe6b6a3f6c4e0c5524e8b0411e4739ff9cd2b32
tree622b6e45d120d24051e36e9ee63784207a5b16b9
parent6db976400affb4294e21fda3f75a865c1bc73b02
ARM: 9197/1: spectre-bhb: fix loop8 sequence for Thumb2

[ Upstream commit 3cfb3019979666bdf33a1010147363cf05e0f17b ]

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: 6c7cb60bff7a ("ARM: fix Thumb2 regression with Spectre BHB")
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm/kernel/entry-armv.S