|
@@ -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);
|
|
|
|