@samitouri / QOSamiQemu / commits / cb1b461838

target/riscv: move riscv_cpu_set_rdtime_fn to riscv_aclint

There's no need for it to be in cpu_helper since riscv_aclint is the only caller. Signed-off-by: Daniel Henrique Barboza <daniel.barboza@oss.qualcomm.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Message-ID: <20260703180538.3346781-21-daniel.barboza@oss.qualcomm.com> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>

Daniel Henrique Barboza committed Jul 3, 2026 at 15:05 UTC cb1b461838a7e1656ca8b55fc9a7c75eda9e7c13
3 files changed +8 -9
hw/intc/riscv_aclint.c
+8
@@ -40,6 +40,14 @@ typedef struct riscv_aclint_mtimer_callback {
40 int num;
41 } riscv_aclint_mtimer_callback;
42
43 +static void riscv_cpu_set_rdtime_fn(CPURISCVState *env,
44 + uint64_t (*fn)(void *),
45 + void *arg)
46 +{
47 + env->rdtime_fn = fn;
48 + env->rdtime_fn_arg = arg;
49 +}
50 +
51 static uint64_t cpu_riscv_read_rtc_raw(uint32_t timebase_freq)
52 {
53 return muldiv64(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL),
target/riscv/cpu.h
-2
@@ -682,8 +682,6 @@ uint64_t riscv_cpu_update_mip(CPURISCVState *env, uint64_t mask,
682 void riscv_cpu_set_rnmi(RISCVCPU *cpu, uint32_t irq, bool level);
683 void riscv_cpu_interrupt(CPURISCVState *env);
684 #define BOOL_TO_MASK(x) (-!!(x)) /* helper for riscv_cpu_update_mip value */
685 -void riscv_cpu_set_rdtime_fn(CPURISCVState *env, uint64_t (*fn)(void *),
686 - void *arg);
685 void riscv_cpu_set_aia_ireg_rmw_cb(CPURISCVState *env, privilege_mode_t priv,
686 aia_ireg_rmw_fn rmw_fn,
687 void *rmw_fn_arg);
target/riscv/tcg/cpu_helper.c
-7
@@ -612,13 +612,6 @@ uint64_t riscv_cpu_update_mip(CPURISCVState *env, uint64_t mask, uint64_t value)
612 return old;
613 }
614
615 -void riscv_cpu_set_rdtime_fn(CPURISCVState *env, uint64_t (*fn)(void *),
616 - void *arg)
617 -{
618 - env->rdtime_fn = fn;
619 - env->rdtime_fn_arg = arg;
620 -}
621 -
615 void riscv_cpu_set_aia_ireg_rmw_cb(CPURISCVState *env, privilege_mode_t priv,
616 aia_ireg_rmw_fn rmw_fn,
617 void *rmw_fn_arg)