aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2025-03-07 10:08:20 +0000
committerPeter Maydell <peter.maydell@linaro.org>2025-03-07 10:08:20 +0000
commit5709038aa8b4d58b8c201ed53c327074173a35c6 (patch)
tree9a67d95d232153e1faa92c7048cfa9bf5a297814
parentdb6c2192839ee0282d38f6f6666a87e0629fcd13 (diff)
downloadqemu-5709038aa8b4d58b8c201ed53c327074173a35c6.zip
qemu-5709038aa8b4d58b8c201ed53c327074173a35c6.tar.gz
qemu-5709038aa8b4d58b8c201ed53c327074173a35c6.tar.bz2
target/arm: Don't apply CNTVOFF_EL2 for EL2_VIRT timer
The CNTVOFF_EL2 offset register should only be applied for accessses to CNTVCT_EL0 and for the EL1 virtual timer (CNTV_*). We were incorrectly applying it for the EL2 virtual timer (CNTHV_*). Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Message-id: 20250204125009.2281315-3-peter.maydell@linaro.org
-rw-r--r--target/arm/helper.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 7f341d7..5729b31 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -2604,7 +2604,6 @@ static uint64_t gt_tval_read(CPUARMState *env, const ARMCPRegInfo *ri,
switch (timeridx) {
case GTIMER_VIRT:
- case GTIMER_HYPVIRT:
offset = gt_virt_cnt_offset(env);
break;
case GTIMER_PHYS:
@@ -2624,7 +2623,6 @@ static void gt_tval_write(CPUARMState *env, const ARMCPRegInfo *ri,
switch (timeridx) {
case GTIMER_VIRT:
- case GTIMER_HYPVIRT:
offset = gt_virt_cnt_offset(env);
break;
case GTIMER_PHYS: