Peter Maydell <peter.mayd...@linaro.org> writes:
> The CTR_EL0 register has some bits which allow the implementation to
> tell the guest that it does not need to do cache maintenance for
> data-to-instruction coherence and instruction-to-data coherence.
> QEMU doesn't emulate caches and so our cache maintenance insns are
> all NOPs.
>
> We already have some models of specific CPUs where we set these bits
> (e.g. the Neoverse V1), but the 'max' CPU still uses the settings it
> inherits from Cortex-A57. Set the bits for 'max' as well, so the
> guest doesn't need to do unnecessary work.
>
> Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
> Reviewed-by: Richard Henderson <richard.hender...@linaro.org>
> Tested-by: Miguel Luis <miguel.l...@oracle.com>
> ---
> target/arm/tcg/cpu64.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/target/arm/tcg/cpu64.c b/target/arm/tcg/cpu64.c
> index fcda99e1583..40e7a45166f 100644
> --- a/target/arm/tcg/cpu64.c
> +++ b/target/arm/tcg/cpu64.c
> @@ -1105,6 +1105,16 @@ void aarch64_max_tcg_initfn(Object *obj)
> u = FIELD_DP32(u, CLIDR_EL1, LOUU, 0);
> cpu->clidr = u;
>
> + /*
> + * Set CTR_EL0.DIC and IDC to tell the guest it doesnt' need to
> + * do any cache maintenance for data-to-instruction or
> + * instruction-to-guest coherence. (Our cache ops are nops.)
> + */
> + t = cpu->ctr;
> + t = FIELD_DP64(t, CTR_EL0, IDC, 1);
> + t = FIELD_DP64(t, CTR_EL0, DIC, 1);
> + cpu->ctr = t;
> +
> t = cpu->isar.id_aa64isar0;
> t = FIELD_DP64(t, ID_AA64ISAR0, AES, 2); /* FEAT_PMULL */
> t = FIELD_DP64(t, ID_AA64ISAR0, SHA1, 1); /* FEAT_SHA1 */
Hi, we're introducing new regression tests to migration and this patch
shows up in the bisect of an issue. I need some help figuring out
whether this is an actual regression or something else.
The migration is TCG QEMU 8.2.0 -> TCG QEMU master.
On the destination side (contains this patch) we're hitting this
condition:
bool write_list_to_cpustate(ARMCPU *cpu)
{
...
/*
* Write value and confirm it reads back as written
* (to catch read-only registers and partially read-only
* registers where the incoming migration value doesn't match)
*/
write_raw_cp_reg(&cpu->env, ri, v);
if (read_raw_cp_reg(&cpu->env, ri) != v) {
---> ok = false;
}
Thread 1 "qemu-system-aar" hit Breakpoint 3, write_list_to_cpustate
(cpu=0x555557a2f8f0) at ../target/arm/helper.c:190
190 ok = false;
(gdb) p ri->name
$7 = 0x555557ab9ae0 "CTR"
(gdb) p/x v
$3 = 0x8444c004
(gdb) p/x read_raw_cp_reg(&cpu->env, ri)
$4 = 0xb444c004
Is there any particularity in reading/writing to that register? This is
during post_load and 'v' is what came in the migration stream.
