| Message ID | 20190223023957.18865-5-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | target/arm: Define cortex-a{73, 75, 76} | expand |
On Sat, 23 Feb 2019 at 02:40, Richard Henderson <richard.henderson@linaro.org> wrote: > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > hw/arm/virt.c | 1 + > target/arm/cpu64.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 59 insertions(+) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index c69a734878..06a155724c 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -174,6 +174,7 @@ static const char *valid_cpus[] = { > ARM_CPU_TYPE_NAME("cortex-a57"), > ARM_CPU_TYPE_NAME("cortex-a72"), > ARM_CPU_TYPE_NAME("cortex-a73"), > + ARM_CPU_TYPE_NAME("cortex-a75"), > ARM_CPU_TYPE_NAME("host"), > ARM_CPU_TYPE_NAME("max"), > }; > diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c > index d34aa3af75..325e0ecf17 100644 > --- a/target/arm/cpu64.c > +++ b/target/arm/cpu64.c > @@ -312,6 +312,63 @@ static void aarch64_a73_initfn(Object *obj) > define_arm_cp_regs(cpu, cortex_aXX_cp_reginfo); > } > > +static void aarch64_a75_initfn(Object *obj) > +{ > + ARMCPU *cpu = ARM_CPU(obj); > > + cpu->reset_sctlr = 0x00c50838; /* ??? can't find it in a75 trm */ There are a couple of things interacting here. Firstly, I think that architecturally the reset values (and how much is actually a defined value rather than UNKNOWN) can differ between SCTLR_EL1/2/3, plus the 32-bit vs 64-bit have different values for a few bits, but we try to just shoehorn everything into a single reset_sctlr field (see https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg01559.html and surrounding messages in that thread for discussion). Secondly, for the cortex-a75, https://developer.arm.com/docs/100403/latest/part-b-register-descriptions/aarch64-system-registers/sctlr_el3-system-control-register-el3 does specify the reset value for SCTLR_EL3: bit 25 is controlled by an external signal (aka a QOM property for us), bits 12 2 and 0 are specified to reset to 0, and every other bit resets to an UNKNOWN value. I would suggest that we make the RES0 bits 0, the RES1 bits 1, and use 0 for all the other UNKNOWN bits. SCTLR_EL1 is similar (if resetting into EL1) https://developer.arm.com/docs/100403/latest/part-b-register-descriptions/aarch64-system-registers/sctlr_el1-system-control-register-el1 with the slight wrinkle that you need to also check the architectural spec for some bits, eg bit 0 has no reset value listed in the TRM but architecturally is required to reset to 0 if resetting into EL1. thanks -- PMM
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index c69a734878..06a155724c 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -174,6 +174,7 @@ static const char *valid_cpus[] = { ARM_CPU_TYPE_NAME("cortex-a57"), ARM_CPU_TYPE_NAME("cortex-a72"), ARM_CPU_TYPE_NAME("cortex-a73"), + ARM_CPU_TYPE_NAME("cortex-a75"), ARM_CPU_TYPE_NAME("host"), ARM_CPU_TYPE_NAME("max"), }; diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index d34aa3af75..325e0ecf17 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -312,6 +312,63 @@ static void aarch64_a73_initfn(Object *obj) define_arm_cp_regs(cpu, cortex_aXX_cp_reginfo); } +static void aarch64_a75_initfn(Object *obj) +{ + ARMCPU *cpu = ARM_CPU(obj); + + cpu->dtb_compatible = "arm,cortex-a75"; + set_feature(&cpu->env, ARM_FEATURE_V8); + set_feature(&cpu->env, ARM_FEATURE_VFP4); + set_feature(&cpu->env, ARM_FEATURE_NEON); + set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER); + 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); + cpu->midr = 0x413fd0a1; + cpu->revidr = 0x00000000; + cpu->reset_fpsid = 0x410340a2; + cpu->isar.mvfr0 = 0x10110222; + cpu->isar.mvfr1 = 0x13211111; + cpu->isar.mvfr2 = 0x00000043; + cpu->ctr = 0x84448004; + cpu->reset_sctlr = 0x00c50838; /* ??? can't find it in a75 trm */ + cpu->id_pfr0 = 0x00010131; + cpu->id_pfr1 = 0x00011011; + cpu->id_pfr2 = 0x00000001; + cpu->id_dfr0 = 0x04010088; + cpu->id_afr0 = 0x00000000; + cpu->id_mmfr0 = 0x10201105; + cpu->id_mmfr1 = 0x40000000; + cpu->id_mmfr2 = 0x01260000; + cpu->id_mmfr3 = 0x02122211; + cpu->isar.id_isar0 = 0x02101110; + cpu->isar.id_isar1 = 0x13112111; + cpu->isar.id_isar2 = 0x21232042; + cpu->isar.id_isar3 = 0x01112131; + cpu->isar.id_isar4 = 0x00011142; + cpu->isar.id_isar5 = 0x00011121; + cpu->isar.id_isar6 = 0x00000010; + cpu->isar.id_aa64pfr0 = 0x1100000010112222ull; + cpu->id_aa64dfr0 = 0x10305408; + cpu->isar.id_aa64isar0 = 0x10211120; + cpu->isar.id_aa64isar1 = 0x00100001; + cpu->isar.id_aa64mmfr0 = 0x00101124; + cpu->isar.id_aa64mmfr1 = 0x10212122; + cpu->isar.id_aa64mmfr2 = 0x00001011; + cpu->dbgdidr = 0x3518d000; + cpu->clidr = 0x08200023; + cpu->ccsidr[0] = 0x701fe00a; /* 32KB L1 dcache */ + cpu->ccsidr[1] = 0x201fe012; /* 48KB L1 icache */ + cpu->ccsidr[2] = 0x707fe07a; /* 1MB L2 cache */ + cpu->dcz_blocksize = 4; /* 64 bytes */ + cpu->gic_num_lrs = 4; + cpu->gic_vpribits = 5; + cpu->gic_vprebits = 5; + define_arm_cp_regs(cpu, cortex_aXX_cp_reginfo); +} + static void cpu_max_get_sve_vq(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { @@ -433,6 +490,7 @@ static const ARMCPUInfo aarch64_cpus[] = { { .name = "cortex-a53", .initfn = aarch64_a53_initfn }, { .name = "cortex-a72", .initfn = aarch64_a72_initfn }, { .name = "cortex-a73", .initfn = aarch64_a73_initfn }, + { .name = "cortex-a75", .initfn = aarch64_a75_initfn }, { .name = "max", .initfn = aarch64_max_initfn }, { .name = NULL } };
Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- hw/arm/virt.c | 1 + target/arm/cpu64.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+)