From: Richard Henderson <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Signed-off-by: Richard Henderson <[email protected]>
Message-id: [email protected]
Signed-off-by: Peter Maydell <[email protected]>
---
target/arm/cpu-max.c | 2 +-
target/arm/tcg/cpu64.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/target/arm/cpu-max.c b/target/arm/cpu-max.c
index edb5b9e6c36..93f24114a52 100644
--- a/target/arm/cpu-max.c
+++ b/target/arm/cpu-max.c
@@ -206,8 +206,8 @@ static void cpu_max_initfn(Object *obj)
* '-cpu max' for TCG: we currently do this as
* "A57 with extra things"
*/
- aarch64_aa32_a57_init(cpu, aarch64_enabled);
if (!aarch64_enabled) {
+ aarch64_aa32_a57_init(cpu, false);
aa32_max_features(cpu);
#ifdef CONFIG_USER_ONLY
/*
diff --git a/target/arm/tcg/cpu64.c b/target/arm/tcg/cpu64.c
index 24f34947eca..5649b853a7f 100644
--- a/target/arm/tcg/cpu64.c
+++ b/target/arm/tcg/cpu64.c
@@ -1167,6 +1167,8 @@ void aarch64_max_tcg_initfn(Object *obj)
uint64_t t;
uint32_t u;
+ aarch64_aa32_a57_init(cpu, true);
+
SET_IDREG(isar, CLIDR, 0x8200123);
/* 64KB L1 dcache */
cpu->ccsidr[0] = make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 64 * KiB, 7);
--
2.43.0
