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)
123 lines
3.9 KiB
Diff
123 lines
3.9 KiB
Diff
From 5f4c8b31db442e6ac39fbfe4b29d5479ab3567aa Mon Sep 17 00:00:00 2001
|
|
From: Tianrui Zhao <zhaotianrui@loongson.cn>
|
|
Date: Wed, 10 Jan 2024 10:41:52 +0100
|
|
Subject: [PATCH] target/loongarch: Implement set vcpu intr for kvm
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Implement loongarch kvm set vcpu interrupt interface,
|
|
when a irq is set in vcpu, we use the KVM_INTERRUPT
|
|
ioctl to set intr into kvm.
|
|
|
|
Signed-off-by: Tianrui Zhao <zhaotianrui@loongson.cn>
|
|
Signed-off-by: xianglai li <lixianglai@loongson.cn>
|
|
Reviewed-by: Song Gao <gaosong@loongson.cn>
|
|
Message-ID: <20240105075804.1228596-9-zhaotianrui@loongson.cn>
|
|
[PMD: Split from bigger patch, part 2]
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
Message-Id: <20240110094152.52138-2-philmd@linaro.org>
|
|
Signed-off-by: Song Gao <gaosong@loongson.cn>
|
|
---
|
|
target/loongarch/cpu.c | 9 ++++++++-
|
|
target/loongarch/kvm/kvm.c | 15 +++++++++++++++
|
|
target/loongarch/kvm/kvm_loongarch.h | 16 ++++++++++++++++
|
|
target/loongarch/trace-events | 1 +
|
|
4 files changed, 40 insertions(+), 1 deletion(-)
|
|
create mode 100644 target/loongarch/kvm/kvm_loongarch.h
|
|
|
|
diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
|
|
index 60f2636b43..413414392b 100644
|
|
--- a/target/loongarch/cpu.c
|
|
+++ b/target/loongarch/cpu.c
|
|
@@ -12,6 +12,8 @@
|
|
#include "qemu/module.h"
|
|
#include "sysemu/qtest.h"
|
|
#include "sysemu/tcg.h"
|
|
+#include "sysemu/kvm.h"
|
|
+#include "kvm/kvm_loongarch.h"
|
|
#include "exec/exec-all.h"
|
|
#include "cpu.h"
|
|
#include "internals.h"
|
|
@@ -19,6 +21,9 @@
|
|
#include "cpu-csr.h"
|
|
#include "sysemu/reset.h"
|
|
#include "vec.h"
|
|
+#ifdef CONFIG_KVM
|
|
+#include <linux/kvm.h>
|
|
+#endif
|
|
#ifdef CONFIG_TCG
|
|
#include "exec/cpu_ldst.h"
|
|
#include "tcg/tcg.h"
|
|
@@ -111,7 +116,9 @@ void loongarch_cpu_set_irq(void *opaque, int irq, int level)
|
|
return;
|
|
}
|
|
|
|
- if (tcg_enabled()) {
|
|
+ if (kvm_enabled()) {
|
|
+ kvm_loongarch_set_interrupt(cpu, irq, level);
|
|
+ } else if (tcg_enabled()) {
|
|
env->CSR_ESTAT = deposit64(env->CSR_ESTAT, irq, 1, level != 0);
|
|
if (FIELD_EX64(env->CSR_ESTAT, CSR_ESTAT, IS)) {
|
|
cpu_interrupt(cs, CPU_INTERRUPT_HARD);
|
|
diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
|
|
index d2dab3fef4..bd33ec2114 100644
|
|
--- a/target/loongarch/kvm/kvm.c
|
|
+++ b/target/loongarch/kvm/kvm.c
|
|
@@ -748,6 +748,21 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run)
|
|
return ret;
|
|
}
|
|
|
|
+int kvm_loongarch_set_interrupt(LoongArchCPU *cpu, int irq, int level)
|
|
+{
|
|
+ struct kvm_interrupt intr;
|
|
+ CPUState *cs = CPU(cpu);
|
|
+
|
|
+ if (level) {
|
|
+ intr.irq = irq;
|
|
+ } else {
|
|
+ intr.irq = -irq;
|
|
+ }
|
|
+
|
|
+ trace_kvm_set_intr(irq, level);
|
|
+ return kvm_vcpu_ioctl(cs, KVM_INTERRUPT, &intr);
|
|
+}
|
|
+
|
|
void kvm_arch_accel_class_init(ObjectClass *oc)
|
|
{
|
|
}
|
|
diff --git a/target/loongarch/kvm/kvm_loongarch.h b/target/loongarch/kvm/kvm_loongarch.h
|
|
new file mode 100644
|
|
index 0000000000..d945b6bb82
|
|
--- /dev/null
|
|
+++ b/target/loongarch/kvm/kvm_loongarch.h
|
|
@@ -0,0 +1,16 @@
|
|
+/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
+/*
|
|
+ * QEMU LoongArch kvm interface
|
|
+ *
|
|
+ * Copyright (c) 2023 Loongson Technology Corporation Limited
|
|
+ */
|
|
+
|
|
+#include "cpu.h"
|
|
+
|
|
+#ifndef QEMU_KVM_LOONGARCH_H
|
|
+#define QEMU_KVM_LOONGARCH_H
|
|
+
|
|
+int kvm_loongarch_set_interrupt(LoongArchCPU *cpu, int irq, int level);
|
|
+void kvm_arch_reset_vcpu(CPULoongArchState *env);
|
|
+
|
|
+#endif
|
|
diff --git a/target/loongarch/trace-events b/target/loongarch/trace-events
|
|
index 021839880e..dea11edc0f 100644
|
|
--- a/target/loongarch/trace-events
|
|
+++ b/target/loongarch/trace-events
|
|
@@ -12,3 +12,4 @@ 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"
|
|
+kvm_set_intr(int irq, int level) "kvm set interrupt, irq num: %d, level: %d"
|
|
--
|
|
2.27.0
|
|
|