Make aarch64_aa32_a57_init() common by exposing its prototype and defining it in cpu-max.c. Call it in arm_max_initfn() restricted to AArch32.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- target/arm/internals.h | 1 + target/arm/cpu-max.c | 74 ++++++++++++++++++++++++++++++++++++++++++ target/arm/cpu64.c | 71 ---------------------------------------- target/arm/tcg/cpu32.c | 48 ++------------------------- 4 files changed, 77 insertions(+), 117 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 00830b17248..c95f3d63138 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1758,6 +1758,7 @@ void aarch64_max_tcg_initfn(Object *obj); void aarch64_add_pauth_properties(Object *obj); void aarch64_add_sve_properties(Object *obj); void aarch64_add_sme_properties(Object *obj); +void aarch64_aa32_a57_init(Object *obj, bool aa32_only); /* Return true if the gdbstub is presenting an AArch64 CPU */ static inline bool arm_gdbstub_is_aarch64(ARMCPU *cpu) diff --git a/target/arm/cpu-max.c b/target/arm/cpu-max.c index 9fd48ce46e2..6fc54ebe74e 100644 --- a/target/arm/cpu-max.c +++ b/target/arm/cpu-max.c @@ -7,7 +7,81 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" +#include "system/kvm.h" #include "target/arm/internals.h" +#include "target/arm/cpregs.h" + +void aarch64_aa32_a57_init(Object *obj, bool aa32_only) +{ + ARMCPU *cpu = ARM_CPU(obj); + ARMISARegisters *isar = &cpu->isar; + const bool aarch64_enabled = !aa32_only; + + cpu->dtb_compatible = "arm,cortex-a57"; + set_feature(&cpu->env, ARM_FEATURE_V8); + set_feature(&cpu->env, ARM_FEATURE_NEON); + set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER); + set_feature(&cpu->env, ARM_FEATURE_BACKCOMPAT_CNTFRQ); + if (aarch64_enabled) { + set_feature(&cpu->env, ARM_FEATURE_AARCH64); + } + set_feature(&cpu->env, ARM_FEATURE_CBAR_RO); + set_feature(&cpu->env, ARM_FEATURE_EL2); + set_feature(&cpu->env, ARM_FEATURE_EL3); + set_feature(&cpu->env, ARM_FEATURE_PMU); + if (kvm_enabled()) { + cpu->kvm_target = QEMU_KVM_ARM_TARGET_CORTEX_A57; + } + cpu->midr = 0x411fd070; + cpu->revidr = 0x00000000; + cpu->reset_fpsid = 0x41034070; + cpu->isar.mvfr0 = 0x10110222; + cpu->isar.mvfr1 = 0x12111111; + cpu->isar.mvfr2 = 0x00000043; + cpu->ctr = 0x8444c004; + cpu->reset_sctlr = 0x00c50838; + SET_IDREG(isar, ID_PFR0, 0x00000131); + SET_IDREG(isar, ID_PFR1, 0x00011011); + SET_IDREG(isar, ID_DFR0, 0x03010066); + SET_IDREG(isar, ID_AFR0, 0x00000000); + SET_IDREG(isar, ID_MMFR0, 0x10101105); + SET_IDREG(isar, ID_MMFR1, 0x40000000); + SET_IDREG(isar, ID_MMFR2, 0x01260000); + SET_IDREG(isar, ID_MMFR3, 0x02102211); + SET_IDREG(isar, ID_ISAR0, 0x02101110); + SET_IDREG(isar, ID_ISAR1, 0x13112111); + SET_IDREG(isar, ID_ISAR2, 0x21232042); + SET_IDREG(isar, ID_ISAR3, 0x01112131); + SET_IDREG(isar, ID_ISAR4, 0x00011142); + SET_IDREG(isar, ID_ISAR5, 0x00011121); + SET_IDREG(isar, ID_ISAR6, 0); + if (aarch64_enabled) { + SET_IDREG(isar, ID_AA64PFR0, 0x00002222); + SET_IDREG(isar, ID_AA64DFR0, 0x10305106); + SET_IDREG(isar, ID_AA64ISAR0, 0x00011120); + SET_IDREG(isar, ID_AA64MMFR0, 0x00001124); + } + cpu->isar.dbgdidr = 0x3516d000; + cpu->isar.dbgdevid = 0x01110f13; + cpu->isar.dbgdevid1 = 0x2; + cpu->isar.reset_pmcr_el0 = 0x41013000; + SET_IDREG(isar, CLIDR, 0x0a200023); + /* 32KB L1 dcache */ + cpu->ccsidr[0] = make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 32 * KiB, 7); + /* 48KB L1 icache */ + cpu->ccsidr[1] = make_ccsidr(CCSIDR_FORMAT_LEGACY, 3, 64, 48 * KiB, 2); + /* 2048KB L2 cache */ + cpu->ccsidr[2] = make_ccsidr(CCSIDR_FORMAT_LEGACY, 16, 64, 2 * MiB, 7); + if (aarch64_enabled) { + set_dczid_bs(cpu, 4); /* 64 bytes */ + cpu->gic_num_lrs = 4; + cpu->gic_vpribits = 5; + cpu->gic_vprebits = 5; + cpu->gic_pribits = 5; + } + define_cortex_a72_a57_a53_cp_reginfo(cpu); +} /* Share AArch32 -cpu max features with AArch64. */ void aa32_max_features(ARMCPU *cpu) diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 7dce17fdb20..499d154dace 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -686,77 +686,6 @@ void aarch64_cpu_lpa2_finalize(ARMCPU *cpu, Error **errp) SET_IDREG(&cpu->isar, ID_AA64MMFR0, t); } -static void aarch64_aa32_a57_init(Object *obj, bool aa32_only) -{ - ARMCPU *cpu = ARM_CPU(obj); - ARMISARegisters *isar = &cpu->isar; - const bool aarch64_enabled = !aa32_only; - - cpu->dtb_compatible = "arm,cortex-a57"; - set_feature(&cpu->env, ARM_FEATURE_V8); - set_feature(&cpu->env, ARM_FEATURE_NEON); - set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER); - set_feature(&cpu->env, ARM_FEATURE_BACKCOMPAT_CNTFRQ); - if (aarch64_enabled) { - set_feature(&cpu->env, ARM_FEATURE_AARCH64); - } - set_feature(&cpu->env, ARM_FEATURE_CBAR_RO); - set_feature(&cpu->env, ARM_FEATURE_EL2); - set_feature(&cpu->env, ARM_FEATURE_EL3); - set_feature(&cpu->env, ARM_FEATURE_PMU); - if (kvm_enabled()) { - cpu->kvm_target = QEMU_KVM_ARM_TARGET_CORTEX_A57; - } - cpu->midr = 0x411fd070; - cpu->revidr = 0x00000000; - cpu->reset_fpsid = 0x41034070; - cpu->isar.mvfr0 = 0x10110222; - cpu->isar.mvfr1 = 0x12111111; - cpu->isar.mvfr2 = 0x00000043; - cpu->ctr = 0x8444c004; - cpu->reset_sctlr = 0x00c50838; - SET_IDREG(isar, ID_PFR0, 0x00000131); - SET_IDREG(isar, ID_PFR1, 0x00011011); - SET_IDREG(isar, ID_DFR0, 0x03010066); - SET_IDREG(isar, ID_AFR0, 0x00000000); - SET_IDREG(isar, ID_MMFR0, 0x10101105); - SET_IDREG(isar, ID_MMFR1, 0x40000000); - SET_IDREG(isar, ID_MMFR2, 0x01260000); - SET_IDREG(isar, ID_MMFR3, 0x02102211); - SET_IDREG(isar, ID_ISAR0, 0x02101110); - SET_IDREG(isar, ID_ISAR1, 0x13112111); - SET_IDREG(isar, ID_ISAR2, 0x21232042); - SET_IDREG(isar, ID_ISAR3, 0x01112131); - SET_IDREG(isar, ID_ISAR4, 0x00011142); - SET_IDREG(isar, ID_ISAR5, 0x00011121); - SET_IDREG(isar, ID_ISAR6, 0); - if (aarch64_enabled) { - SET_IDREG(isar, ID_AA64PFR0, 0x00002222); - SET_IDREG(isar, ID_AA64DFR0, 0x10305106); - SET_IDREG(isar, ID_AA64ISAR0, 0x00011120); - SET_IDREG(isar, ID_AA64MMFR0, 0x00001124); - } - cpu->isar.dbgdidr = 0x3516d000; - cpu->isar.dbgdevid = 0x01110f13; - cpu->isar.dbgdevid1 = 0x2; - cpu->isar.reset_pmcr_el0 = 0x41013000; - SET_IDREG(isar, CLIDR, 0x0a200023); - /* 32KB L1 dcache */ - cpu->ccsidr[0] = make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 32 * KiB, 7); - /* 48KB L1 icache */ - cpu->ccsidr[1] = make_ccsidr(CCSIDR_FORMAT_LEGACY, 3, 64, 48 * KiB, 2); - /* 2048KB L2 cache */ - cpu->ccsidr[2] = make_ccsidr(CCSIDR_FORMAT_LEGACY, 16, 64, 2 * MiB, 7); - if (aarch64_enabled) { - set_dczid_bs(cpu, 4); /* 64 bytes */ - cpu->gic_num_lrs = 4; - cpu->gic_vpribits = 5; - cpu->gic_vprebits = 5; - cpu->gic_pribits = 5; - } - define_cortex_a72_a57_a53_cp_reginfo(cpu); -} - static void aarch64_a57_initfn(Object *obj) { aarch64_aa32_a57_init(obj, false); diff --git a/target/arm/tcg/cpu32.c b/target/arm/tcg/cpu32.c index 2e8afc28602..a2f730451fb 100644 --- a/target/arm/tcg/cpu32.c +++ b/target/arm/tcg/cpu32.c @@ -720,53 +720,9 @@ static void sa1110_initfn(Object *obj) static void arm_max_initfn(Object *obj) { ARMCPU *cpu = ARM_CPU(obj); - ARMISARegisters *isar = &cpu->isar; - /* aarch64_a57_initfn, advertising none of the aarch64 features */ - cpu->dtb_compatible = "arm,cortex-a57"; - set_feature(&cpu->env, ARM_FEATURE_V8); - set_feature(&cpu->env, ARM_FEATURE_NEON); - set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER); - set_feature(&cpu->env, ARM_FEATURE_BACKCOMPAT_CNTFRQ); - set_feature(&cpu->env, ARM_FEATURE_CBAR_RO); - set_feature(&cpu->env, ARM_FEATURE_EL2); - set_feature(&cpu->env, ARM_FEATURE_EL3); - set_feature(&cpu->env, ARM_FEATURE_PMU); - cpu->midr = 0x411fd070; - cpu->revidr = 0x00000000; - cpu->reset_fpsid = 0x41034070; - cpu->isar.mvfr0 = 0x10110222; - cpu->isar.mvfr1 = 0x12111111; - cpu->isar.mvfr2 = 0x00000043; - cpu->ctr = 0x8444c004; - cpu->reset_sctlr = 0x00c50838; - SET_IDREG(isar, ID_PFR0, 0x00000131); - SET_IDREG(isar, ID_PFR1, 0x00011011); - SET_IDREG(isar, ID_DFR0, 0x03010066); - SET_IDREG(isar, ID_AFR0, 0x00000000); - SET_IDREG(isar, ID_MMFR0, 0x10101105); - SET_IDREG(isar, ID_MMFR1, 0x40000000); - SET_IDREG(isar, ID_MMFR2, 0x01260000); - SET_IDREG(isar, ID_MMFR3, 0x02102211); - SET_IDREG(isar, ID_ISAR0, 0x02101110); - SET_IDREG(isar, ID_ISAR1, 0x13112111); - SET_IDREG(isar, ID_ISAR2, 0x21232042); - SET_IDREG(isar, ID_ISAR3, 0x01112131); - SET_IDREG(isar, ID_ISAR4, 0x00011142); - SET_IDREG(isar, ID_ISAR5, 0x00011121); - SET_IDREG(isar, ID_ISAR6, 0); - cpu->isar.dbgdidr = 0x3516d000; - cpu->isar.dbgdevid = 0x01110f13; - cpu->isar.dbgdevid1 = 0x2; - cpu->isar.reset_pmcr_el0 = 0x41013000; - SET_IDREG(isar, CLIDR, 0x0a200023); - /* 32KB L1 dcache */ - cpu->ccsidr[0] = make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 32 * KiB, 7); - /* 48KB L1 icache */ - cpu->ccsidr[1] = make_ccsidr(CCSIDR_FORMAT_LEGACY, 3, 64, 48 * KiB, 2); - /* 2048KB L2 cache */ - cpu->ccsidr[2] = make_ccsidr(CCSIDR_FORMAT_LEGACY, 16, 64, 2 * MiB, 7); - define_cortex_a72_a57_a53_cp_reginfo(cpu); + /* Cortex-A57 advertising none of the aarch64 features */ + aarch64_aa32_a57_init(obj, true); aa32_max_features(cpu); -- 2.53.0
