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:14:36 +0000 (09:14 +0200)
commiteb92a8ecce23b2a8b7d0387322abd3196fa794b5
tree48d2d736448787e42049af5bc5e92749e7ed85db
parent463a7b957db0d2c96871f446b0c94d39a9bee244
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