45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
|
From 582f5bc85da2d1c6a61e5164dfc272dc96f846d5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: gubin <gubin_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Thu, 2 Jan 2025 10:30:33 +0800
|
||
|
|
Subject: [PATCH] target/arm: Reinstate "vfp" property on AArch32 CPUs
|
||
|
|
|
||
|
|
cherry-pick from 185e3fdf8d106cb2f7d234d5e6453939c66db2a9
|
||
|
|
|
||
|
|
In commit 4315f7c614743 we restructured the logic for creating the
|
||
|
|
VFP related properties to avoid testing the aa32_simd_r32 feature on
|
||
|
|
AArch64 CPUs. However in the process we accidentally stopped
|
||
|
|
exposing the "vfp" QOM property on AArch32 TCG CPUs.
|
||
|
|
|
||
|
|
This mostly hasn't had any ill effects because not many people want
|
||
|
|
to disable VFP, but it wasn't intentional. Reinstate the property.
|
||
|
|
|
||
|
|
Cc: qemu-stable@nongnu.org
|
||
|
|
Fixes: 4315f7c614743 ("target/arm: Restructure has_vfp_d32 test")
|
||
|
|
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2098
|
||
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
||
|
|
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
||
|
|
Message-id: 20240126193432.2210558-1-peter.maydell@linaro.org
|
||
|
|
Signed-off-by: gubin <gubin_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
target/arm/cpu.c | 4 ++++
|
||
|
|
1 file changed, 4 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
|
||
|
|
index 9dd61c10ea..09d391bd34 100644
|
||
|
|
--- a/target/arm/cpu.c
|
||
|
|
+++ b/target/arm/cpu.c
|
||
|
|
@@ -1635,6 +1635,10 @@ void arm_cpu_post_init(Object *obj)
|
||
|
|
}
|
||
|
|
} else if (cpu_isar_feature(aa32_vfp, cpu)) {
|
||
|
|
cpu->has_vfp = true;
|
||
|
|
+ if (tcg_enabled() || qtest_enabled()) {
|
||
|
|
+ qdev_property_add_static(DEVICE(obj),
|
||
|
|
+ &arm_cpu_has_vfp_property);
|
||
|
|
+ }
|
||
|
|
if (cpu_isar_feature(aa32_simd_r32, cpu)) {
|
||
|
|
cpu->has_vfp_d32 = true;
|
||
|
|
/*
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|