[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/15] target/riscv/kvm: fix timebase-frequency when using KVM acc
From: |
Alistair Francis |
Subject: |
[PULL 15/15] target/riscv/kvm: fix timebase-frequency when using KVM acceleration |
Date: |
Fri, 22 Mar 2024 18:53:19 +1000 |
From: Yong-Xuan Wang <yongxuan.wang@sifive.com>
The timebase-frequency of guest OS should be the same with host
machine. The timebase-frequency value in DTS should be got from
hypervisor when using KVM acceleration.
Signed-off-by: Yong-Xuan Wang <yongxuan.wang@sifive.com>
Message-ID: <20240314061510.9800-1-yongxuan.wang@sifive.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
target/riscv/kvm/kvm_riscv.h | 1 +
hw/riscv/virt.c | 2 ++
target/riscv/kvm/kvm-cpu.c | 9 +++++++++
3 files changed, 12 insertions(+)
diff --git a/target/riscv/kvm/kvm_riscv.h b/target/riscv/kvm/kvm_riscv.h
index 4bd98fddc7..5851898868 100644
--- a/target/riscv/kvm/kvm_riscv.h
+++ b/target/riscv/kvm/kvm_riscv.h
@@ -28,5 +28,6 @@ void kvm_riscv_aia_create(MachineState *machine, uint64_t
group_shift,
void riscv_kvm_aplic_request(void *opaque, int irq, int level);
int kvm_riscv_sync_mpstate_to_kvm(RISCVCPU *cpu, int state);
void riscv_kvm_cpu_finalize_features(RISCVCPU *cpu, Error **errp);
+uint64_t kvm_riscv_get_timebase_frequency(CPUState *cs);
#endif
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index 72a55b8af1..d171e74f7b 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -711,6 +711,8 @@ static void create_fdt_sockets(RISCVVirtState *s, const
MemMapEntry *memmap,
qemu_fdt_add_subnode(ms->fdt, "/cpus");
qemu_fdt_setprop_cell(ms->fdt, "/cpus", "timebase-frequency",
+ kvm_enabled() ?
+ kvm_riscv_get_timebase_frequency(first_cpu) :
RISCV_ACLINT_DEFAULT_TIMEBASE_FREQ);
qemu_fdt_setprop_cell(ms->fdt, "/cpus", "#size-cells", 0x0);
qemu_fdt_setprop_cell(ms->fdt, "/cpus", "#address-cells", 0x1);
diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c
index cda7d78a77..6a6c6cae80 100644
--- a/target/riscv/kvm/kvm-cpu.c
+++ b/target/riscv/kvm/kvm-cpu.c
@@ -739,6 +739,15 @@ static void kvm_riscv_put_regs_timer(CPUState *cs)
env->kvm_timer_dirty = false;
}
+uint64_t kvm_riscv_get_timebase_frequency(CPUState *cs)
+{
+ uint64_t reg;
+
+ KVM_RISCV_GET_TIMER(cs, frequency, reg);
+
+ return reg;
+}
+
static int kvm_riscv_get_regs_vector(CPUState *cs)
{
RISCVCPU *cpu = RISCV_CPU(cs);
--
2.44.0
- [PULL 00/15] riscv-to-apply queue, Alistair Francis, 2024/03/22
- [PULL 02/15] target/riscv/vector_helper.c: set vstart = 0 in GEN_VEXT_VSLIDEUP_VX(), Alistair Francis, 2024/03/22
- [PULL 03/15] trans_rvv.c.inc: set vstart = 0 in int scalar move insns, Alistair Francis, 2024/03/22
- [PULL 04/15] target/riscv/vector_helper.c: fix 'vmvr_v' memcpy endianess, Alistair Francis, 2024/03/22
- [PULL 07/15] target/riscv/vector_helpers: do early exit when vstart >= vl, Alistair Francis, 2024/03/22
- [PULL 09/15] trans_rvv.c.inc: remove redundant mark_vs_dirty() calls, Alistair Francis, 2024/03/22
- [PULL 12/15] hw/intc: Update APLIC IDC after claiming iforce register, Alistair Francis, 2024/03/22
- [PULL 13/15] target/riscv: rvv: Remove the dependency of Zvfbfmin to Zfbfmin, Alistair Francis, 2024/03/22
- [PULL 14/15] target/riscv: Fix mode in riscv_tlb_fill, Alistair Francis, 2024/03/22
- [PULL 15/15] target/riscv/kvm: fix timebase-frequency when using KVM acceleration,
Alistair Francis <=
- [PULL 01/15] target/riscv: do not enable all named features by default, Alistair Francis, 2024/03/22
- [PULL 11/15] target/riscv/vector_helper.c: optimize loops in ldst helpers, Alistair Francis, 2024/03/22
- [PULL 10/15] target/riscv: enable 'vstart_eq_zero' in the end of insns, Alistair Francis, 2024/03/22
- [PULL 05/15] target/riscv: always clear vstart in whole vec move insns, Alistair Francis, 2024/03/22
- [PULL 08/15] target/riscv: remove 'over' brconds from vector trans, Alistair Francis, 2024/03/22
- [PULL 06/15] target/riscv: always clear vstart for ldst_whole insns, Alistair Francis, 2024/03/22
- Re: [PULL 00/15] riscv-to-apply queue, Peter Maydell, 2024/03/22
- Re: [PULL 00/15] riscv-to-apply queue, Michael Tokarev, 2024/03/22