public/qemu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

hw/intc: Make rtc variable names consistent

Browse source 
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>
This commit is contained in:
Jason Chien 2023-07-28 08:24:39 +00:00 committed by Michael Tokarev
parent 566dac7127
commit 60a7f5c8fe
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hw/intc/riscv_aclint.c
View file

@ -64,13 +64,13 @@ static void riscv_aclint_mtimer_write_timecmp(RISCVAclintMTimerState *mtimer,
uint64_t next; uint64_t next;
uint64_t diff; 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 */ /* Compute the relative hartid w.r.t the socket */
hartid = hartid - mtimer->hartid_base; hartid = hartid - mtimer->hartid_base;
mtimer->timecmp[hartid] = value; 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", * If we're setting an MTIMECMP value in the "past",
* immediately raise the timer interrupt * 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 */ /* otherwise, set up the future timer interrupt */
qemu_irq_lower(mtimer->timer_irqs[hartid]); 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) */ /* back to ns (note args switched in muldiv64) */
uint64_t ns_diff = muldiv64(diff, NANOSECONDS_PER_SECOND, timebase_freq); uint64_t ns_diff = muldiv64(diff, NANOSECONDS_PER_SECOND, timebase_freq);