target/arm: Sink aarch64_aa32_a57_init into aarch64_max_tcg_initfn
Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20260812204435.295067-5-richard.henderson@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Richard Henderson committed
Aug 18, 2026 at 10:39 UTC
b5af4f6024023d5649c6ed248c837226491b3372
2 files changed
+3
-1
target/arm/cpu-max.c
+1
-1
@@ -206,8 +206,8 @@ static void cpu_max_initfn(Object *obj)
206
* '-cpu max' for TCG: we currently do this as
207
* "A57 with extra things"
208
*/
209
- aarch64_aa32_a57_init(cpu, aarch64_enabled);
209
if (!aarch64_enabled) {
210
+ aarch64_aa32_a57_init(cpu, false);
211
aa32_max_features(cpu);
212
#ifdef CONFIG_USER_ONLY
213
/*
target/arm/tcg/cpu64.c
+2
@@ -1167,6 +1167,8 @@ void aarch64_max_tcg_initfn(Object *obj)
1167
uint64_t t;
1168
uint32_t u;
1169
1170
+ aarch64_aa32_a57_init(cpu, true);
1171
+
1172
SET_IDREG(isar, CLIDR, 0x8200123);
1173
/* 64KB L1 dcache */
1174
cpu->ccsidr[0] = make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 64 * KiB, 7);