45af991ec3
- disable keyring option - loongarch: Change the UEFI loading mode to loongarch - target/loongarch: Fix qtest test-hmp error when KVM-only build - target/loongarch/kvm: Enable LSX/LASX extension - target/loongarch: Set cpuid CSR register only once with kvm mode - configure: Add linux header compile support for LoongArch - hw/intc/loongarch_extioi: Add vmstate post_load support - hw/intc/loongarch_extioi: Add dynamic cpu number support - hw/loongarch/virt: Set iocsr address space per-board rather than percpu - hw/intc/loongarch_ipi: Use MemTxAttrs interface for ipi ops - target/loongarch: Add loongarch kvm into meson build - target/loongarch: Implement set vcpu intr for kvm - target/loongarch: Restrict TCG-specific code - target/loongarch: Implement kvm_arch_handle_exit - target/loongarch: Implement kvm_arch_init_vcpu - target/loongarch: Implement kvm_arch_init function - target/loongarch: Implement kvm get/set registers - target/loongarch: Supplement vcpu env initial when vcpu reset - target/loongarch: Define some kvm_arch interfaces - linux-headers: Synchronize linux headers from linux v6.7.0-rc8 - linux-headers: Update to Linux v6.7-rc5 - target/loongarch: move translate modules to tcg/ - target/loongarch/meson: move gdbstub.c to loongarch.ss - target/loongarch: Add timer information dump support - hw/loongarch/virt: Align high memory base address with super page size Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit b2263e41ffa3428f1d9f9ff6e214c8e3a19e06e8)
69 lines
2.5 KiB
Diff
69 lines
2.5 KiB
Diff
From 3feeca228b010716aacdf7159df10ea63f7e34cd Mon Sep 17 00:00:00 2001
|
|
From: Tianrui Zhao <zhaotianrui@loongson.cn>
|
|
Date: Fri, 5 Jan 2024 15:58:02 +0800
|
|
Subject: [PATCH] target/loongarch: Implement kvm_arch_handle_exit
|
|
|
|
Implement kvm_arch_handle_exit for loongarch. In this
|
|
function, the KVM_EXIT_LOONGARCH_IOCSR is handled,
|
|
we read or write the iocsr address space by the addr,
|
|
length and is_write argument in kvm_run.
|
|
|
|
Signed-off-by: Tianrui Zhao <zhaotianrui@loongson.cn>
|
|
Signed-off-by: xianglai li <lixianglai@loongson.cn>
|
|
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
|
Reviewed-by: Song Gao <gaosong@loongson.cn>
|
|
Message-Id: <20240105075804.1228596-8-zhaotianrui@loongson.cn>
|
|
Signed-off-by: Song Gao <gaosong@loongson.cn>
|
|
---
|
|
target/loongarch/kvm/kvm.c | 24 +++++++++++++++++++++++-
|
|
target/loongarch/trace-events | 1 +
|
|
2 files changed, 24 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
|
|
index 85e7aeb083..d2dab3fef4 100644
|
|
--- a/target/loongarch/kvm/kvm.c
|
|
+++ b/target/loongarch/kvm/kvm.c
|
|
@@ -723,7 +723,29 @@ bool kvm_arch_cpu_check_are_resettable(void)
|
|
|
|
int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run)
|
|
{
|
|
- return 0;
|
|
+ int ret = 0;
|
|
+ LoongArchCPU *cpu = LOONGARCH_CPU(cs);
|
|
+ CPULoongArchState *env = &cpu->env;
|
|
+ MemTxAttrs attrs = {};
|
|
+
|
|
+ attrs.requester_id = env_cpu(env)->cpu_index;
|
|
+
|
|
+ trace_kvm_arch_handle_exit(run->exit_reason);
|
|
+ switch (run->exit_reason) {
|
|
+ case KVM_EXIT_LOONGARCH_IOCSR:
|
|
+ address_space_rw(&env->address_space_iocsr,
|
|
+ run->iocsr_io.phys_addr,
|
|
+ attrs,
|
|
+ run->iocsr_io.data,
|
|
+ run->iocsr_io.len,
|
|
+ run->iocsr_io.is_write);
|
|
+ break;
|
|
+ default:
|
|
+ ret = -1;
|
|
+ warn_report("KVM: unknown exit reason %d", run->exit_reason);
|
|
+ break;
|
|
+ }
|
|
+ return ret;
|
|
}
|
|
|
|
void kvm_arch_accel_class_init(ObjectClass *oc)
|
|
diff --git a/target/loongarch/trace-events b/target/loongarch/trace-events
|
|
index 937c3c7c0c..021839880e 100644
|
|
--- a/target/loongarch/trace-events
|
|
+++ b/target/loongarch/trace-events
|
|
@@ -11,3 +11,4 @@ kvm_failed_get_counter(const char *msg) "Failed to get counter from KVM: %s"
|
|
kvm_failed_put_counter(const char *msg) "Failed to put counter into KVM: %s"
|
|
kvm_failed_get_cpucfg(const char *msg) "Failed to get cpucfg from KVM: %s"
|
|
kvm_failed_put_cpucfg(const char *msg) "Failed to put cpucfg into KVM: %s"
|
|
+kvm_arch_handle_exit(int num) "kvm arch handle exit, the reason number: %d"
|
|
--
|
|
2.27.0
|
|
|