mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/riscv/kvm: change timer regs size to u64

Browse Source 
KVM_REG_RISCV_TIMER regs are always u64 according to the KVM API, but at
this moment we'll return u32 regs if we're running a RISCV32 target.

Use the kvm_riscv_reg_id_u64() helper in RISCV_TIMER_REG() to fix it.

Reported-by: Andrew Jones <ajones@ventanamicro.com>
Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Message-ID: <20231208183835.2411523-4-dbarboza@ventanamicro.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
(cherry picked from commit 10f86d1b845087d14b58d65dd2a6e3411d1b6529)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Daniel Henrique Barboza 2023-12-08 15:38:33 -03:00 committed by Michael Tokarev
parent 125b95d79e
commit cbae108098
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
target/riscv/kvm/kvm-cpu.c
View File

@ -88,7 +88,7 @@ static uint64_t kvm_riscv_reg_id_u64(uint64_t type, uint64_t idx)
#define RISCV_CSR_REG(env, name) kvm_riscv_reg_id(env, KVM_REG_RISCV_CSR, \ #define RISCV_CSR_REG(env, name) kvm_riscv_reg_id(env, KVM_REG_RISCV_CSR, \
KVM_REG_RISCV_CSR_REG(name)) KVM_REG_RISCV_CSR_REG(name))
#define RISCV_TIMER_REG(env, name) kvm_riscv_reg_id(env, KVM_REG_RISCV_TIMER, \ #define RISCV_TIMER_REG(name) kvm_riscv_reg_id_u64(KVM_REG_RISCV_TIMER, \
KVM_REG_RISCV_TIMER_REG(name)) KVM_REG_RISCV_TIMER_REG(name))
#define RISCV_FP_F_REG(idx) kvm_riscv_reg_id_u32(KVM_REG_RISCV_FP_F, idx) #define RISCV_FP_F_REG(idx) kvm_riscv_reg_id_u32(KVM_REG_RISCV_FP_F, idx)
@ -111,17 +111,17 @@ static uint64_t kvm_riscv_reg_id_u64(uint64_t type, uint64_t idx)
} \ } \
} while (0) } while (0)
#define KVM_RISCV_GET_TIMER(cs, env, name, reg) \ #define KVM_RISCV_GET_TIMER(cs, name, reg) \
do { \ do { \
int ret = kvm_get_one_reg(cs, RISCV_TIMER_REG(env, name), &reg); \ int ret = kvm_get_one_reg(cs, RISCV_TIMER_REG(name), &reg); \
if (ret) { \ if (ret) { \
abort(); \ abort(); \
} \ } \
} while (0) } while (0)
#define KVM_RISCV_SET_TIMER(cs, env, name, reg) \ #define KVM_RISCV_SET_TIMER(cs, name, reg) \
do { \ do { \
int ret = kvm_set_one_reg(cs, RISCV_TIMER_REG(env, name), &reg); \ int ret = kvm_set_one_reg(cs, RISCV_TIMER_REG(name), &reg); \
if (ret) { \ if (ret) { \
abort(); \ abort(); \
} \ } \
@ -649,10 +649,10 @@ static void kvm_riscv_get_regs_timer(CPUState *cs)
return; return;
} }
KVM_RISCV_GET_TIMER(cs, env, time, env->kvm_timer_time); KVM_RISCV_GET_TIMER(cs, time, env->kvm_timer_time);
KVM_RISCV_GET_TIMER(cs, env, compare, env->kvm_timer_compare); KVM_RISCV_GET_TIMER(cs, compare, env->kvm_timer_compare);
KVM_RISCV_GET_TIMER(cs, env, state, env->kvm_timer_state); KVM_RISCV_GET_TIMER(cs, state, env->kvm_timer_state);
KVM_RISCV_GET_TIMER(cs, env, frequency, env->kvm_timer_frequency); KVM_RISCV_GET_TIMER(cs, frequency, env->kvm_timer_frequency);
env->kvm_timer_dirty = true; env->kvm_timer_dirty = true;
} }
@ -666,8 +666,8 @@ static void kvm_riscv_put_regs_timer(CPUState *cs)
return; return;
} }
KVM_RISCV_SET_TIMER(cs, env, time, env->kvm_timer_time); KVM_RISCV_SET_TIMER(cs, time, env->kvm_timer_time);
KVM_RISCV_SET_TIMER(cs, env, compare, env->kvm_timer_compare); KVM_RISCV_SET_TIMER(cs, compare, env->kvm_timer_compare);
/* /*
* To set register of RISCV_TIMER_REG(state) will occur a error from KVM * To set register of RISCV_TIMER_REG(state) will occur a error from KVM
@ -676,7 +676,7 @@ static void kvm_riscv_put_regs_timer(CPUState *cs)
* TODO If KVM changes, adapt here. * TODO If KVM changes, adapt here.
*/ */
if (env->kvm_timer_state) { if (env->kvm_timer_state) {
KVM_RISCV_SET_TIMER(cs, env, state, env->kvm_timer_state); KVM_RISCV_SET_TIMER(cs, state, env->kvm_timer_state);
} }
/* /*
@ -685,7 +685,7 @@ static void kvm_riscv_put_regs_timer(CPUState *cs)
* during the migration. * during the migration.
*/ */
if (migration_is_running(migrate_get_current()->state)) { if (migration_is_running(migrate_get_current()->state)) {
KVM_RISCV_GET_TIMER(cs, env, frequency, reg); KVM_RISCV_GET_TIMER(cs, frequency, reg);
if (reg != env->kvm_timer_frequency) { if (reg != env->kvm_timer_frequency) {
error_report("Dst Hosts timer frequency != Src Hosts"); error_report("Dst Hosts timer frequency != Src Hosts");
} }