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>
---
target/loongarch/cpu.c | 34 +++++++++++++++++++++-------
target/loongarch/kvm/kvm.c | 15 ++++++++++++
target/loongarch/kvm/kvm_loongarch.h | 16 +++++++++++++
target/loongarch/trace-events | 1 +
4 files changed, 58 insertions(+), 8 deletions(-)
create mode 100644 target/loongarch/kvm/kvm_loongarch.h
diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
index 6614a094c8..dfbbe0ace1 100644
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -11,7 +11,6 @@
#include "qapi/error.h"
#include "qemu/module.h"
#include "sysemu/qtest.h"
-#include "exec/cpu_ldst.h"
#include "exec/exec-all.h"
#include "cpu.h"
#include "internals.h"
@@ -20,8 +19,16 @@
#ifndef CONFIG_USER_ONLY
#include "sysemu/reset.h"
#endif
-#include "tcg/tcg.h"
#include "vec.h"
+#include "sysemu/kvm.h"
+#include "kvm/kvm_loongarch.h"
+#ifdef CONFIG_KVM
+#include <linux/kvm.h>
+#endif
+#ifdef CONFIG_TCG
+#include "exec/cpu_ldst.h"
+#include "tcg/tcg.h"
+#endif
const char * const regnames[32] = {
"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
@@ -110,12 +117,15 @@ void loongarch_cpu_set_irq(void *opaque, int irq, int level)
return;
}
- 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);
+ if (kvm_enabled()) {
+ kvm_loongarch_set_interrupt(cpu, irq, level);
} else {
- cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD);
+ 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);
+ } else {
+ cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD);
+ }
}
}
@@ -140,7 +150,10 @@ static inline bool cpu_loongarch_hw_interrupts_pending(CPULoongArchState *env)
return (pending & status) != 0;
}
+#endif
+#ifdef CONFIG_TCG
+#ifndef CONFIG_USER_ONLY
static void loongarch_cpu_do_interrupt(CPUState *cs)
{
LoongArchCPU *cpu = LOONGARCH_CPU(cs);
@@ -322,7 +335,6 @@ static bool loongarch_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
}
#endif
-#ifdef CONFIG_TCG
static void loongarch_cpu_synchronize_from_tb(CPUState *cs,
const TranslationBlock *tb)
{
@@ -560,7 +572,9 @@ static void loongarch_cpu_reset_hold(Object *obj)
}
#endif
+#ifdef CONFIG_TCG
restore_fp_status(env);
+#endif
cs->exception_index = -1;
}
@@ -703,8 +717,10 @@ static void loongarch_cpu_init(Object *obj)
CPULoongArchState *env = &cpu->env;
qdev_init_gpio_in(DEVICE(cpu), loongarch_cpu_set_irq, N_IRQS);
+#ifdef CONFIG_TCG
timer_init_ns(&cpu->timer, QEMU_CLOCK_VIRTUAL,
&loongarch_constant_timer_cb, cpu);
+#endif
memory_region_init_io(&env->system_iocsr, OBJECT(cpu), NULL,
env, "iocsr", UINT64_MAX);
address_space_init(&env->address_space_iocsr, &env->system_iocsr, "IOCSR");
@@ -804,7 +820,9 @@ static struct TCGCPUOps loongarch_tcg_ops = {
#include "hw/core/sysemu-cpu-ops.h"
static const struct SysemuCPUOps loongarch_sysemu_ops = {
+#ifdef CONFIG_TCG
.get_phys_page_debug = loongarch_cpu_get_phys_page_debug,
+#endif
};
static int64_t loongarch_cpu_get_arch_id(CPUState *cs)
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.39.1Hi Tianrui, On 5/1/24 08:58, Tianrui Zhao wrote: > 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> > --- > target/loongarch/cpu.c | 34 +++++++++++++++++++++------- > target/loongarch/kvm/kvm.c | 15 ++++++++++++ > target/loongarch/kvm/kvm_loongarch.h | 16 +++++++++++++ > target/loongarch/trace-events | 1 + > 4 files changed, 58 insertions(+), 8 deletions(-) > create mode 100644 target/loongarch/kvm/kvm_loongarch.h > > diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c > index 6614a094c8..dfbbe0ace1 100644 > --- a/target/loongarch/cpu.c > +++ b/target/loongarch/cpu.c > @@ -11,7 +11,6 @@ > #include "qapi/error.h" > #include "qemu/module.h" > #include "sysemu/qtest.h" > -#include "exec/cpu_ldst.h" > #include "exec/exec-all.h" > #include "cpu.h" > #include "internals.h" > @@ -20,8 +19,16 @@ > #ifndef CONFIG_USER_ONLY > #include "sysemu/reset.h" > #endif > -#include "tcg/tcg.h" > #include "vec.h" > +#include "sysemu/kvm.h" > +#include "kvm/kvm_loongarch.h" Shouldn't this header ^ ... > +#ifdef CONFIG_KVM ... goes here? > +#include <linux/kvm.h> > +#endif > +#ifdef CONFIG_TCG > +#include "exec/cpu_ldst.h" > +#include "tcg/tcg.h" > +#endif
From: Tianrui Zhao <zhaotianrui@loongson.cn>
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>
---
target/loongarch/kvm/kvm_loongarch.h | 16 ++++++++++++++++
target/loongarch/cpu.c | 9 ++++++++-
target/loongarch/kvm/kvm.c | 15 +++++++++++++++
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/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/cpu.c b/target/loongarch/cpu.c
index d9f8661cfd..d3a8a2f521 100644
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -12,6 +12,7 @@
#include "qemu/module.h"
#include "sysemu/qtest.h"
#include "sysemu/tcg.h"
+#include "sysemu/kvm.h"
#include "exec/exec-all.h"
#include "cpu.h"
#include "internals.h"
@@ -21,6 +22,10 @@
#include "sysemu/reset.h"
#endif
#include "vec.h"
+#ifdef CONFIG_KVM
+#include "kvm/kvm_loongarch.h"
+#include <linux/kvm.h>
+#endif
#ifdef CONFIG_TCG
#include "exec/cpu_ldst.h"
#include "tcg/tcg.h"
@@ -113,7 +118,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/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.41.0
Hi,
在 2024/1/10 下午5:41, Philippe Mathieu-Daudé 写道:
> From: Tianrui Zhao <zhaotianrui@loongson.cn>
>
> 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>
> ---
> target/loongarch/kvm/kvm_loongarch.h | 16 ++++++++++++++++
> target/loongarch/cpu.c | 9 ++++++++-
> target/loongarch/kvm/kvm.c | 15 +++++++++++++++
> 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/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/cpu.c b/target/loongarch/cpu.c
> index d9f8661cfd..d3a8a2f521 100644
> --- a/target/loongarch/cpu.c
> +++ b/target/loongarch/cpu.c
> @@ -12,6 +12,7 @@
> #include "qemu/module.h"
> #include "sysemu/qtest.h"
> #include "sysemu/tcg.h"
> +#include "sysemu/kvm.h"
> #include "exec/exec-all.h"
> #include "cpu.h"
> #include "internals.h"
> @@ -21,6 +22,10 @@
> #include "sysemu/reset.h"
> #endif
> #include "vec.h"
> +#ifdef CONFIG_KVM
> +#include "kvm/kvm_loongarch.h"
This broken tcg 'loongarch64-softmmu' build on X86 host, :-[
../target/loongarch/cpu.c: In function ‘loongarch_cpu_set_irq’:
../target/loongarch/cpu.c:122:9: error: implicit declaration of function
‘kvm_loongarch_set_interrupt’ [-Werror=implicit-function-declaration]
122 | kvm_loongarch_set_interrupt(cpu, irq, level);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
../target/loongarch/cpu.c:122:9: error: nested extern declaration of
‘kvm_loongarch_set_interrupt’ [-Werror=nested-externs]
../target/loongarch/cpu.c: In function ‘loongarch_cpu_reset_hold’:
../target/loongarch/cpu.c:557:9: error: implicit declaration of function
‘kvm_arch_reset_vcpu’; did you mean ‘kvm_arch_init_vcpu’?
[-Werror=implicit-function-declaration]
557 | kvm_arch_reset_vcpu(env);
| ^~~~~~~~~~~~~~~~~~~
| kvm_arch_init_vcpu
../target/loongarch/cpu.c:557:9: error: nested extern declaration of
‘kvm_arch_reset_vcpu’ [-Werror=nested-externs]
cc1: all warnings being treated as errors
I will move it out of '#ifdef CONFIG_KVM'
Thanks.
Song Gao
> +#include <linux/kvm.h>
> +#endif
> #ifdef CONFIG_TCG
> #include "exec/cpu_ldst.h"
> #include "tcg/tcg.h"
> @@ -113,7 +118,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/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"
On 11/1/24 03:29, gaosong wrote: > Hi, > > 在 2024/1/10 下午5:41, Philippe Mathieu-Daudé 写道: >> From: Tianrui Zhao <zhaotianrui@loongson.cn> >> >> 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> >> --- >> target/loongarch/kvm/kvm_loongarch.h | 16 ++++++++++++++++ >> target/loongarch/cpu.c | 9 ++++++++- >> target/loongarch/kvm/kvm.c | 15 +++++++++++++++ >> 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 d9f8661cfd..d3a8a2f521 100644 >> --- a/target/loongarch/cpu.c >> +++ b/target/loongarch/cpu.c >> @@ -12,6 +12,7 @@ >> #include "qemu/module.h" >> #include "sysemu/qtest.h" >> #include "sysemu/tcg.h" >> +#include "sysemu/kvm.h" >> #include "exec/exec-all.h" >> #include "cpu.h" >> #include "internals.h" >> @@ -21,6 +22,10 @@ >> #include "sysemu/reset.h" >> #endif >> #include "vec.h" >> +#ifdef CONFIG_KVM >> +#include "kvm/kvm_loongarch.h" > > This broken tcg 'loongarch64-softmmu' build on X86 host, :-[ > > ../target/loongarch/cpu.c: In function ‘loongarch_cpu_set_irq’: > ../target/loongarch/cpu.c:122:9: error: implicit declaration of function > ‘kvm_loongarch_set_interrupt’ [-Werror=implicit-function-declaration] > 122 | kvm_loongarch_set_interrupt(cpu, irq, level); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ > ../target/loongarch/cpu.c:122:9: error: nested extern declaration of > ‘kvm_loongarch_set_interrupt’ [-Werror=nested-externs] > ../target/loongarch/cpu.c: In function ‘loongarch_cpu_reset_hold’: > ../target/loongarch/cpu.c:557:9: error: implicit declaration of function > ‘kvm_arch_reset_vcpu’; did you mean ‘kvm_arch_init_vcpu’? > [-Werror=implicit-function-declaration] > 557 | kvm_arch_reset_vcpu(env); > | ^~~~~~~~~~~~~~~~~~~ > | kvm_arch_init_vcpu > ../target/loongarch/cpu.c:557:9: error: nested extern declaration of > ‘kvm_arch_reset_vcpu’ [-Werror=nested-externs] > cc1: all warnings being treated as errors > > I will move it out of '#ifdef CONFIG_KVM' Oh, right. (Sorry I only tested on loongarch64 host). Thanks! Phil.
From: Tianrui Zhao <zhaotianrui@loongson.cn>
In preparation of supporting KVM in the next commit.
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 1]
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
target/loongarch/cpu.c | 30 +++++++++++++++++++++---------
1 file changed, 21 insertions(+), 9 deletions(-)
diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
index 6614a094c8..d9f8661cfd 100644
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -11,7 +11,7 @@
#include "qapi/error.h"
#include "qemu/module.h"
#include "sysemu/qtest.h"
-#include "exec/cpu_ldst.h"
+#include "sysemu/tcg.h"
#include "exec/exec-all.h"
#include "cpu.h"
#include "internals.h"
@@ -20,8 +20,11 @@
#ifndef CONFIG_USER_ONLY
#include "sysemu/reset.h"
#endif
-#include "tcg/tcg.h"
#include "vec.h"
+#ifdef CONFIG_TCG
+#include "exec/cpu_ldst.h"
+#include "tcg/tcg.h"
+#endif
const char * const regnames[32] = {
"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
@@ -110,12 +113,13 @@ void loongarch_cpu_set_irq(void *opaque, int irq, int level)
return;
}
- 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);
- } else {
- cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD);
+ 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);
+ } else {
+ cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD);
+ }
}
}
@@ -140,7 +144,10 @@ static inline bool cpu_loongarch_hw_interrupts_pending(CPULoongArchState *env)
return (pending & status) != 0;
}
+#endif
+#ifdef CONFIG_TCG
+#ifndef CONFIG_USER_ONLY
static void loongarch_cpu_do_interrupt(CPUState *cs)
{
LoongArchCPU *cpu = LOONGARCH_CPU(cs);
@@ -322,7 +329,6 @@ static bool loongarch_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
}
#endif
-#ifdef CONFIG_TCG
static void loongarch_cpu_synchronize_from_tb(CPUState *cs,
const TranslationBlock *tb)
{
@@ -560,7 +566,9 @@ static void loongarch_cpu_reset_hold(Object *obj)
}
#endif
+#ifdef CONFIG_TCG
restore_fp_status(env);
+#endif
cs->exception_index = -1;
}
@@ -703,8 +711,10 @@ static void loongarch_cpu_init(Object *obj)
CPULoongArchState *env = &cpu->env;
qdev_init_gpio_in(DEVICE(cpu), loongarch_cpu_set_irq, N_IRQS);
+#ifdef CONFIG_TCG
timer_init_ns(&cpu->timer, QEMU_CLOCK_VIRTUAL,
&loongarch_constant_timer_cb, cpu);
+#endif
memory_region_init_io(&env->system_iocsr, OBJECT(cpu), NULL,
env, "iocsr", UINT64_MAX);
address_space_init(&env->address_space_iocsr, &env->system_iocsr, "IOCSR");
@@ -804,7 +814,9 @@ static struct TCGCPUOps loongarch_tcg_ops = {
#include "hw/core/sysemu-cpu-ops.h"
static const struct SysemuCPUOps loongarch_sysemu_ops = {
+#ifdef CONFIG_TCG
.get_phys_page_debug = loongarch_cpu_get_phys_page_debug,
+#endif
};
static int64_t loongarch_cpu_get_arch_id(CPUState *cs)
--
2.41.0
© 2016 - 2025 Red Hat, Inc.