277b210dd8
Instead of using our properties to set a config value which then might
be used to set the resetvec (depending on your timing), let's instead
just set the resetvec directly in the env struct.
This allows us to set the reset vec from the command line with:
-global driver=riscv.hart_array,property=resetvec,value=0x20000400
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220914101108.82571-2-alistair.francis@wdc.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
380 lines
11 KiB
C
380 lines
11 KiB
C
/*
|
|
* RISC-V VMState Description
|
|
*
|
|
* Copyright (c) 2020 Huawei Technologies Co., Ltd
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2 or later, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along with
|
|
* this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "cpu.h"
|
|
#include "qemu/error-report.h"
|
|
#include "sysemu/kvm.h"
|
|
#include "migration/cpu.h"
|
|
|
|
static bool pmp_needed(void *opaque)
|
|
{
|
|
RISCVCPU *cpu = opaque;
|
|
CPURISCVState *env = &cpu->env;
|
|
|
|
return riscv_feature(env, RISCV_FEATURE_PMP);
|
|
}
|
|
|
|
static int pmp_post_load(void *opaque, int version_id)
|
|
{
|
|
RISCVCPU *cpu = opaque;
|
|
CPURISCVState *env = &cpu->env;
|
|
int i;
|
|
|
|
for (i = 0; i < MAX_RISCV_PMPS; i++) {
|
|
pmp_update_rule_addr(env, i);
|
|
}
|
|
pmp_update_rule_nums(env);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const VMStateDescription vmstate_pmp_entry = {
|
|
.name = "cpu/pmp/entry",
|
|
.version_id = 1,
|
|
.minimum_version_id = 1,
|
|
.fields = (VMStateField[]) {
|
|
VMSTATE_UINTTL(addr_reg, pmp_entry_t),
|
|
VMSTATE_UINT8(cfg_reg, pmp_entry_t),
|
|
VMSTATE_END_OF_LIST()
|
|
}
|
|
};
|
|
|
|
static const VMStateDescription vmstate_pmp = {
|
|
.name = "cpu/pmp",
|
|
.version_id = 1,
|
|
.minimum_version_id = 1,
|
|
.needed = pmp_needed,
|
|
.post_load = pmp_post_load,
|
|
.fields = (VMStateField[]) {
|
|
VMSTATE_STRUCT_ARRAY(env.pmp_state.pmp, RISCVCPU, MAX_RISCV_PMPS,
|
|
0, vmstate_pmp_entry, pmp_entry_t),
|
|
VMSTATE_END_OF_LIST()
|
|
}
|
|
};
|
|
|
|
static bool hyper_needed(void *opaque)
|
|
{
|
|
RISCVCPU *cpu = opaque;
|
|
CPURISCVState *env = &cpu->env;
|
|
|
|
return riscv_has_ext(env, RVH);
|
|
}
|
|
|
|
static const VMStateDescription vmstate_hyper = {
|
|
.name = "cpu/hyper",
|
|
.version_id = 2,
|
|
.minimum_version_id = 2,
|
|
.needed = hyper_needed,
|
|
.fields = (VMStateField[]) {
|
|
VMSTATE_UINTTL(env.hstatus, RISCVCPU),
|
|
VMSTATE_UINTTL(env.hedeleg, RISCVCPU),
|
|
VMSTATE_UINT64(env.hideleg, RISCVCPU),
|
|
VMSTATE_UINTTL(env.hcounteren, RISCVCPU),
|
|
VMSTATE_UINTTL(env.htval, RISCVCPU),
|
|
VMSTATE_UINTTL(env.htinst, RISCVCPU),
|
|
VMSTATE_UINTTL(env.hgatp, RISCVCPU),
|
|
VMSTATE_UINTTL(env.hgeie, RISCVCPU),
|
|
VMSTATE_UINTTL(env.hgeip, RISCVCPU),
|
|
VMSTATE_UINT64(env.htimedelta, RISCVCPU),
|
|
VMSTATE_UINT64(env.vstimecmp, RISCVCPU),
|
|
|
|
VMSTATE_UINTTL(env.hvictl, RISCVCPU),
|
|
VMSTATE_UINT8_ARRAY(env.hviprio, RISCVCPU, 64),
|
|
|
|
VMSTATE_UINT64(env.vsstatus, RISCVCPU),
|
|
VMSTATE_UINTTL(env.vstvec, RISCVCPU),
|
|
VMSTATE_UINTTL(env.vsscratch, RISCVCPU),
|
|
VMSTATE_UINTTL(env.vsepc, RISCVCPU),
|
|
VMSTATE_UINTTL(env.vscause, RISCVCPU),
|
|
VMSTATE_UINTTL(env.vstval, RISCVCPU),
|
|
VMSTATE_UINTTL(env.vsatp, RISCVCPU),
|
|
VMSTATE_UINTTL(env.vsiselect, RISCVCPU),
|
|
|
|
VMSTATE_UINTTL(env.mtval2, RISCVCPU),
|
|
VMSTATE_UINTTL(env.mtinst, RISCVCPU),
|
|
|
|
VMSTATE_UINTTL(env.stvec_hs, RISCVCPU),
|
|
VMSTATE_UINTTL(env.sscratch_hs, RISCVCPU),
|
|
VMSTATE_UINTTL(env.sepc_hs, RISCVCPU),
|
|
VMSTATE_UINTTL(env.scause_hs, RISCVCPU),
|
|
VMSTATE_UINTTL(env.stval_hs, RISCVCPU),
|
|
VMSTATE_UINTTL(env.satp_hs, RISCVCPU),
|
|
VMSTATE_UINT64(env.mstatus_hs, RISCVCPU),
|
|
|
|
VMSTATE_END_OF_LIST()
|
|
}
|
|
};
|
|
|
|
static bool vector_needed(void *opaque)
|
|
{
|
|
RISCVCPU *cpu = opaque;
|
|
CPURISCVState *env = &cpu->env;
|
|
|
|
return riscv_has_ext(env, RVV);
|
|
}
|
|
|
|
static const VMStateDescription vmstate_vector = {
|
|
.name = "cpu/vector",
|
|
.version_id = 2,
|
|
.minimum_version_id = 2,
|
|
.needed = vector_needed,
|
|
.fields = (VMStateField[]) {
|
|
VMSTATE_UINT64_ARRAY(env.vreg, RISCVCPU, 32 * RV_VLEN_MAX / 64),
|
|
VMSTATE_UINTTL(env.vxrm, RISCVCPU),
|
|
VMSTATE_UINTTL(env.vxsat, RISCVCPU),
|
|
VMSTATE_UINTTL(env.vl, RISCVCPU),
|
|
VMSTATE_UINTTL(env.vstart, RISCVCPU),
|
|
VMSTATE_UINTTL(env.vtype, RISCVCPU),
|
|
VMSTATE_BOOL(env.vill, RISCVCPU),
|
|
VMSTATE_END_OF_LIST()
|
|
}
|
|
};
|
|
|
|
static bool pointermasking_needed(void *opaque)
|
|
{
|
|
RISCVCPU *cpu = opaque;
|
|
CPURISCVState *env = &cpu->env;
|
|
|
|
return riscv_has_ext(env, RVJ);
|
|
}
|
|
|
|
static const VMStateDescription vmstate_pointermasking = {
|
|
.name = "cpu/pointer_masking",
|
|
.version_id = 1,
|
|
.minimum_version_id = 1,
|
|
.needed = pointermasking_needed,
|
|
.fields = (VMStateField[]) {
|
|
VMSTATE_UINTTL(env.mmte, RISCVCPU),
|
|
VMSTATE_UINTTL(env.mpmmask, RISCVCPU),
|
|
VMSTATE_UINTTL(env.mpmbase, RISCVCPU),
|
|
VMSTATE_UINTTL(env.spmmask, RISCVCPU),
|
|
VMSTATE_UINTTL(env.spmbase, RISCVCPU),
|
|
VMSTATE_UINTTL(env.upmmask, RISCVCPU),
|
|
VMSTATE_UINTTL(env.upmbase, RISCVCPU),
|
|
|
|
VMSTATE_END_OF_LIST()
|
|
}
|
|
};
|
|
|
|
static bool rv128_needed(void *opaque)
|
|
{
|
|
RISCVCPU *cpu = opaque;
|
|
CPURISCVState *env = &cpu->env;
|
|
|
|
return env->misa_mxl_max == MXL_RV128;
|
|
}
|
|
|
|
static const VMStateDescription vmstate_rv128 = {
|
|
.name = "cpu/rv128",
|
|
.version_id = 1,
|
|
.minimum_version_id = 1,
|
|
.needed = rv128_needed,
|
|
.fields = (VMStateField[]) {
|
|
VMSTATE_UINTTL_ARRAY(env.gprh, RISCVCPU, 32),
|
|
VMSTATE_UINT64(env.mscratchh, RISCVCPU),
|
|
VMSTATE_UINT64(env.sscratchh, RISCVCPU),
|
|
VMSTATE_END_OF_LIST()
|
|
}
|
|
};
|
|
|
|
static bool kvmtimer_needed(void *opaque)
|
|
{
|
|
return kvm_enabled();
|
|
}
|
|
|
|
static int cpu_post_load(void *opaque, int version_id)
|
|
{
|
|
RISCVCPU *cpu = opaque;
|
|
CPURISCVState *env = &cpu->env;
|
|
|
|
env->kvm_timer_dirty = true;
|
|
return 0;
|
|
}
|
|
|
|
static const VMStateDescription vmstate_kvmtimer = {
|
|
.name = "cpu/kvmtimer",
|
|
.version_id = 1,
|
|
.minimum_version_id = 1,
|
|
.needed = kvmtimer_needed,
|
|
.post_load = cpu_post_load,
|
|
.fields = (VMStateField[]) {
|
|
VMSTATE_UINT64(env.kvm_timer_time, RISCVCPU),
|
|
VMSTATE_UINT64(env.kvm_timer_compare, RISCVCPU),
|
|
VMSTATE_UINT64(env.kvm_timer_state, RISCVCPU),
|
|
VMSTATE_END_OF_LIST()
|
|
}
|
|
};
|
|
|
|
static bool debug_needed(void *opaque)
|
|
{
|
|
RISCVCPU *cpu = opaque;
|
|
CPURISCVState *env = &cpu->env;
|
|
|
|
return riscv_feature(env, RISCV_FEATURE_DEBUG);
|
|
}
|
|
|
|
static const VMStateDescription vmstate_debug_type2 = {
|
|
.name = "cpu/debug/type2",
|
|
.version_id = 1,
|
|
.minimum_version_id = 1,
|
|
.fields = (VMStateField[]) {
|
|
VMSTATE_UINTTL(mcontrol, type2_trigger_t),
|
|
VMSTATE_UINTTL(maddress, type2_trigger_t),
|
|
VMSTATE_END_OF_LIST()
|
|
}
|
|
};
|
|
|
|
static const VMStateDescription vmstate_debug = {
|
|
.name = "cpu/debug",
|
|
.version_id = 1,
|
|
.minimum_version_id = 1,
|
|
.needed = debug_needed,
|
|
.fields = (VMStateField[]) {
|
|
VMSTATE_UINTTL(env.trigger_cur, RISCVCPU),
|
|
VMSTATE_STRUCT_ARRAY(env.type2_trig, RISCVCPU, TRIGGER_TYPE2_NUM,
|
|
0, vmstate_debug_type2, type2_trigger_t),
|
|
VMSTATE_END_OF_LIST()
|
|
}
|
|
};
|
|
|
|
static int riscv_cpu_post_load(void *opaque, int version_id)
|
|
{
|
|
RISCVCPU *cpu = opaque;
|
|
CPURISCVState *env = &cpu->env;
|
|
|
|
env->xl = cpu_recompute_xl(env);
|
|
riscv_cpu_update_mask(env);
|
|
return 0;
|
|
}
|
|
|
|
static bool envcfg_needed(void *opaque)
|
|
{
|
|
RISCVCPU *cpu = opaque;
|
|
CPURISCVState *env = &cpu->env;
|
|
|
|
return (env->priv_ver >= PRIV_VERSION_1_12_0 ? 1 : 0);
|
|
}
|
|
|
|
static const VMStateDescription vmstate_envcfg = {
|
|
.name = "cpu/envcfg",
|
|
.version_id = 1,
|
|
.minimum_version_id = 1,
|
|
.needed = envcfg_needed,
|
|
.fields = (VMStateField[]) {
|
|
VMSTATE_UINT64(env.menvcfg, RISCVCPU),
|
|
VMSTATE_UINTTL(env.senvcfg, RISCVCPU),
|
|
VMSTATE_UINT64(env.henvcfg, RISCVCPU),
|
|
VMSTATE_END_OF_LIST()
|
|
}
|
|
};
|
|
|
|
static bool pmu_needed(void *opaque)
|
|
{
|
|
RISCVCPU *cpu = opaque;
|
|
|
|
return cpu->cfg.pmu_num;
|
|
}
|
|
|
|
static const VMStateDescription vmstate_pmu_ctr_state = {
|
|
.name = "cpu/pmu",
|
|
.version_id = 1,
|
|
.minimum_version_id = 1,
|
|
.needed = pmu_needed,
|
|
.fields = (VMStateField[]) {
|
|
VMSTATE_UINTTL(mhpmcounter_val, PMUCTRState),
|
|
VMSTATE_UINTTL(mhpmcounterh_val, PMUCTRState),
|
|
VMSTATE_UINTTL(mhpmcounter_prev, PMUCTRState),
|
|
VMSTATE_UINTTL(mhpmcounterh_prev, PMUCTRState),
|
|
VMSTATE_BOOL(started, PMUCTRState),
|
|
VMSTATE_END_OF_LIST()
|
|
}
|
|
};
|
|
|
|
const VMStateDescription vmstate_riscv_cpu = {
|
|
.name = "cpu",
|
|
.version_id = 5,
|
|
.minimum_version_id = 5,
|
|
.post_load = riscv_cpu_post_load,
|
|
.fields = (VMStateField[]) {
|
|
VMSTATE_UINTTL_ARRAY(env.gpr, RISCVCPU, 32),
|
|
VMSTATE_UINT64_ARRAY(env.fpr, RISCVCPU, 32),
|
|
VMSTATE_UINT8_ARRAY(env.miprio, RISCVCPU, 64),
|
|
VMSTATE_UINT8_ARRAY(env.siprio, RISCVCPU, 64),
|
|
VMSTATE_UINTTL(env.pc, RISCVCPU),
|
|
VMSTATE_UINTTL(env.load_res, RISCVCPU),
|
|
VMSTATE_UINTTL(env.load_val, RISCVCPU),
|
|
VMSTATE_UINTTL(env.frm, RISCVCPU),
|
|
VMSTATE_UINTTL(env.badaddr, RISCVCPU),
|
|
VMSTATE_UINTTL(env.guest_phys_fault_addr, RISCVCPU),
|
|
VMSTATE_UINTTL(env.priv_ver, RISCVCPU),
|
|
VMSTATE_UINTTL(env.vext_ver, RISCVCPU),
|
|
VMSTATE_UINT32(env.misa_mxl, RISCVCPU),
|
|
VMSTATE_UINT32(env.misa_ext, RISCVCPU),
|
|
VMSTATE_UINT32(env.misa_mxl_max, RISCVCPU),
|
|
VMSTATE_UINT32(env.misa_ext_mask, RISCVCPU),
|
|
VMSTATE_UINT32(env.features, RISCVCPU),
|
|
VMSTATE_UINTTL(env.priv, RISCVCPU),
|
|
VMSTATE_UINTTL(env.virt, RISCVCPU),
|
|
VMSTATE_UINT64(env.resetvec, RISCVCPU),
|
|
VMSTATE_UINTTL(env.mhartid, RISCVCPU),
|
|
VMSTATE_UINT64(env.mstatus, RISCVCPU),
|
|
VMSTATE_UINT64(env.mip, RISCVCPU),
|
|
VMSTATE_UINT64(env.miclaim, RISCVCPU),
|
|
VMSTATE_UINT64(env.mie, RISCVCPU),
|
|
VMSTATE_UINT64(env.mideleg, RISCVCPU),
|
|
VMSTATE_UINTTL(env.satp, RISCVCPU),
|
|
VMSTATE_UINTTL(env.stval, RISCVCPU),
|
|
VMSTATE_UINTTL(env.medeleg, RISCVCPU),
|
|
VMSTATE_UINTTL(env.stvec, RISCVCPU),
|
|
VMSTATE_UINTTL(env.sepc, RISCVCPU),
|
|
VMSTATE_UINTTL(env.scause, RISCVCPU),
|
|
VMSTATE_UINTTL(env.mtvec, RISCVCPU),
|
|
VMSTATE_UINTTL(env.mepc, RISCVCPU),
|
|
VMSTATE_UINTTL(env.mcause, RISCVCPU),
|
|
VMSTATE_UINTTL(env.mtval, RISCVCPU),
|
|
VMSTATE_UINTTL(env.miselect, RISCVCPU),
|
|
VMSTATE_UINTTL(env.siselect, RISCVCPU),
|
|
VMSTATE_UINTTL(env.scounteren, RISCVCPU),
|
|
VMSTATE_UINTTL(env.mcounteren, RISCVCPU),
|
|
VMSTATE_UINTTL(env.mcountinhibit, RISCVCPU),
|
|
VMSTATE_STRUCT_ARRAY(env.pmu_ctrs, RISCVCPU, RV_MAX_MHPMCOUNTERS, 0,
|
|
vmstate_pmu_ctr_state, PMUCTRState),
|
|
VMSTATE_UINTTL_ARRAY(env.mhpmevent_val, RISCVCPU, RV_MAX_MHPMEVENTS),
|
|
VMSTATE_UINTTL_ARRAY(env.mhpmeventh_val, RISCVCPU, RV_MAX_MHPMEVENTS),
|
|
VMSTATE_UINTTL(env.sscratch, RISCVCPU),
|
|
VMSTATE_UINTTL(env.mscratch, RISCVCPU),
|
|
VMSTATE_UINT64(env.mfromhost, RISCVCPU),
|
|
VMSTATE_UINT64(env.mtohost, RISCVCPU),
|
|
VMSTATE_UINT64(env.stimecmp, RISCVCPU),
|
|
|
|
VMSTATE_END_OF_LIST()
|
|
},
|
|
.subsections = (const VMStateDescription * []) {
|
|
&vmstate_pmp,
|
|
&vmstate_hyper,
|
|
&vmstate_vector,
|
|
&vmstate_pointermasking,
|
|
&vmstate_rv128,
|
|
&vmstate_kvmtimer,
|
|
&vmstate_envcfg,
|
|
&vmstate_debug,
|
|
NULL
|
|
}
|
|
};
|