| From 6c7cb60bff7aec24b834343ff433125f469886a3 Mon Sep 17 00:00:00 2001 |
| From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk> |
| Date: Fri, 11 Mar 2022 17:13:17 +0000 |
| Subject: ARM: fix Thumb2 regression with Spectre BHB |
| |
| From: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> |
| |
| commit 6c7cb60bff7aec24b834343ff433125f469886a3 upstream. |
| |
| When building for Thumb2, the vectors make use of a local label. Sadly, |
| the Spectre BHB code also uses a local label with the same number which |
| results in the Thumb2 reference pointing at the wrong place. Fix this |
| by changing the number used for the Spectre BHB local label. |
| |
| Fixes: b9baf5c8c5c3 ("ARM: Spectre-BHB workaround") |
| Tested-by: Nathan Chancellor <nathan@kernel.org> |
| Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/arm/kernel/entry-armv.S | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/arch/arm/kernel/entry-armv.S |
| +++ b/arch/arm/kernel/entry-armv.S |
| @@ -1067,9 +1067,9 @@ vector_bhb_loop8_\name: |
| |
| @ bhb workaround |
| mov r0, #8 |
| -1: b . + 4 |
| +3: b . + 4 |
| subs r0, r0, #1 |
| - bne 1b |
| + bne 3b |
| dsb |
| isb |
| b 2b |
