]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
target/arm: Fix incorrect aa64_tidcp1 feature check
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 23 Jan 2024 16:03:33 +0000 (16:03 +0000)
committerMichael Tokarev <mjt@tls.msk.ru>
Sat, 27 Jan 2024 15:11:49 +0000 (18:11 +0300)
A typo in the implementation of isar_feature_aa64_tidcp1() means we
were checking the field in the wrong ID register, so we might have
provided the feature on CPUs that don't have it and not provided
it on CPUs that should have it. Correct this bug.

Cc: qemu-stable@nongnu.org
Fixes: 9cd0c0dec97be9 "target/arm: Implement FEAT_TIDCP1"
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2120
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20240123160333.958841-1-peter.maydell@linaro.org
(cherry picked from commit ee0a2e3c9d2991a11c13ffadb15e4d0add43c257)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
target/arm/cpu-features.h

index 954d3582685c44eb156809f013a520603d721d08..165a497f7b9151562a143152f7f0dbd822e25a26 100644 (file)
@@ -771,7 +771,7 @@ static inline bool isar_feature_aa64_hcx(const ARMISARegisters *id)
 
 static inline bool isar_feature_aa64_tidcp1(const ARMISARegisters *id)
 {
-    return FIELD_EX64(id->id_aa64mmfr2, ID_AA64MMFR1, TIDCP1) != 0;
+    return FIELD_EX64(id->id_aa64mmfr1, ID_AA64MMFR1, TIDCP1) != 0;
 }
 
 static inline bool isar_feature_aa64_hafs(const ARMISARegisters *id)