|
@@ -636,6 +636,10 @@ static int kvm_riscv_get_regs_csr(CPUState *cs)
|
|
for (i = 0; i < ARRAY_SIZE(kvm_csr_cfgs); i++) {
|
|
for (i = 0; i < ARRAY_SIZE(kvm_csr_cfgs); i++) {
|
|
KVMCPUConfig *csr_cfg = &kvm_csr_cfgs[i];
|
|
KVMCPUConfig *csr_cfg = &kvm_csr_cfgs[i];
|
|
|
|
|
|
|
|
+ if (!csr_cfg->supported) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+
|
|
ret = kvm_get_one_reg(cs, csr_cfg->kvm_reg_id, ®);
|
|
ret = kvm_get_one_reg(cs, csr_cfg->kvm_reg_id, ®);
|
|
if (ret) {
|
|
if (ret) {
|
|
return ret;
|
|
return ret;
|
|
@@ -662,6 +666,10 @@ static int kvm_riscv_put_regs_csr(CPUState *cs)
|
|
for (i = 0; i < ARRAY_SIZE(kvm_csr_cfgs); i++) {
|
|
for (i = 0; i < ARRAY_SIZE(kvm_csr_cfgs); i++) {
|
|
KVMCPUConfig *csr_cfg = &kvm_csr_cfgs[i];
|
|
KVMCPUConfig *csr_cfg = &kvm_csr_cfgs[i];
|
|
|
|
|
|
|
|
+ if (!csr_cfg->supported) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+
|
|
if (KVM_REG_SIZE(csr_cfg->kvm_reg_id) == sizeof(uint32_t)) {
|
|
if (KVM_REG_SIZE(csr_cfg->kvm_reg_id) == sizeof(uint32_t)) {
|
|
reg = kvm_cpu_csr_get_u32(cpu, csr_cfg);
|
|
reg = kvm_cpu_csr_get_u32(cpu, csr_cfg);
|
|
} else if (KVM_REG_SIZE(csr_cfg->kvm_reg_id) == sizeof(uint64_t)) {
|
|
} else if (KVM_REG_SIZE(csr_cfg->kvm_reg_id) == sizeof(uint64_t)) {
|
|
@@ -1090,6 +1098,32 @@ static void kvm_riscv_read_multiext_legacy(RISCVCPU *cpu,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+static void kvm_riscv_read_csr_cfg_legacy(KVMScratchCPU *kvmcpu)
|
|
|
|
+{
|
|
|
|
+ uint64_t val;
|
|
|
|
+ int i, ret;
|
|
|
|
+
|
|
|
|
+ for (i = 0; i < ARRAY_SIZE(kvm_csr_cfgs); i++) {
|
|
|
|
+ KVMCPUConfig *csr_cfg = &kvm_csr_cfgs[i];
|
|
|
|
+ struct kvm_one_reg reg;
|
|
|
|
+
|
|
|
|
+ reg.id = csr_cfg->kvm_reg_id;
|
|
|
|
+ reg.addr = (uint64_t)&val;
|
|
|
|
+ ret = ioctl(kvmcpu->cpufd, KVM_GET_ONE_REG, ®);
|
|
|
|
+ if (ret != 0) {
|
|
|
|
+ if (errno == EINVAL) {
|
|
|
|
+ csr_cfg->supported = false;
|
|
|
|
+ } else {
|
|
|
|
+ error_report("Unable to read KVM CSR %s: %s",
|
|
|
|
+ csr_cfg->name, strerror(errno));
|
|
|
|
+ exit(EXIT_FAILURE);
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ csr_cfg->supported = true;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
+
|
|
static int uint64_cmp(const void *a, const void *b)
|
|
static int uint64_cmp(const void *a, const void *b)
|
|
{
|
|
{
|
|
uint64_t val1 = *(const uint64_t *)a;
|
|
uint64_t val1 = *(const uint64_t *)a;
|
|
@@ -1146,7 +1180,26 @@ static void kvm_riscv_read_vlenb(RISCVCPU *cpu, KVMScratchCPU *kvmcpu,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-static void kvm_riscv_init_multiext_cfg(RISCVCPU *cpu, KVMScratchCPU *kvmcpu)
|
|
|
|
|
|
+static void kvm_riscv_read_csr_cfg(struct kvm_reg_list *reglist)
|
|
|
|
+{
|
|
|
|
+ struct kvm_reg_list *reg_search;
|
|
|
|
+ uint64_t reg_id;
|
|
|
|
+
|
|
|
|
+ for (int i = 0; i < ARRAY_SIZE(kvm_csr_cfgs); i++) {
|
|
|
|
+ KVMCPUConfig *csr_cfg = &kvm_csr_cfgs[i];
|
|
|
|
+
|
|
|
|
+ reg_id = csr_cfg->kvm_reg_id;
|
|
|
|
+ reg_search = bsearch(®_id, reglist->reg, reglist->n,
|
|
|
|
+ sizeof(uint64_t), uint64_cmp);
|
|
|
|
+ if (!reg_search) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ csr_cfg->supported = true;
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static void kvm_riscv_init_cfg(RISCVCPU *cpu, KVMScratchCPU *kvmcpu)
|
|
{
|
|
{
|
|
g_autofree struct kvm_reg_list *reglist = NULL;
|
|
g_autofree struct kvm_reg_list *reglist = NULL;
|
|
KVMCPUConfig *multi_ext_cfg;
|
|
KVMCPUConfig *multi_ext_cfg;
|
|
@@ -1163,7 +1216,9 @@ static void kvm_riscv_init_multiext_cfg(RISCVCPU *cpu, KVMScratchCPU *kvmcpu)
|
|
* (EINVAL). Use read_legacy() in this case.
|
|
* (EINVAL). Use read_legacy() in this case.
|
|
*/
|
|
*/
|
|
if (errno == EINVAL) {
|
|
if (errno == EINVAL) {
|
|
- return kvm_riscv_read_multiext_legacy(cpu, kvmcpu);
|
|
|
|
|
|
+ kvm_riscv_read_multiext_legacy(cpu, kvmcpu);
|
|
|
|
+ kvm_riscv_read_csr_cfg_legacy(kvmcpu);
|
|
|
|
+ return;
|
|
} else if (errno != E2BIG) {
|
|
} else if (errno != E2BIG) {
|
|
/*
|
|
/*
|
|
* E2BIG is an expected error message for the API since we
|
|
* E2BIG is an expected error message for the API since we
|
|
@@ -1226,6 +1281,7 @@ static void kvm_riscv_init_multiext_cfg(RISCVCPU *cpu, KVMScratchCPU *kvmcpu)
|
|
}
|
|
}
|
|
|
|
|
|
kvm_riscv_check_sbi_dbcn_support(cpu, reglist);
|
|
kvm_riscv_check_sbi_dbcn_support(cpu, reglist);
|
|
|
|
+ kvm_riscv_read_csr_cfg(reglist);
|
|
}
|
|
}
|
|
|
|
|
|
static void riscv_init_kvm_registers(Object *cpu_obj)
|
|
static void riscv_init_kvm_registers(Object *cpu_obj)
|
|
@@ -1239,7 +1295,7 @@ static void riscv_init_kvm_registers(Object *cpu_obj)
|
|
|
|
|
|
kvm_riscv_init_machine_ids(cpu, &kvmcpu);
|
|
kvm_riscv_init_machine_ids(cpu, &kvmcpu);
|
|
kvm_riscv_init_misa_ext_mask(cpu, &kvmcpu);
|
|
kvm_riscv_init_misa_ext_mask(cpu, &kvmcpu);
|
|
- kvm_riscv_init_multiext_cfg(cpu, &kvmcpu);
|
|
|
|
|
|
+ kvm_riscv_init_cfg(cpu, &kvmcpu);
|
|
|
|
|
|
kvm_riscv_destroy_scratch_vcpu(&kvmcpu);
|
|
kvm_riscv_destroy_scratch_vcpu(&kvmcpu);
|
|
}
|
|
}
|