[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stable-7.2.6 55/63] hw/intc: Fix upper/lower mtime write calculation
From: |
Michael Tokarev |
Subject: |
[Stable-7.2.6 55/63] hw/intc: Fix upper/lower mtime write calculation |
Date: |
Wed, 20 Sep 2023 15:15:40 +0300 |
From: Jason Chien <jason.chien@sifive.com>
When writing the upper mtime, we should keep the original lower mtime
whose value is given by cpu_riscv_read_rtc() instead of
cpu_riscv_read_rtc_raw(). The same logic applies to writes to lower mtime.
Signed-off-by: Jason Chien <jason.chien@sifive.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-ID: <20230728082502.26439-1-jason.chien@sifive.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
(cherry picked from commit e0922b73baf00c4c19d4ad30d09bb94f7ffea0f4)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
diff --git a/hw/intc/riscv_aclint.c b/hw/intc/riscv_aclint.c
index eee04643cb..e71d6396d9 100644
--- a/hw/intc/riscv_aclint.c
+++ b/hw/intc/riscv_aclint.c
@@ -208,11 +208,12 @@ static void riscv_aclint_mtimer_write(void *opaque,
hwaddr addr,
return;
} else if (addr == mtimer->time_base || addr == mtimer->time_base + 4) {
uint64_t rtc_r = cpu_riscv_read_rtc_raw(mtimer->timebase_freq);
+ uint64_t rtc = cpu_riscv_read_rtc(mtimer);
if (addr == mtimer->time_base) {
if (size == 4) {
/* time_lo for RV32/RV64 */
- mtimer->time_delta = ((rtc_r & ~0xFFFFFFFFULL) | value) -
rtc_r;
+ mtimer->time_delta = ((rtc & ~0xFFFFFFFFULL) | value) - rtc_r;
} else {
/* time for RV64 */
mtimer->time_delta = value - rtc_r;
@@ -220,7 +221,7 @@ static void riscv_aclint_mtimer_write(void *opaque, hwaddr
addr,
} else {
if (size == 4) {
/* time_hi for RV32/RV64 */
- mtimer->time_delta = (value << 32 | (rtc_r & 0xFFFFFFFF)) -
rtc_r;
+ mtimer->time_delta = (value << 32 | (rtc & 0xFFFFFFFF)) -
rtc_r;
} else {
qemu_log_mask(LOG_GUEST_ERROR,
"aclint-mtimer: invalid time_hi write: %08x",
--
2.39.2
- [Stable-7.2.6 00/63] v3 Patch Round-up for stable 7.2.6, freeze on 2023-09-19, Michael Tokarev, 2023/09/20
- [Stable-7.2.6 52/63] virtio: Drop out of coroutine context in virtio_load(), Michael Tokarev, 2023/09/20
- [Stable-7.2.6 54/63] hw/char/riscv_htif: Fix printing of console characters on big endian hosts, Michael Tokarev, 2023/09/20
- [Stable-7.2.6 53/63] arm64: Restore trapless ptimer access, Michael Tokarev, 2023/09/20
- [Stable-7.2.6 55/63] hw/intc: Fix upper/lower mtime write calculation,
Michael Tokarev <=
- [Stable-7.2.6 56/63] hw/intc: Make rtc variable names consistent, Michael Tokarev, 2023/09/20
- [Stable-7.2.6 57/63] linux-user/riscv: Use abi type for target_ucontext, Michael Tokarev, 2023/09/20
- [Stable-7.2.6 60/63] hw/tpm: TIS on sysbus: Remove unsupport ppi command line option, Michael Tokarev, 2023/09/20
- [Stable-7.2.6 58/63] hw/riscv: virt: Fix riscv,pmu DT node path, Michael Tokarev, 2023/09/20
- [Stable-7.2.6 59/63] target/riscv/pmp.c: respect mseccfg.RLB for pmpaddrX changes, Michael Tokarev, 2023/09/20
- [Stable-7.2.6 62/63] s390x/ap: fix missing subsystem reset registration, Michael Tokarev, 2023/09/20
- [Stable-7.2.6 61/63] ui: fix crash when there are no active_console, Michael Tokarev, 2023/09/20
- [Stable-7.2.6 63/63] tpm: fix crash when FD >= 1024 and unnecessary errors due to EINTR, Michael Tokarev, 2023/09/20