From: Leif Lindholm <leif@nuviainc.com>
Date: Fri, 8 Jan 2021 18:51:51 +0000 (+0000)
Subject: target/arm: make ARMCPU.ctr 64-bit
X-Git-Tag: qemu-xen-4.16.0-rc4~402^2~15
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a5fd319ae7f6d496ff5448ec1dedcae8e2f59e9f;p=qemu-xen.git

target/arm: make ARMCPU.ctr 64-bit

When FEAT_MTE is implemented, the AArch64 view of CTR_EL0 adds the
TminLine field in bits [37:32].
Extend the ctr field to be able to hold this context.

Signed-off-by: Leif Lindholm <leif@nuviainc.com>
Reviewed-by: Hao Wu <wuhaotsh@google.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Message-id: 20210108185154.8108-4-leif@nuviainc.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index fdbfcec2b0..0795c4cc06 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -931,7 +931,7 @@ struct ARMCPU {
     uint64_t midr;
     uint32_t revidr;
     uint32_t reset_fpsid;
-    uint32_t ctr;
+    uint64_t ctr;
     uint32_t reset_sctlr;
     uint64_t pmceid0;
     uint64_t pmceid1;