[PULL 0/2] loongarch-to-apply queue
[PULL 00/11] loongarch-to-apply queue
1
The following changes since commit d328fef93ae757a0dd65ed786a4086e27952eef3:
1
The following changes since commit b69801dd6b1eb4d107f7c2f643adf0a4e3ec9124:
2
2
3
Merge tag 'pull-20231230' of https://gitlab.com/rth7680/qemu into staging (2024-01-04 10:23:34 +0000)
3
Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging (2025-02-22 05:06:39 +0800)
4
4
5
are available in the Git repository at:
5
are available in the Git repository at:
6
6
7
https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20240105
7
https://gitlab.com/bibo-mao/qemu.git tags/pull-loongarch-20250225
8
8
9
for you to fetch changes up to 0cd8b379081fa71c23836052feb65da4685f8ec7:
9
for you to fetch changes up to db369c11c90b35f3a6ab59ad78564aea5b30c3da:
10
10
11
target/loongarch: move translate modules to tcg/ (2024-01-05 09:31:05 +0800)
11
target/loongarch: Enable virtual extioi feature (2025-02-25 16:05:31 +0800)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
pull-loongarch-20240105
14
pull-loongarch-20250225 queue
15
15
16
----------------------------------------------------------------
16
----------------------------------------------------------------
17
Song Gao (2):
17
Bibo Mao (10):
18
target/loongarch/meson: move gdbstub.c to loongarch.ss
18
target/loongarch/gdbstub: Fix gdbstub incorrectly handling some registers
19
target/loongarch: move translate modules to tcg/
19
target/loongarch: Correct maximum physical address in KVM mode
20
target/loongarch: Add post init function for kvm mode
21
target/loongarch: Move kvm specified vCPU property to kvm directory
22
target/loongarch: Add vCPU property for paravirt ipi feature
23
target/loongarch: Add paravirt ipi feature detection
24
target/loongarch: Enable paravirt ipi feature
25
target/loongarch: Add vCPU property for kvm steal time feature
26
target/loongarch: Add kvm steal time feature detection
27
target/loongarch: Enable virtual extioi feature
20
28
21
target/loongarch/meson.build | 15 +--------------
29
Xianglai Li (1):
22
target/loongarch/{ => tcg}/constant_timer.c | 0
30
target/loongarch: fix vcpu reset command word issue
23
target/loongarch/{ => tcg}/csr_helper.c | 0
31
24
target/loongarch/{ => tcg}/fpu_helper.c | 0
32
hw/loongarch/virt.c | 8 --
25
.../loongarch/{ => tcg}/insn_trans/trans_arith.c.inc | 0
33
include/hw/loongarch/virt.h | 9 ++
26
.../loongarch/{ => tcg}/insn_trans/trans_atomic.c.inc | 0
34
target/loongarch/cpu.c | 52 ++--------
27
target/loongarch/{ => tcg}/insn_trans/trans_bit.c.inc | 0
35
target/loongarch/cpu.h | 13 +++
28
.../loongarch/{ => tcg}/insn_trans/trans_branch.c.inc | 0
36
target/loongarch/gdbstub.c | 11 +-
29
.../loongarch/{ => tcg}/insn_trans/trans_extra.c.inc | 0
37
target/loongarch/kvm/kvm.c | 186 +++++++++++++++++++++++++++++++++-
30
.../loongarch/{ => tcg}/insn_trans/trans_farith.c.inc | 0
38
target/loongarch/loongarch-qmp-cmds.c | 2 +-
31
.../loongarch/{ => tcg}/insn_trans/trans_fcmp.c.inc | 0
39
7 files changed, 224 insertions(+), 57 deletions(-)
32
.../loongarch/{ => tcg}/insn_trans/trans_fcnv.c.inc | 0
33
.../{ => tcg}/insn_trans/trans_fmemory.c.inc | 0
34
.../loongarch/{ => tcg}/insn_trans/trans_fmov.c.inc | 0
35
.../loongarch/{ => tcg}/insn_trans/trans_memory.c.inc | 0
36
.../{ => tcg}/insn_trans/trans_privileged.c.inc | 0
37
.../loongarch/{ => tcg}/insn_trans/trans_shift.c.inc | 0
38
target/loongarch/{ => tcg}/insn_trans/trans_vec.c.inc | 0
39
target/loongarch/{ => tcg}/iocsr_helper.c | 0
40
target/loongarch/tcg/meson.build | 19 +++++++++++++++++++
41
target/loongarch/{ => tcg}/op_helper.c | 0
42
target/loongarch/{ => tcg}/tlb_helper.c | 0
43
target/loongarch/{ => tcg}/translate.c | 0
44
target/loongarch/{ => tcg}/vec_helper.c | 0
45
24 files changed, 20 insertions(+), 14 deletions(-)
46
rename target/loongarch/{ => tcg}/constant_timer.c (100%)
47
rename target/loongarch/{ => tcg}/csr_helper.c (100%)
48
rename target/loongarch/{ => tcg}/fpu_helper.c (100%)
49
rename target/loongarch/{ => tcg}/insn_trans/trans_arith.c.inc (100%)
50
rename target/loongarch/{ => tcg}/insn_trans/trans_atomic.c.inc (100%)
51
rename target/loongarch/{ => tcg}/insn_trans/trans_bit.c.inc (100%)
52
rename target/loongarch/{ => tcg}/insn_trans/trans_branch.c.inc (100%)
53
rename target/loongarch/{ => tcg}/insn_trans/trans_extra.c.inc (100%)
54
rename target/loongarch/{ => tcg}/insn_trans/trans_farith.c.inc (100%)
55
rename target/loongarch/{ => tcg}/insn_trans/trans_fcmp.c.inc (100%)
56
rename target/loongarch/{ => tcg}/insn_trans/trans_fcnv.c.inc (100%)
57
rename target/loongarch/{ => tcg}/insn_trans/trans_fmemory.c.inc (100%)
58
rename target/loongarch/{ => tcg}/insn_trans/trans_fmov.c.inc (100%)
59
rename target/loongarch/{ => tcg}/insn_trans/trans_memory.c.inc (100%)
60
rename target/loongarch/{ => tcg}/insn_trans/trans_privileged.c.inc (100%)
61
rename target/loongarch/{ => tcg}/insn_trans/trans_shift.c.inc (100%)
62
rename target/loongarch/{ => tcg}/insn_trans/trans_vec.c.inc (100%)
63
rename target/loongarch/{ => tcg}/iocsr_helper.c (100%)
64
create mode 100644 target/loongarch/tcg/meson.build
65
rename target/loongarch/{ => tcg}/op_helper.c (100%)
66
rename target/loongarch/{ => tcg}/tlb_helper.c (100%)
67
rename target/loongarch/{ => tcg}/translate.c (100%)
68
rename target/loongarch/{ => tcg}/vec_helper.c (100%)
diff view generated by jsdifflib
[PULL 2/2] target/loongarch: move translate modules to tcg/
[PULL 01/11] target/loongarch: fix vcpu reset command word issue
1
Introduce the target/loongarch/tcg directory. Its purpose is to hold the TCG
1
From: Xianglai Li <lixianglai@loongson.cn>
2
code that is selected by CONFIG_TCG
3
2
3
When the KVM_REG_LOONGARCH_VCPU_RESET command word
4
is sent to the kernel through the kvm_set_one_reg interface,
5
the parameter source needs to be a legal address,
6
otherwise the kernel will return an error and the command word
7
will fail to be sent.
8
9
Signed-off-by: Xianglai Li <lixianglai@loongson.cn>
4
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
10
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
5
Signed-off-by: Song Gao <gaosong@loongson.cn>
11
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
6
Message-Id: <20240102020200.3462097-2-gaosong@loongson.cn>
7
---
12
---
8
target/loongarch/meson.build | 15 +--------------
13
target/loongarch/kvm/kvm.c | 9 ++++++++-
9
target/loongarch/{ => tcg}/constant_timer.c | 0
14
1 file changed, 8 insertions(+), 1 deletion(-)
10
target/loongarch/{ => tcg}/csr_helper.c | 0
11
target/loongarch/{ => tcg}/fpu_helper.c | 0
12
.../{ => tcg}/insn_trans/trans_arith.c.inc | 0
13
.../{ => tcg}/insn_trans/trans_atomic.c.inc | 0
14
.../{ => tcg}/insn_trans/trans_bit.c.inc | 0
15
.../{ => tcg}/insn_trans/trans_branch.c.inc | 0
16
.../{ => tcg}/insn_trans/trans_extra.c.inc | 0
17
.../{ => tcg}/insn_trans/trans_farith.c.inc | 0
18
.../{ => tcg}/insn_trans/trans_fcmp.c.inc | 0
19
.../{ => tcg}/insn_trans/trans_fcnv.c.inc | 0
20
.../{ => tcg}/insn_trans/trans_fmemory.c.inc | 0
21
.../{ => tcg}/insn_trans/trans_fmov.c.inc | 0
22
.../{ => tcg}/insn_trans/trans_memory.c.inc | 0
23
.../insn_trans/trans_privileged.c.inc | 0
24
.../{ => tcg}/insn_trans/trans_shift.c.inc | 0
25
.../{ => tcg}/insn_trans/trans_vec.c.inc | 0
26
target/loongarch/{ => tcg}/iocsr_helper.c | 0
27
target/loongarch/tcg/meson.build | 19 +++++++++++++++++++
28
target/loongarch/{ => tcg}/op_helper.c | 0
29
target/loongarch/{ => tcg}/tlb_helper.c | 0
30
target/loongarch/{ => tcg}/translate.c | 0
31
target/loongarch/{ => tcg}/vec_helper.c | 0
32
24 files changed, 20 insertions(+), 14 deletions(-)
33
rename target/loongarch/{ => tcg}/constant_timer.c (100%)
34
rename target/loongarch/{ => tcg}/csr_helper.c (100%)
35
rename target/loongarch/{ => tcg}/fpu_helper.c (100%)
36
rename target/loongarch/{ => tcg}/insn_trans/trans_arith.c.inc (100%)
37
rename target/loongarch/{ => tcg}/insn_trans/trans_atomic.c.inc (100%)
38
rename target/loongarch/{ => tcg}/insn_trans/trans_bit.c.inc (100%)
39
rename target/loongarch/{ => tcg}/insn_trans/trans_branch.c.inc (100%)
40
rename target/loongarch/{ => tcg}/insn_trans/trans_extra.c.inc (100%)
41
rename target/loongarch/{ => tcg}/insn_trans/trans_farith.c.inc (100%)
42
rename target/loongarch/{ => tcg}/insn_trans/trans_fcmp.c.inc (100%)
43
rename target/loongarch/{ => tcg}/insn_trans/trans_fcnv.c.inc (100%)
44
rename target/loongarch/{ => tcg}/insn_trans/trans_fmemory.c.inc (100%)
45
rename target/loongarch/{ => tcg}/insn_trans/trans_fmov.c.inc (100%)
46
rename target/loongarch/{ => tcg}/insn_trans/trans_memory.c.inc (100%)
47
rename target/loongarch/{ => tcg}/insn_trans/trans_privileged.c.inc (100%)
48
rename target/loongarch/{ => tcg}/insn_trans/trans_shift.c.inc (100%)
49
rename target/loongarch/{ => tcg}/insn_trans/trans_vec.c.inc (100%)
50
rename target/loongarch/{ => tcg}/iocsr_helper.c (100%)
51
create mode 100644 target/loongarch/tcg/meson.build
52
rename target/loongarch/{ => tcg}/op_helper.c (100%)
53
rename target/loongarch/{ => tcg}/tlb_helper.c (100%)
54
rename target/loongarch/{ => tcg}/translate.c (100%)
55
rename target/loongarch/{ => tcg}/vec_helper.c (100%)
56
15
57
diff --git a/target/loongarch/meson.build b/target/loongarch/meson.build
16
diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
58
index XXXXXXX..XXXXXXX 100644
17
index XXXXXXX..XXXXXXX 100644
59
--- a/target/loongarch/meson.build
18
--- a/target/loongarch/kvm/kvm.c
60
+++ b/target/loongarch/meson.build
19
+++ b/target/loongarch/kvm/kvm.c
61
@@ -XXX,XX +XXX,XX @@ loongarch_ss.add(files(
20
@@ -XXX,XX +XXX,XX @@ static int kvm_loongarch_get_lbt(CPUState *cs)
62
'cpu.c',
21
void kvm_arch_reset_vcpu(CPUState *cs)
63
'gdbstub.c',
22
{
64
))
23
CPULoongArchState *env = cpu_env(cs);
65
-loongarch_tcg_ss = ss.source_set()
24
+ int ret = 0;
66
-loongarch_tcg_ss.add(gen)
25
+ uint64_t unused = 0;
67
-loongarch_tcg_ss.add(files(
26
68
- 'fpu_helper.c',
27
env->mp_state = KVM_MP_STATE_RUNNABLE;
69
- 'op_helper.c',
28
- kvm_set_one_reg(cs, KVM_REG_LOONGARCH_VCPU_RESET, 0);
70
- 'translate.c',
29
+ ret = kvm_set_one_reg(cs, KVM_REG_LOONGARCH_VCPU_RESET, &unused);
71
- 'vec_helper.c',
30
+ if (ret) {
72
-))
31
+ error_report("Failed to set KVM_REG_LOONGARCH_VCPU_RESET: %s",
73
-loongarch_tcg_ss.add(zlib)
32
+ strerror(errno));
74
33
+ exit(EXIT_FAILURE);
75
loongarch_system_ss = ss.source_set()
34
+ }
76
loongarch_system_ss.add(files(
35
}
77
'loongarch-qmp-cmds.c',
36
78
'machine.c',
37
static int kvm_loongarch_get_mpstate(CPUState *cs)
79
- 'tlb_helper.c',
80
- 'constant_timer.c',
81
- 'csr_helper.c',
82
- 'iocsr_helper.c',
83
))
84
85
common_ss.add(when: 'CONFIG_LOONGARCH_DIS', if_true: [files('disas.c'), gen])
86
87
-loongarch_ss.add_all(when: 'CONFIG_TCG', if_true: [loongarch_tcg_ss])
88
+subdir('tcg')
89
90
target_arch += {'loongarch': loongarch_ss}
91
target_system_arch += {'loongarch': loongarch_system_ss}
92
diff --git a/target/loongarch/constant_timer.c b/target/loongarch/tcg/constant_timer.c
93
similarity index 100%
94
rename from target/loongarch/constant_timer.c
95
rename to target/loongarch/tcg/constant_timer.c
96
diff --git a/target/loongarch/csr_helper.c b/target/loongarch/tcg/csr_helper.c
97
similarity index 100%
98
rename from target/loongarch/csr_helper.c
99
rename to target/loongarch/tcg/csr_helper.c
100
diff --git a/target/loongarch/fpu_helper.c b/target/loongarch/tcg/fpu_helper.c
101
similarity index 100%
102
rename from target/loongarch/fpu_helper.c
103
rename to target/loongarch/tcg/fpu_helper.c
104
diff --git a/target/loongarch/insn_trans/trans_arith.c.inc b/target/loongarch/tcg/insn_trans/trans_arith.c.inc
105
similarity index 100%
106
rename from target/loongarch/insn_trans/trans_arith.c.inc
107
rename to target/loongarch/tcg/insn_trans/trans_arith.c.inc
108
diff --git a/target/loongarch/insn_trans/trans_atomic.c.inc b/target/loongarch/tcg/insn_trans/trans_atomic.c.inc
109
similarity index 100%
110
rename from target/loongarch/insn_trans/trans_atomic.c.inc
111
rename to target/loongarch/tcg/insn_trans/trans_atomic.c.inc
112
diff --git a/target/loongarch/insn_trans/trans_bit.c.inc b/target/loongarch/tcg/insn_trans/trans_bit.c.inc
113
similarity index 100%
114
rename from target/loongarch/insn_trans/trans_bit.c.inc
115
rename to target/loongarch/tcg/insn_trans/trans_bit.c.inc
116
diff --git a/target/loongarch/insn_trans/trans_branch.c.inc b/target/loongarch/tcg/insn_trans/trans_branch.c.inc
117
similarity index 100%
118
rename from target/loongarch/insn_trans/trans_branch.c.inc
119
rename to target/loongarch/tcg/insn_trans/trans_branch.c.inc
120
diff --git a/target/loongarch/insn_trans/trans_extra.c.inc b/target/loongarch/tcg/insn_trans/trans_extra.c.inc
121
similarity index 100%
122
rename from target/loongarch/insn_trans/trans_extra.c.inc
123
rename to target/loongarch/tcg/insn_trans/trans_extra.c.inc
124
diff --git a/target/loongarch/insn_trans/trans_farith.c.inc b/target/loongarch/tcg/insn_trans/trans_farith.c.inc
125
similarity index 100%
126
rename from target/loongarch/insn_trans/trans_farith.c.inc
127
rename to target/loongarch/tcg/insn_trans/trans_farith.c.inc
128
diff --git a/target/loongarch/insn_trans/trans_fcmp.c.inc b/target/loongarch/tcg/insn_trans/trans_fcmp.c.inc
129
similarity index 100%
130
rename from target/loongarch/insn_trans/trans_fcmp.c.inc
131
rename to target/loongarch/tcg/insn_trans/trans_fcmp.c.inc
132
diff --git a/target/loongarch/insn_trans/trans_fcnv.c.inc b/target/loongarch/tcg/insn_trans/trans_fcnv.c.inc
133
similarity index 100%
134
rename from target/loongarch/insn_trans/trans_fcnv.c.inc
135
rename to target/loongarch/tcg/insn_trans/trans_fcnv.c.inc
136
diff --git a/target/loongarch/insn_trans/trans_fmemory.c.inc b/target/loongarch/tcg/insn_trans/trans_fmemory.c.inc
137
similarity index 100%
138
rename from target/loongarch/insn_trans/trans_fmemory.c.inc
139
rename to target/loongarch/tcg/insn_trans/trans_fmemory.c.inc
140
diff --git a/target/loongarch/insn_trans/trans_fmov.c.inc b/target/loongarch/tcg/insn_trans/trans_fmov.c.inc
141
similarity index 100%
142
rename from target/loongarch/insn_trans/trans_fmov.c.inc
143
rename to target/loongarch/tcg/insn_trans/trans_fmov.c.inc
144
diff --git a/target/loongarch/insn_trans/trans_memory.c.inc b/target/loongarch/tcg/insn_trans/trans_memory.c.inc
145
similarity index 100%
146
rename from target/loongarch/insn_trans/trans_memory.c.inc
147
rename to target/loongarch/tcg/insn_trans/trans_memory.c.inc
148
diff --git a/target/loongarch/insn_trans/trans_privileged.c.inc b/target/loongarch/tcg/insn_trans/trans_privileged.c.inc
149
similarity index 100%
150
rename from target/loongarch/insn_trans/trans_privileged.c.inc
151
rename to target/loongarch/tcg/insn_trans/trans_privileged.c.inc
152
diff --git a/target/loongarch/insn_trans/trans_shift.c.inc b/target/loongarch/tcg/insn_trans/trans_shift.c.inc
153
similarity index 100%
154
rename from target/loongarch/insn_trans/trans_shift.c.inc
155
rename to target/loongarch/tcg/insn_trans/trans_shift.c.inc
156
diff --git a/target/loongarch/insn_trans/trans_vec.c.inc b/target/loongarch/tcg/insn_trans/trans_vec.c.inc
157
similarity index 100%
158
rename from target/loongarch/insn_trans/trans_vec.c.inc
159
rename to target/loongarch/tcg/insn_trans/trans_vec.c.inc
160
diff --git a/target/loongarch/iocsr_helper.c b/target/loongarch/tcg/iocsr_helper.c
161
similarity index 100%
162
rename from target/loongarch/iocsr_helper.c
163
rename to target/loongarch/tcg/iocsr_helper.c
164
diff --git a/target/loongarch/tcg/meson.build b/target/loongarch/tcg/meson.build
165
new file mode 100644
166
index XXXXXXX..XXXXXXX
167
--- /dev/null
168
+++ b/target/loongarch/tcg/meson.build
169
@@ -XXX,XX +XXX,XX @@
170
+if 'CONFIG_TCG' not in config_all
171
+ subdir_done()
172
+endif
173
+
174
+loongarch_ss.add([zlib, gen])
175
+
176
+loongarch_ss.add(files(
177
+ 'fpu_helper.c',
178
+ 'op_helper.c',
179
+ 'translate.c',
180
+ 'vec_helper.c',
181
+))
182
+
183
+loongarch_system_ss.add(files(
184
+ 'constant_timer.c',
185
+ 'csr_helper.c',
186
+ 'iocsr_helper.c',
187
+ 'tlb_helper.c',
188
+))
189
diff --git a/target/loongarch/op_helper.c b/target/loongarch/tcg/op_helper.c
190
similarity index 100%
191
rename from target/loongarch/op_helper.c
192
rename to target/loongarch/tcg/op_helper.c
193
diff --git a/target/loongarch/tlb_helper.c b/target/loongarch/tcg/tlb_helper.c
194
similarity index 100%
195
rename from target/loongarch/tlb_helper.c
196
rename to target/loongarch/tcg/tlb_helper.c
197
diff --git a/target/loongarch/translate.c b/target/loongarch/tcg/translate.c
198
similarity index 100%
199
rename from target/loongarch/translate.c
200
rename to target/loongarch/tcg/translate.c
201
diff --git a/target/loongarch/vec_helper.c b/target/loongarch/tcg/vec_helper.c
202
similarity index 100%
203
rename from target/loongarch/vec_helper.c
204
rename to target/loongarch/tcg/vec_helper.c
205
--
38
--
206
2.25.1
39
2.43.5
207
40
208
41
diff view generated by jsdifflib
[PULL 1/2] target/loongarch/meson: move gdbstub.c to loongarch.ss
[PULL 02/11] target/loongarch/gdbstub: Fix gdbstub incorrectly handling some registers
1
gdbstub.c is not specific to TCG and can be used by
1
Write operation with R32 (orig_a0) and R34 (CSR_BADV) is discarded on
2
other accelerators, such as KVM accelerator
2
gdbstub implementation for LoongArch system. And return value should
3
be register size rather than 0, since it is used to calculate offset of
4
next register such as R33 (PC) in function handle_write_all_regs().
3
5
4
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
6
Cc: qemu-stable@nongnu.org
5
Signed-off-by: Song Gao <gaosong@loongson.cn>
7
Fixes: ca61e75071c6 ("target/loongarch: Add gdb support.")
6
Message-Id: <20240102020200.3462097-1-gaosong@loongson.cn>
8
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
9
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
7
---
10
---
8
target/loongarch/meson.build | 2 +-
11
target/loongarch/gdbstub.c | 11 ++++++-----
9
1 file changed, 1 insertion(+), 1 deletion(-)
12
1 file changed, 6 insertions(+), 5 deletions(-)
10
13
11
diff --git a/target/loongarch/meson.build b/target/loongarch/meson.build
14
diff --git a/target/loongarch/gdbstub.c b/target/loongarch/gdbstub.c
12
index XXXXXXX..XXXXXXX 100644
15
index XXXXXXX..XXXXXXX 100644
13
--- a/target/loongarch/meson.build
16
--- a/target/loongarch/gdbstub.c
14
+++ b/target/loongarch/meson.build
17
+++ b/target/loongarch/gdbstub.c
15
@@ -XXX,XX +XXX,XX @@ gen = decodetree.process('insns.decode')
18
@@ -XXX,XX +XXX,XX @@ int loongarch_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
16
loongarch_ss = ss.source_set()
19
{
17
loongarch_ss.add(files(
20
CPULoongArchState *env = cpu_env(cs);
18
'cpu.c',
21
target_ulong tmp;
19
+ 'gdbstub.c',
22
- int read_length;
20
))
23
int length = 0;
21
loongarch_tcg_ss = ss.source_set()
24
22
loongarch_tcg_ss.add(gen)
25
+ if (n < 0 || n > 34) {
23
@@ -XXX,XX +XXX,XX @@ loongarch_tcg_ss.add(files(
26
+ return 0;
24
'fpu_helper.c',
27
+ }
25
'op_helper.c',
28
+
26
'translate.c',
29
if (is_la64(env)) {
27
- 'gdbstub.c',
30
tmp = ldq_le_p(mem_buf);
28
'vec_helper.c',
31
- read_length = 8;
29
))
32
+ length = 8;
30
loongarch_tcg_ss.add(zlib)
33
} else {
34
tmp = ldl_le_p(mem_buf);
35
- read_length = 4;
36
+ length = 4;
37
}
38
39
if (0 <= n && n < 32) {
40
env->gpr[n] = tmp;
41
- length = read_length;
42
} else if (n == 33) {
43
set_pc(env, tmp);
44
- length = read_length;
45
}
46
return length;
47
}
31
--
48
--
32
2.25.1
49
2.43.5
33
34
diff view generated by jsdifflib
New patch
[PULL 03/11] target/loongarch: Correct maximum physical address in KVM mode
1
On 3A5000 system, the physical address space width for host is 48,
2
however 47 bit for KVM VM. For KVM VM, size of physical address space is
3
the same with that of virtual user space address.
1
4
5
Here modify physical address space width with 47 bit in KVM mode.
6
7
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
8
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
9
---
10
target/loongarch/cpu.c | 10 ++++++++--
11
1 file changed, 8 insertions(+), 2 deletions(-)
12
13
diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
14
index XXXXXXX..XXXXXXX 100644
15
--- a/target/loongarch/cpu.c
16
+++ b/target/loongarch/cpu.c
17
@@ -XXX,XX +XXX,XX @@ static void loongarch_la464_initfn(Object *obj)
18
{
19
LoongArchCPU *cpu = LOONGARCH_CPU(obj);
20
CPULoongArchState *env = &cpu->env;
21
- uint32_t data = 0;
22
+ uint32_t data = 0, field;
23
int i;
24
25
for (i = 0; i < 21; i++) {
26
@@ -XXX,XX +XXX,XX @@ static void loongarch_la464_initfn(Object *obj)
27
data = FIELD_DP32(data, CPUCFG1, ARCH, 2);
28
data = FIELD_DP32(data, CPUCFG1, PGMMU, 1);
29
data = FIELD_DP32(data, CPUCFG1, IOCSR, 1);
30
- data = FIELD_DP32(data, CPUCFG1, PALEN, 0x2f);
31
+ if (kvm_enabled()) {
32
+ /* GPA address width of VM is 47, field value is 47 - 1 */
33
+ field = 0x2e;
34
+ } else {
35
+ field = 0x2f; /* 48 bit - 1 */
36
+ }
37
+ data = FIELD_DP32(data, CPUCFG1, PALEN, field);
38
data = FIELD_DP32(data, CPUCFG1, VALEN, 0x2f);
39
data = FIELD_DP32(data, CPUCFG1, UAL, 1);
40
data = FIELD_DP32(data, CPUCFG1, RI, 1);
41
--
42
2.43.5
diff view generated by jsdifflib
New patch
[PULL 04/11] target/loongarch: Add post init function for kvm mode
1
Some features such as LBT and PMU are implemented in kvm mode,
2
With paravirt features in future, post init function is added
3
for kvm mode, so that property for these features will be created
4
in kvm post init function.
1
5
6
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
7
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
8
---
9
target/loongarch/cpu.c | 2 +-
10
target/loongarch/cpu.h | 8 ++++++++
11
target/loongarch/kvm/kvm.c | 4 ++++
12
3 files changed, 13 insertions(+), 1 deletion(-)
13
14
diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
15
index XXXXXXX..XXXXXXX 100644
16
--- a/target/loongarch/cpu.c
17
+++ b/target/loongarch/cpu.c
18
@@ -XXX,XX +XXX,XX @@ void loongarch_cpu_post_init(Object *obj)
19
loongarch_set_pmu);
20
object_property_set_description(obj, "pmu",
21
"Set off to performance monitor unit.");
22
-
23
+ kvm_loongarch_cpu_post_init(cpu);
24
} else {
25
cpu->lbt = ON_OFF_AUTO_OFF;
26
cpu->pmu = ON_OFF_AUTO_OFF;
27
diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
28
index XXXXXXX..XXXXXXX 100644
29
--- a/target/loongarch/cpu.h
30
+++ b/target/loongarch/cpu.h
31
@@ -XXX,XX +XXX,XX @@ static inline void cpu_get_tb_cpu_state(CPULoongArchState *env, vaddr *pc,
32
33
void loongarch_cpu_post_init(Object *obj);
34
35
+#ifdef CONFIG_KVM
36
+void kvm_loongarch_cpu_post_init(LoongArchCPU *cpu);
37
+#else
38
+static inline void kvm_loongarch_cpu_post_init(LoongArchCPU *cpu)
39
+{
40
+}
41
+#endif
42
+
43
#endif /* LOONGARCH_CPU_H */
44
diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
45
index XXXXXXX..XXXXXXX 100644
46
--- a/target/loongarch/kvm/kvm.c
47
+++ b/target/loongarch/kvm/kvm.c
48
@@ -XXX,XX +XXX,XX @@ int kvm_arch_init_vcpu(CPUState *cs)
49
return ret;
50
}
51
52
+void kvm_loongarch_cpu_post_init(LoongArchCPU *cpu)
53
+{
54
+}
55
+
56
int kvm_arch_destroy_vcpu(CPUState *cs)
57
{
58
return 0;
59
--
60
2.43.5
diff view generated by jsdifflib
New patch
[PULL 05/11] target/loongarch: Move kvm specified vCPU property to kvm directory
1
LBT and PMU feature is supported only in kvm mode, move property
2
about these two features to function kvm_loongarch_cpu_post_init().
1
3
4
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
5
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
6
---
7
target/loongarch/cpu.c | 40 ++------------------------------------
8
target/loongarch/kvm/kvm.c | 35 +++++++++++++++++++++++++++++++++
9
2 files changed, 37 insertions(+), 38 deletions(-)
10
11
diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
12
index XXXXXXX..XXXXXXX 100644
13
--- a/target/loongarch/cpu.c
14
+++ b/target/loongarch/cpu.c
15
@@ -XXX,XX +XXX,XX @@ static void loongarch_set_lasx(Object *obj, bool value, Error **errp)
16
cpu->env.cpucfg[2] = FIELD_DP32(val, CPUCFG2, LASX, value);
17
}
18
19
-static bool loongarch_get_lbt(Object *obj, Error **errp)
20
-{
21
- return LOONGARCH_CPU(obj)->lbt != ON_OFF_AUTO_OFF;
22
-}
23
-
24
-static void loongarch_set_lbt(Object *obj, bool value, Error **errp)
25
-{
26
- LoongArchCPU *cpu = LOONGARCH_CPU(obj);
27
-
28
- cpu->lbt = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
29
-}
30
-
31
-static bool loongarch_get_pmu(Object *obj, Error **errp)
32
-{
33
- return LOONGARCH_CPU(obj)->pmu != ON_OFF_AUTO_OFF;
34
-}
35
-
36
-static void loongarch_set_pmu(Object *obj, bool value, Error **errp)
37
-{
38
- LoongArchCPU *cpu = LOONGARCH_CPU(obj);
39
-
40
- cpu->pmu = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
41
-}
42
-
43
void loongarch_cpu_post_init(Object *obj)
44
{
45
LoongArchCPU *cpu = LOONGARCH_CPU(obj);
46
47
+ cpu->lbt = ON_OFF_AUTO_OFF;
48
+ cpu->pmu = ON_OFF_AUTO_OFF;
49
cpu->lsx = ON_OFF_AUTO_AUTO;
50
cpu->lasx = ON_OFF_AUTO_AUTO;
51
object_property_add_bool(obj, "lsx", loongarch_get_lsx,
52
@@ -XXX,XX +XXX,XX @@ void loongarch_cpu_post_init(Object *obj)
53
loongarch_set_lasx);
54
/* lbt is enabled only in kvm mode, not supported in tcg mode */
55
if (kvm_enabled()) {
56
- cpu->lbt = ON_OFF_AUTO_AUTO;
57
- object_property_add_bool(obj, "lbt", loongarch_get_lbt,
58
- loongarch_set_lbt);
59
- object_property_set_description(obj, "lbt",
60
- "Set off to disable Binary Tranlation.");
61
-
62
- cpu->pmu = ON_OFF_AUTO_AUTO;
63
- object_property_add_bool(obj, "pmu", loongarch_get_pmu,
64
- loongarch_set_pmu);
65
- object_property_set_description(obj, "pmu",
66
- "Set off to performance monitor unit.");
67
kvm_loongarch_cpu_post_init(cpu);
68
- } else {
69
- cpu->lbt = ON_OFF_AUTO_OFF;
70
- cpu->pmu = ON_OFF_AUTO_OFF;
71
}
72
}
73
74
diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
75
index XXXXXXX..XXXXXXX 100644
76
--- a/target/loongarch/kvm/kvm.c
77
+++ b/target/loongarch/kvm/kvm.c
78
@@ -XXX,XX +XXX,XX @@ int kvm_arch_init_vcpu(CPUState *cs)
79
return ret;
80
}
81
82
+static bool loongarch_get_lbt(Object *obj, Error **errp)
83
+{
84
+ return LOONGARCH_CPU(obj)->lbt != ON_OFF_AUTO_OFF;
85
+}
86
+
87
+static void loongarch_set_lbt(Object *obj, bool value, Error **errp)
88
+{
89
+ LoongArchCPU *cpu = LOONGARCH_CPU(obj);
90
+
91
+ cpu->lbt = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
92
+}
93
+
94
+static bool loongarch_get_pmu(Object *obj, Error **errp)
95
+{
96
+ return LOONGARCH_CPU(obj)->pmu != ON_OFF_AUTO_OFF;
97
+}
98
+
99
+static void loongarch_set_pmu(Object *obj, bool value, Error **errp)
100
+{
101
+ LoongArchCPU *cpu = LOONGARCH_CPU(obj);
102
+
103
+ cpu->pmu = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
104
+}
105
+
106
void kvm_loongarch_cpu_post_init(LoongArchCPU *cpu)
107
{
108
+ cpu->lbt = ON_OFF_AUTO_AUTO;
109
+ object_property_add_bool(OBJECT(cpu), "lbt", loongarch_get_lbt,
110
+ loongarch_set_lbt);
111
+ object_property_set_description(OBJECT(cpu), "lbt",
112
+ "Set off to disable Binary Tranlation.");
113
+
114
+ cpu->pmu = ON_OFF_AUTO_AUTO;
115
+ object_property_add_bool(OBJECT(cpu), "pmu", loongarch_get_pmu,
116
+ loongarch_set_pmu);
117
+ object_property_set_description(OBJECT(cpu), "pmu",
118
+ "Set off to disable performance monitor unit.");
119
}
120
121
int kvm_arch_destroy_vcpu(CPUState *cs)
122
--
123
2.43.5
diff view generated by jsdifflib
New patch
[PULL 06/11] target/loongarch: Add vCPU property for paravirt ipi feature
1
Property kvm-pv-ipi is added to paravirt ipi feature, it is specially
2
for kvm mode.
1
3
4
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
5
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
6
---
7
target/loongarch/cpu.h | 1 +
8
target/loongarch/kvm/kvm.c | 18 ++++++++++++++++++
9
target/loongarch/loongarch-qmp-cmds.c | 2 +-
10
3 files changed, 20 insertions(+), 1 deletion(-)
11
12
diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
13
index XXXXXXX..XXXXXXX 100644
14
--- a/target/loongarch/cpu.h
15
+++ b/target/loongarch/cpu.h
16
@@ -XXX,XX +XXX,XX @@ struct ArchCPU {
17
OnOffAuto pmu;
18
OnOffAuto lsx;
19
OnOffAuto lasx;
20
+ OnOffAuto kvm_pv_ipi;
21
22
/* 'compatible' string for this CPU for Linux device trees */
23
const char *dtb_compatible;
24
diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
25
index XXXXXXX..XXXXXXX 100644
26
--- a/target/loongarch/kvm/kvm.c
27
+++ b/target/loongarch/kvm/kvm.c
28
@@ -XXX,XX +XXX,XX @@ static void loongarch_set_pmu(Object *obj, bool value, Error **errp)
29
cpu->pmu = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
30
}
31
32
+static bool kvm_pv_ipi_get(Object *obj, Error **errp)
33
+{
34
+ return LOONGARCH_CPU(obj)->kvm_pv_ipi != ON_OFF_AUTO_OFF;
35
+}
36
+
37
+static void kvm_pv_ipi_set(Object *obj, bool value, Error **errp)
38
+{
39
+ LoongArchCPU *cpu = LOONGARCH_CPU(obj);
40
+
41
+ cpu->kvm_pv_ipi = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
42
+}
43
+
44
void kvm_loongarch_cpu_post_init(LoongArchCPU *cpu)
45
{
46
cpu->lbt = ON_OFF_AUTO_AUTO;
47
@@ -XXX,XX +XXX,XX @@ void kvm_loongarch_cpu_post_init(LoongArchCPU *cpu)
48
loongarch_set_pmu);
49
object_property_set_description(OBJECT(cpu), "pmu",
50
"Set off to disable performance monitor unit.");
51
+
52
+ cpu->kvm_pv_ipi = ON_OFF_AUTO_AUTO;
53
+ object_property_add_bool(OBJECT(cpu), "kvm-pv-ipi", kvm_pv_ipi_get,
54
+ kvm_pv_ipi_set);
55
+ object_property_set_description(OBJECT(cpu), "kvm-pv-ipi",
56
+ "Set off to disable KVM paravirt IPI.");
57
}
58
59
int kvm_arch_destroy_vcpu(CPUState *cs)
60
diff --git a/target/loongarch/loongarch-qmp-cmds.c b/target/loongarch/loongarch-qmp-cmds.c
61
index XXXXXXX..XXXXXXX 100644
62
--- a/target/loongarch/loongarch-qmp-cmds.c
63
+++ b/target/loongarch/loongarch-qmp-cmds.c
64
@@ -XXX,XX +XXX,XX @@ CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)
65
}
66
67
static const char *cpu_model_advertised_features[] = {
68
- "lsx", "lasx", "lbt", "pmu", NULL
69
+ "lsx", "lasx", "lbt", "pmu", "kvm-pv-ipi", NULL
70
};
71
72
CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type,
73
--
74
2.43.5
diff view generated by jsdifflib
New patch
[PULL 07/11] target/loongarch: Add paravirt ipi feature detection
1
Paravirt ipi feature is OnOffAuto type, feature detection is added
2
to check whether it is supported by KVM host.
1
3
4
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
5
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
6
---
7
target/loongarch/cpu.h | 2 ++
8
target/loongarch/kvm/kvm.c | 36 +++++++++++++++++++++++++++++++++++-
9
2 files changed, 37 insertions(+), 1 deletion(-)
10
11
diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
12
index XXXXXXX..XXXXXXX 100644
13
--- a/target/loongarch/cpu.h
14
+++ b/target/loongarch/cpu.h
15
@@ -XXX,XX +XXX,XX @@ enum loongarch_features {
16
LOONGARCH_FEATURE_LASX,
17
LOONGARCH_FEATURE_LBT, /* loongson binary translation extension */
18
LOONGARCH_FEATURE_PMU,
19
+ LOONGARCH_FEATURE_PV_IPI,
20
};
21
22
typedef struct LoongArchBT {
23
@@ -XXX,XX +XXX,XX @@ typedef struct CPUArchState {
24
lbt_t lbt;
25
26
uint32_t cpucfg[21];
27
+ uint32_t pv_features;
28
29
/* LoongArch CSRs */
30
uint64_t CSR_CRMD;
31
diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
32
index XXXXXXX..XXXXXXX 100644
33
--- a/target/loongarch/kvm/kvm.c
34
+++ b/target/loongarch/kvm/kvm.c
35
@@ -XXX,XX +XXX,XX @@
36
#include "qemu/osdep.h"
37
#include <sys/ioctl.h>
38
#include <linux/kvm.h>
39
-
40
+#include "asm-loongarch/kvm_para.h"
41
#include "qapi/error.h"
42
#include "qemu/timer.h"
43
#include "qemu/error-report.h"
44
@@ -XXX,XX +XXX,XX @@ static bool kvm_feature_supported(CPUState *cs, enum loongarch_features feature)
45
ret = kvm_vm_ioctl(kvm_state, KVM_HAS_DEVICE_ATTR, &attr);
46
return (ret == 0);
47
48
+ case LOONGARCH_FEATURE_PV_IPI:
49
+ attr.group = KVM_LOONGARCH_VM_FEAT_CTRL;
50
+ attr.attr = KVM_LOONGARCH_VM_FEAT_PV_IPI;
51
+ ret = kvm_vm_ioctl(kvm_state, KVM_HAS_DEVICE_ATTR, &attr);
52
+ return (ret == 0);
53
+
54
default:
55
return false;
56
}
57
@@ -XXX,XX +XXX,XX @@ static int kvm_cpu_check_pmu(CPUState *cs, Error **errp)
58
return 0;
59
}
60
61
+static int kvm_cpu_check_pv_features(CPUState *cs, Error **errp)
62
+{
63
+ LoongArchCPU *cpu = LOONGARCH_CPU(cs);
64
+ CPULoongArchState *env = cpu_env(cs);
65
+ bool kvm_supported;
66
+
67
+ kvm_supported = kvm_feature_supported(cs, LOONGARCH_FEATURE_PV_IPI);
68
+ if (cpu->kvm_pv_ipi == ON_OFF_AUTO_ON) {
69
+ if (!kvm_supported) {
70
+ error_setg(errp, "'pv_ipi' feature not supported by KVM host");
71
+ return -ENOTSUP;
72
+ }
73
+ } else if (cpu->kvm_pv_ipi != ON_OFF_AUTO_AUTO) {
74
+ kvm_supported = false;
75
+ }
76
+
77
+ if (kvm_supported) {
78
+ env->pv_features |= BIT(KVM_FEATURE_IPI);
79
+ }
80
+
81
+ return 0;
82
+}
83
+
84
int kvm_arch_init_vcpu(CPUState *cs)
85
{
86
uint64_t val;
87
@@ -XXX,XX +XXX,XX @@ int kvm_arch_init_vcpu(CPUState *cs)
88
error_report_err(local_err);
89
}
90
91
+ ret = kvm_cpu_check_pv_features(cs, &local_err);
92
+ if (ret < 0) {
93
+ error_report_err(local_err);
94
+ }
95
+
96
return ret;
97
}
98
99
--
100
2.43.5
diff view generated by jsdifflib
New patch
[PULL 08/11] target/loongarch: Enable paravirt ipi feature
1
The similiar with cpucfg register, paravirt ipi feature is set in
2
function kvm_arch_put_registers(). Instead the paravirt feature can
3
be enabled only once, it cannot be changed dynamically.
1
4
5
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
6
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
7
---
8
target/loongarch/kvm/kvm.c | 36 ++++++++++++++++++++++++++++++++++++
9
1 file changed, 36 insertions(+)
10
11
diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
12
index XXXXXXX..XXXXXXX 100644
13
--- a/target/loongarch/kvm/kvm.c
14
+++ b/target/loongarch/kvm/kvm.c
15
@@ -XXX,XX +XXX,XX @@ static int kvm_set_stealtime(CPUState *cs)
16
return 0;
17
}
18
19
+static int kvm_set_pv_features(CPUState *cs)
20
+{
21
+ CPULoongArchState *env = cpu_env(cs);
22
+ int err;
23
+ uint64_t val;
24
+ struct kvm_device_attr attr = {
25
+ .group = KVM_LOONGARCH_VCPU_CPUCFG,
26
+ .attr = CPUCFG_KVM_FEATURE,
27
+ .addr = (uint64_t)&val,
28
+ };
29
+
30
+ err = kvm_vcpu_ioctl(cs, KVM_HAS_DEVICE_ATTR, attr);
31
+ if (err) {
32
+ return 0;
33
+ }
34
+
35
+ val = env->pv_features;
36
+ err = kvm_vcpu_ioctl(cs, KVM_SET_DEVICE_ATTR, attr);
37
+ if (err) {
38
+ error_report("Fail to set pv feature "TARGET_FMT_lx " with error %s",
39
+ val, strerror(errno));
40
+ return err;
41
+ }
42
+
43
+ return 0;
44
+}
45
+
46
static int kvm_loongarch_get_regs_core(CPUState *cs)
47
{
48
int ret = 0;
49
@@ -XXX,XX +XXX,XX @@ int kvm_arch_get_registers(CPUState *cs, Error **errp)
50
int kvm_arch_put_registers(CPUState *cs, int level, Error **errp)
51
{
52
int ret;
53
+ static int once;
54
55
ret = kvm_loongarch_put_regs_core(cs);
56
if (ret) {
57
@@ -XXX,XX +XXX,XX @@ int kvm_arch_put_registers(CPUState *cs, int level, Error **errp)
58
return ret;
59
}
60
61
+ if (!once) {
62
+ ret = kvm_set_pv_features(cs);
63
+ if (ret) {
64
+ return ret;
65
+ }
66
+ once = 1;
67
+ }
68
+
69
if (level >= KVM_PUT_FULL_STATE) {
70
/*
71
* only KVM_PUT_FULL_STATE is required, kvm kernel will clear
72
--
73
2.43.5
diff view generated by jsdifflib
New patch
[PULL 09/11] target/loongarch: Add vCPU property for kvm steal time feature
1
Property kvm-steal-time is added for kvm steal time feature, it is
2
specially for kvm mode.
1
3
4
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
5
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
6
---
7
target/loongarch/cpu.h | 1 +
8
target/loongarch/kvm/kvm.c | 18 ++++++++++++++++++
9
target/loongarch/loongarch-qmp-cmds.c | 2 +-
10
3 files changed, 20 insertions(+), 1 deletion(-)
11
12
diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
13
index XXXXXXX..XXXXXXX 100644
14
--- a/target/loongarch/cpu.h
15
+++ b/target/loongarch/cpu.h
16
@@ -XXX,XX +XXX,XX @@ struct ArchCPU {
17
OnOffAuto lsx;
18
OnOffAuto lasx;
19
OnOffAuto kvm_pv_ipi;
20
+ OnOffAuto kvm_steal_time;
21
22
/* 'compatible' string for this CPU for Linux device trees */
23
const char *dtb_compatible;
24
diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
25
index XXXXXXX..XXXXXXX 100644
26
--- a/target/loongarch/kvm/kvm.c
27
+++ b/target/loongarch/kvm/kvm.c
28
@@ -XXX,XX +XXX,XX @@ static void kvm_pv_ipi_set(Object *obj, bool value, Error **errp)
29
cpu->kvm_pv_ipi = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
30
}
31
32
+static bool kvm_steal_time_get(Object *obj, Error **errp)
33
+{
34
+ return LOONGARCH_CPU(obj)->kvm_steal_time != ON_OFF_AUTO_OFF;
35
+}
36
+
37
+static void kvm_steal_time_set(Object *obj, bool value, Error **errp)
38
+{
39
+ LoongArchCPU *cpu = LOONGARCH_CPU(obj);
40
+
41
+ cpu->kvm_steal_time = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
42
+}
43
+
44
void kvm_loongarch_cpu_post_init(LoongArchCPU *cpu)
45
{
46
cpu->lbt = ON_OFF_AUTO_AUTO;
47
@@ -XXX,XX +XXX,XX @@ void kvm_loongarch_cpu_post_init(LoongArchCPU *cpu)
48
kvm_pv_ipi_set);
49
object_property_set_description(OBJECT(cpu), "kvm-pv-ipi",
50
"Set off to disable KVM paravirt IPI.");
51
+
52
+ cpu->kvm_steal_time = ON_OFF_AUTO_AUTO;
53
+ object_property_add_bool(OBJECT(cpu), "kvm-steal-time", kvm_steal_time_get,
54
+ kvm_steal_time_set);
55
+ object_property_set_description(OBJECT(cpu), "kvm-steal-time",
56
+ "Set off to disable KVM steal time.");
57
}
58
59
int kvm_arch_destroy_vcpu(CPUState *cs)
60
diff --git a/target/loongarch/loongarch-qmp-cmds.c b/target/loongarch/loongarch-qmp-cmds.c
61
index XXXXXXX..XXXXXXX 100644
62
--- a/target/loongarch/loongarch-qmp-cmds.c
63
+++ b/target/loongarch/loongarch-qmp-cmds.c
64
@@ -XXX,XX +XXX,XX @@ CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)
65
}
66
67
static const char *cpu_model_advertised_features[] = {
68
- "lsx", "lasx", "lbt", "pmu", "kvm-pv-ipi", NULL
69
+ "lsx", "lasx", "lbt", "pmu", "kvm-pv-ipi", "kvm-steal-time", NULL
70
};
71
72
CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type,
73
--
74
2.43.5
diff view generated by jsdifflib
New patch
[PULL 10/11] target/loongarch: Add kvm steal time feature detection
1
Paravirt steal time feature is OnOffAuto type, feature detection is added
2
to check whether it is supported on KVM host.
1
3
4
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
5
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
6
---
7
target/loongarch/cpu.h | 1 +
8
target/loongarch/kvm/kvm.c | 20 ++++++++++++++++++++
9
2 files changed, 21 insertions(+)
10
11
diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
12
index XXXXXXX..XXXXXXX 100644
13
--- a/target/loongarch/cpu.h
14
+++ b/target/loongarch/cpu.h
15
@@ -XXX,XX +XXX,XX @@ enum loongarch_features {
16
LOONGARCH_FEATURE_LBT, /* loongson binary translation extension */
17
LOONGARCH_FEATURE_PMU,
18
LOONGARCH_FEATURE_PV_IPI,
19
+ LOONGARCH_FEATURE_STEALTIME,
20
};
21
22
typedef struct LoongArchBT {
23
diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
24
index XXXXXXX..XXXXXXX 100644
25
--- a/target/loongarch/kvm/kvm.c
26
+++ b/target/loongarch/kvm/kvm.c
27
@@ -XXX,XX +XXX,XX @@ static bool kvm_feature_supported(CPUState *cs, enum loongarch_features feature)
28
ret = kvm_vm_ioctl(kvm_state, KVM_HAS_DEVICE_ATTR, &attr);
29
return (ret == 0);
30
31
+ case LOONGARCH_FEATURE_STEALTIME:
32
+ attr.group = KVM_LOONGARCH_VM_FEAT_CTRL;
33
+ attr.attr = KVM_LOONGARCH_VM_FEAT_PV_STEALTIME;
34
+ ret = kvm_vm_ioctl(kvm_state, KVM_HAS_DEVICE_ATTR, &attr);
35
+ return (ret == 0);
36
+
37
default:
38
return false;
39
}
40
@@ -XXX,XX +XXX,XX @@ static int kvm_cpu_check_pv_features(CPUState *cs, Error **errp)
41
env->pv_features |= BIT(KVM_FEATURE_IPI);
42
}
43
44
+ kvm_supported = kvm_feature_supported(cs, LOONGARCH_FEATURE_STEALTIME);
45
+ if (cpu->kvm_steal_time == ON_OFF_AUTO_ON) {
46
+ if (!kvm_supported) {
47
+ error_setg(errp, "'kvm stealtime' feature not supported by KVM host");
48
+ return -ENOTSUP;
49
+ }
50
+ } else if (cpu->kvm_steal_time != ON_OFF_AUTO_AUTO) {
51
+ kvm_supported = false;
52
+ }
53
+
54
+ if (kvm_supported) {
55
+ env->pv_features |= BIT(KVM_FEATURE_STEAL_TIME);
56
+ }
57
+
58
return 0;
59
}
60
61
--
62
2.43.5
diff view generated by jsdifflib
New patch
[PULL 11/11] target/loongarch: Enable virtual extioi feature
1
Feature virtual extioi is loongArch virt machine property rather than
2
vCPU property in qemu side. However it is vCPU property in KVM kernel
3
side, here add loongArch virt machine property checking and enable virt
4
extioi feature when vCPU is created.
1
5
6
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
7
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
8
---
9
hw/loongarch/virt.c | 8 --------
10
include/hw/loongarch/virt.h | 9 +++++++++
11
target/loongarch/kvm/kvm.c | 10 ++++++++++
12
3 files changed, 19 insertions(+), 8 deletions(-)
13
14
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
15
index XXXXXXX..XXXXXXX 100644
16
--- a/hw/loongarch/virt.c
17
+++ b/hw/loongarch/virt.c
18
@@ -XXX,XX +XXX,XX @@
19
#include "hw/virtio/virtio-iommu.h"
20
#include "qemu/error-report.h"
21
22
-static bool virt_is_veiointc_enabled(LoongArchVirtMachineState *lvms)
23
-{
24
- if (lvms->veiointc == ON_OFF_AUTO_OFF) {
25
- return false;
26
- }
27
- return true;
28
-}
29
-
30
static void virt_get_veiointc(Object *obj, Visitor *v, const char *name,
31
void *opaque, Error **errp)
32
{
33
diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h
34
index XXXXXXX..XXXXXXX 100644
35
--- a/include/hw/loongarch/virt.h
36
+++ b/include/hw/loongarch/virt.h
37
@@ -XXX,XX +XXX,XX @@ struct LoongArchVirtMachineState {
38
OBJECT_DECLARE_SIMPLE_TYPE(LoongArchVirtMachineState, LOONGARCH_VIRT_MACHINE)
39
void virt_acpi_setup(LoongArchVirtMachineState *lvms);
40
void virt_fdt_setup(LoongArchVirtMachineState *lvms);
41
+
42
+static inline bool virt_is_veiointc_enabled(LoongArchVirtMachineState *lvms)
43
+{
44
+ if (lvms->veiointc == ON_OFF_AUTO_OFF) {
45
+ return false;
46
+ }
47
+ return true;
48
+}
49
+
50
#endif
51
diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
52
index XXXXXXX..XXXXXXX 100644
53
--- a/target/loongarch/kvm/kvm.c
54
+++ b/target/loongarch/kvm/kvm.c
55
@@ -XXX,XX +XXX,XX @@
56
#include "exec/address-spaces.h"
57
#include "hw/boards.h"
58
#include "hw/irq.h"
59
+#include "hw/loongarch/virt.h"
60
#include "qemu/log.h"
61
#include "hw/loader.h"
62
#include "system/runstate.h"
63
@@ -XXX,XX +XXX,XX @@ static int kvm_cpu_check_pmu(CPUState *cs, Error **errp)
64
65
static int kvm_cpu_check_pv_features(CPUState *cs, Error **errp)
66
{
67
+ MachineState *ms = MACHINE(qdev_get_machine());
68
LoongArchCPU *cpu = LOONGARCH_CPU(cs);
69
CPULoongArchState *env = cpu_env(cs);
70
bool kvm_supported;
71
@@ -XXX,XX +XXX,XX @@ static int kvm_cpu_check_pv_features(CPUState *cs, Error **errp)
72
env->pv_features |= BIT(KVM_FEATURE_STEAL_TIME);
73
}
74
75
+ if (object_dynamic_cast(OBJECT(ms), TYPE_LOONGARCH_VIRT_MACHINE)) {
76
+ LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(ms);
77
+
78
+ if (virt_is_veiointc_enabled(lvms)) {
79
+ env->pv_features |= BIT(KVM_FEATURE_VIRT_EXTIOI);
80
+ }
81
+ }
82
+
83
return 0;
84
}
85
86
--
87
2.43.5
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.