arm64: cpufeature: Fix CLRBHB and BC detection
authorKristina Martsenko <kristina.martsenko@arm.com>
Tue, 12 Sep 2023 13:34:29 +0000 (14:34 +0100)
committerWill Deacon <will@kernel.org>
Mon, 18 Sep 2023 09:45:11 +0000 (10:45 +0100)
commit479965a2b7ec481737df0cadf553331063b9c343
tree8d67f1b86187a7acc9e70faec6a0477bb059e63d
parent215b215d1e9278765c32af29515e8cdf679d47a3
arm64: cpufeature: Fix CLRBHB and BC detection

ClearBHB support is indicated by the CLRBHB field in ID_AA64ISAR2_EL1.
Following some refactoring the kernel incorrectly checks the BC field
instead. Fix the detection to use the right field.

(Note: The original ClearBHB support had it as FTR_HIGHER_SAFE, but this
patch uses FTR_LOWER_SAFE, which seems more correct.)

Also fix the detection of BC (hinted conditional branches) to use
FTR_LOWER_SAFE, so that it is not reported on mismatched systems.

Fixes: 356137e68a9f ("arm64/sysreg: Make BHB clear feature defines match the architecture")
Fixes: 8fcc8285c0e3 ("arm64/sysreg: Convert ID_AA64ISAR2_EL1 to automatic generation")
Cc: stable@vger.kernel.org
Signed-off-by: Kristina Martsenko <kristina.martsenko@arm.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230912133429.2606875-1-kristina.martsenko@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
arch/arm64/include/asm/cpufeature.h
arch/arm64/kernel/cpufeature.c
arch/arm64/tools/sysreg