[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 27/65] hw/intc: Make rtc variable names consistent
From: |
Alistair Francis |
Subject: |
[PULL 27/65] hw/intc: Make rtc variable names consistent |
Date: |
Fri, 8 Sep 2023 16:03:53 +1000 |
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>
---
hw/intc/riscv_aclint.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/intc/riscv_aclint.c b/hw/intc/riscv_aclint.c
index bf77e29a70..25cf7a5d9d 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.41.0
- [PULL 21/65] crypto: Add SM4 constant parameter CK, (continued)
- [PULL 21/65] crypto: Add SM4 constant parameter CK, Alistair Francis, 2023/09/08
- [PULL 17/65] target/riscv: Add Zvknh ISA extension support, Alistair Francis, 2023/09/08
- [PULL 18/65] target/riscv: Add Zvksh ISA extension support, Alistair Francis, 2023/09/08
- [PULL 20/65] crypto: Create sm4_subword, Alistair Francis, 2023/09/08
- [PULL 24/65] target/riscv: Add Zihintntl extension ISA string to DTS, Alistair Francis, 2023/09/08
- [PULL 25/65] target/riscv: Fix zfa fleq.d and fltq.d, Alistair Francis, 2023/09/08
- [PULL 26/65] hw/intc: Fix upper/lower mtime write calculation, Alistair Francis, 2023/09/08
- [PULL 29/65] target/riscv: support the AIA device emulation with KVM enabled, Alistair Francis, 2023/09/08
- [PULL 28/65] linux-user/riscv: Use abi type for target_ucontext, Alistair Francis, 2023/09/08
- [PULL 23/65] target/riscv: Implement WARL behaviour for mcountinhibit/mcounteren, Alistair Francis, 2023/09/08
- [PULL 27/65] hw/intc: Make rtc variable names consistent,
Alistair Francis <=
- [PULL 30/65] target/riscv: check the in-kernel irqchip support, Alistair Francis, 2023/09/08
- [PULL 31/65] target/riscv: Create an KVM AIA irqchip, Alistair Francis, 2023/09/08
- [PULL 32/65] target/riscv: update APLIC and IMSIC to support KVM AIA, Alistair Francis, 2023/09/08
- [PULL 33/65] target/riscv: select KVM AIA in riscv virt machine, Alistair Francis, 2023/09/08
- [PULL 34/65] hw/riscv: virt: Fix riscv,pmu DT node path, Alistair Francis, 2023/09/08
- [PULL 35/65] target/riscv: Update CSR bits name for svadu extension, Alistair Francis, 2023/09/08
- [PULL 36/65] target/riscv: fix satp_mode_finalize() when satp_mode.supported = 0, Alistair Francis, 2023/09/08
- [PULL 37/65] riscv: zicond: make non-experimental, Alistair Francis, 2023/09/08
- [PULL 38/65] hw/riscv/virt.c: fix non-KVM --enable-debug build, Alistair Francis, 2023/09/08
- [PULL 39/65] hw/intc/riscv_aplic.c fix non-KVM --enable-debug build, Alistair Francis, 2023/09/08