[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stable-7.2.6 56/63] hw/intc: Make rtc variable names consistent
From: |
Michael Tokarev |
Subject: |
[Stable-7.2.6 56/63] hw/intc: Make rtc variable names consistent |
Date: |
Wed, 20 Sep 2023 15:15:41 +0300 |
From: Jason Chien <jason.chien@sifive.com>
The variables whose values are given by cpu_riscv_read_rtc() should be named
"rtc". The variables whose value are given by cpu_riscv_read_rtc_raw()
should be named "rtc_r".
Signed-off-by: Jason Chien <jason.chien@sifive.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-ID: <20230728082502.26439-2-jason.chien@sifive.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
(cherry picked from commit 9382a9eafccad8dc6a487ea3a8d2bed03dc35db9)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
diff --git a/hw/intc/riscv_aclint.c b/hw/intc/riscv_aclint.c
index e71d6396d9..908edcbb80 100644
--- a/hw/intc/riscv_aclint.c
+++ b/hw/intc/riscv_aclint.c
@@ -64,13 +64,13 @@ static void
riscv_aclint_mtimer_write_timecmp(RISCVAclintMTimerState *mtimer,
uint64_t next;
uint64_t diff;
- uint64_t rtc_r = cpu_riscv_read_rtc(mtimer);
+ uint64_t rtc = cpu_riscv_read_rtc(mtimer);
/* Compute the relative hartid w.r.t the socket */
hartid = hartid - mtimer->hartid_base;
mtimer->timecmp[hartid] = value;
- if (mtimer->timecmp[hartid] <= rtc_r) {
+ if (mtimer->timecmp[hartid] <= rtc) {
/*
* If we're setting an MTIMECMP value in the "past",
* immediately raise the timer interrupt
@@ -81,7 +81,7 @@ static void
riscv_aclint_mtimer_write_timecmp(RISCVAclintMTimerState *mtimer,
/* otherwise, set up the future timer interrupt */
qemu_irq_lower(mtimer->timer_irqs[hartid]);
- diff = mtimer->timecmp[hartid] - rtc_r;
+ diff = mtimer->timecmp[hartid] - rtc;
/* back to ns (note args switched in muldiv64) */
uint64_t ns_diff = muldiv64(diff, NANOSECONDS_PER_SECOND, timebase_freq);
--
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, 2023/09/20
- [Stable-7.2.6 56/63] hw/intc: Make rtc variable names consistent,
Michael Tokarev <=
- [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 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 59/63] target/riscv/pmp.c: respect mseccfg.RLB for pmpaddrX changes, 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 58/63] hw/riscv: virt: Fix riscv,pmu DT node path, 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