1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
|
From 3104d411ee36487ea409ba5a1b474989326f70f2 Mon Sep 17 00:00:00 2001
From: Vikram Garhwal <vikram.garhwal@amd.com>
Date: Wed, 15 Nov 2023 14:19:31 -0800
Subject: [PATCH] arm: xenpvh: Introduce virtio-pci support
The bridge is needed for virtio-pci support, as QEMU can emulate the
whole bridge with any virtio-pci devices connected to it.
NOTE: A few xen-hvm-common.c and xen_native.h changes are cherry-picked from
EPAM QEMU patches for xen-arm. This was done to keep least diff with upstream.
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
Signed-off-by: Volodymyr Babchuk <volodymyr_babchuk@epam.com>
---
hw/arm/xen_arm.c | 271 ++++++++++++++++++++++++++++++++++++
include/hw/xen/xen_native.h | 3 +
2 files changed, 274 insertions(+)
diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
index 1587e2a43b..a7c5b20777 100644
--- a/hw/arm/xen_arm.c
+++ b/hw/arm/xen_arm.c
@@ -34,6 +34,7 @@
#include "hw/xen/xen-hvm-common.h"
#include "sysemu/tpm.h"
#include "hw/xen/arch_hvm.h"
+#include "hw/pci-host/gpex.h"
#define TYPE_XEN_ARM MACHINE_TYPE_NAME("xenpvh")
OBJECT_DECLARE_SIMPLE_TYPE(XenArmState, XEN_ARM)
@@ -57,6 +58,9 @@ struct XenArmState {
struct {
uint64_t tpm_base_addr;
+ MemMapEntry pcie_mmio;
+ MemMapEntry pcie_ecam;
+ MemMapEntry pcie_mmio_high;
} cfg;
};
@@ -132,6 +136,80 @@ static void xen_init_ram(MachineState *machine)
ram_grants = *xen_init_grant_ram();
}
+static bool xen_validate_pcie_config(XenArmState *xam)
+{
+ if (xam->cfg.pcie_ecam.base == 0 &&
+ xam->cfg.pcie_ecam.size == 0 &&
+ xam->cfg.pcie_mmio.base == 0 &&
+ xam->cfg.pcie_mmio.size == 0 &&
+ xam->cfg.pcie_mmio_high.base == 0 &&
+ xam->cfg.pcie_mmio_high.size == 0) {
+ /* It's okay, user just don't want PCIe brige */
+ return false;
+ }
+
+ if (xam->cfg.pcie_ecam.base == 0 ||
+ xam->cfg.pcie_ecam.size == 0 ||
+ xam->cfg.pcie_mmio.base == 0 ||
+ xam->cfg.pcie_mmio.size == 0 ||
+ xam->cfg.pcie_mmio_high.base == 0 ||
+ xam->cfg.pcie_mmio_high.size == 0) {
+ /* User provided some PCIe options, but not all of them */
+ error_printf("Incomplete PCIe bridge configuration\n");
+ exit(1);
+ }
+
+ return true;
+}
+
+static void xen_create_pcie(XenArmState *xam)
+{
+ MemoryRegion *mmio_alias, *mmio_alias_high, *mmio_reg;
+ MemoryRegion *ecam_alias, *ecam_reg;
+ DeviceState *dev;
+ int i;
+
+ dev = qdev_new(TYPE_GPEX_HOST);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
+
+ /* Map ECAM space */
+ ecam_alias = g_new0(MemoryRegion, 1);
+ ecam_reg = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0);
+ memory_region_init_alias(ecam_alias, OBJECT(dev), "pcie-ecam",
+ ecam_reg, 0, xam->cfg.pcie_ecam.size);
+ memory_region_add_subregion(get_system_memory(), xam->cfg.pcie_ecam.base,
+ ecam_alias);
+
+ /* Map the MMIO space */
+ mmio_alias = g_new0(MemoryRegion, 1);
+ mmio_reg = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 1);
+ memory_region_init_alias(mmio_alias, OBJECT(dev), "pcie-mmio",
+ mmio_reg,
+ xam->cfg.pcie_mmio.base,
+ xam->cfg.pcie_mmio.size);
+ memory_region_add_subregion(get_system_memory(), xam->cfg.pcie_mmio.base,
+ mmio_alias);
+
+ /* Map the MMIO_HIGH space */
+ mmio_alias_high = g_new0(MemoryRegion, 1);
+ memory_region_init_alias(mmio_alias_high, OBJECT(dev), "pcie-mmio-high",
+ mmio_reg,
+ xam->cfg.pcie_mmio_high.base,
+ xam->cfg.pcie_mmio_high.size);
+ memory_region_add_subregion(get_system_memory(),
+ xam->cfg.pcie_mmio_high.base,
+ mmio_alias_high);
+
+ /* Legacy PCI interrupts (#INTA - #INTD) */
+ for (i = 0; i < GPEX_NUM_IRQS; i++) {
+ qemu_irq irq = qemu_allocate_irq(xen_set_irq, NULL,
+ GUEST_VIRTIO_PCI_SPI_FIRST + i);
+
+ sysbus_connect_irq(SYS_BUS_DEVICE(dev), i, irq);
+ gpex_set_irq_num(GPEX_HOST(dev), i, GUEST_VIRTIO_PCI_SPI_FIRST + i);
+ }
+}
+
void arch_handle_ioreq(XenIOState *state, ioreq_t *req)
{
hw_error("Invalid ioreq type 0x%x\n", req->type);
@@ -193,6 +271,13 @@ static void xen_arm_init(MachineState *machine)
xen_create_virtio_mmio_devices(xam);
+ if (xen_validate_pcie_config(xam)) {
+ xen_create_pcie(xam);
+ } else {
+ DPRINTF("PCIe host bridge is not configured,"
+ " only virtio-mmio can be used\n");
+ }
+
#ifdef CONFIG_TPM
if (xam->cfg.tpm_base_addr) {
xen_enable_tpm(xam);
@@ -228,6 +313,150 @@ static void xen_arm_set_tpm_base_addr(Object *obj, Visitor *v,
}
#endif
+static void xen_arm_get_pcie_ecam_base_addr(Object *obj, Visitor *v,
+ const char *name, void *opaque,
+ Error **errp)
+{
+ XenArmState *xam = XEN_ARM(obj);
+ uint64_t value = xam->cfg.pcie_ecam.base;
+
+ visit_type_uint64(v, name, &value, errp);
+}
+
+static void xen_arm_set_pcie_ecam_base_addr(Object *obj, Visitor *v,
+ const char *name, void *opaque,
+ Error **errp)
+{
+ XenArmState *xam = XEN_ARM(obj);
+ uint64_t value;
+
+ if (!visit_type_uint64(v, name, &value, errp)) {
+ return;
+ }
+
+ xam->cfg.pcie_ecam.base = value;
+}
+
+static void xen_arm_get_pcie_ecam_size(Object *obj, Visitor *v,
+ const char *name, void *opaque,
+ Error **errp)
+{
+ XenArmState *xam = XEN_ARM(obj);
+ uint64_t value = xam->cfg.pcie_ecam.size;
+
+ visit_type_uint64(v, name, &value, errp);
+}
+
+static void xen_arm_set_pcie_ecam_size(Object *obj, Visitor *v,
+ const char *name, void *opaque,
+ Error **errp)
+{
+ XenArmState *xam = XEN_ARM(obj);
+ uint64_t value;
+
+ if (!visit_type_uint64(v, name, &value, errp)) {
+ return;
+ }
+
+ xam->cfg.pcie_ecam.size = value;
+}
+
+static void xen_arm_get_pcie_mmio_base_addr(Object *obj, Visitor *v,
+ const char *name, void *opaque,
+ Error **errp)
+{
+ XenArmState *xam = XEN_ARM(obj);
+ uint64_t value = xam->cfg.pcie_mmio.base;
+
+ visit_type_uint64(v, name, &value, errp);
+}
+
+static void xen_arm_set_pcie_mmio_base_addr(Object *obj, Visitor *v,
+ const char *name, void *opaque,
+ Error **errp)
+{
+ XenArmState *xam = XEN_ARM(obj);
+ uint64_t value;
+
+ if (!visit_type_uint64(v, name, &value, errp)) {
+ return;
+ }
+
+ xam->cfg.pcie_mmio.base = value;
+}
+
+static void xen_arm_get_pcie_mmio_size(Object *obj, Visitor *v,
+ const char *name, void *opaque,
+ Error **errp)
+{
+ XenArmState *xam = XEN_ARM(obj);
+ uint64_t value = xam->cfg.pcie_mmio.size;
+
+ visit_type_uint64(v, name, &value, errp);
+}
+
+static void xen_arm_set_pcie_mmio_size(Object *obj, Visitor *v,
+ const char *name, void *opaque,
+ Error **errp)
+{
+ XenArmState *xam = XEN_ARM(obj);
+ uint64_t value;
+
+ if (!visit_type_uint64(v, name, &value, errp)) {
+ return;
+ }
+
+ xam->cfg.pcie_mmio.size = value;
+}
+
+static void xen_arm_get_pcie_prefetch_base_addr(Object *obj, Visitor *v,
+ const char *name, void *opaque,
+ Error **errp)
+{
+ XenArmState *xam = XEN_ARM(obj);
+ uint64_t value = xam->cfg.pcie_mmio_high.base;
+
+ visit_type_uint64(v, name, &value, errp);
+}
+
+static void xen_arm_set_pcie_prefetch_base_addr(Object *obj, Visitor *v,
+ const char *name, void *opaque,
+ Error **errp)
+{
+ XenArmState *xam = XEN_ARM(obj);
+ uint64_t value;
+
+ if (!visit_type_uint64(v, name, &value, errp)) {
+ return;
+ }
+
+ xam->cfg.pcie_mmio_high.base = value;
+}
+
+static void xen_arm_get_pcie_prefetch_size(Object *obj, Visitor *v,
+ const char *name, void *opaque,
+ Error **errp)
+{
+ XenArmState *xam = XEN_ARM(obj);
+ uint64_t value = xam->cfg.pcie_mmio_high.size;
+
+ visit_type_uint64(v, name, &value, errp);
+}
+
+static void xen_arm_set_pcie_prefetch_size(Object *obj, Visitor *v,
+ const char *name, void *opaque,
+ Error **errp)
+{
+ XenArmState *xam = XEN_ARM(obj);
+ uint64_t value;
+
+ if (!visit_type_uint64(v, name, &value, errp)) {
+ return;
+ }
+
+ xam->cfg.pcie_mmio_high.size = value;
+}
+
static void xen_arm_machine_class_init(ObjectClass *oc, void *data)
{
@@ -249,6 +478,48 @@ static void xen_arm_machine_class_init(ObjectClass *oc, void *data)
machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS);
#endif
+
+ object_class_property_add(oc, "pci-ecam-base-addr", "uint64_t",
+ xen_arm_get_pcie_ecam_base_addr,
+ xen_arm_set_pcie_ecam_base_addr,
+ NULL, NULL);
+ object_class_property_set_description(oc, "pci-ecam-base-addr",
+ "Set Base address for PCI ECAM.");
+
+ object_class_property_add(oc, "pci-ecam-size", "uint64_t",
+ xen_arm_get_pcie_ecam_size,
+ xen_arm_set_pcie_ecam_size,
+ NULL, NULL);
+ object_class_property_set_description(oc, "pci-ecam-size",
+ "Set Size for PCI ECAM.");
+
+ object_class_property_add(oc, "pci-mmio-base-addr", "uint64_t",
+ xen_arm_get_pcie_mmio_base_addr,
+ xen_arm_set_pcie_mmio_base_addr,
+ NULL, NULL);
+ object_class_property_set_description(oc, "pci-mmio-base-addr",
+ "Set Base address for PCI MMIO.");
+
+ object_class_property_add(oc, "pci-mmio-size", "uint64_t",
+ xen_arm_get_pcie_mmio_size,
+ xen_arm_set_pcie_mmio_size,
+ NULL, NULL);
+ object_class_property_set_description(oc, "pci-mmio-size",
+ "Set size for PCI MMIO.");
+
+ object_class_property_add(oc, "pci-prefetch-base-addr", "uint64_t",
+ xen_arm_get_pcie_prefetch_base_addr,
+ xen_arm_set_pcie_prefetch_base_addr,
+ NULL, NULL);
+ object_class_property_set_description(oc, "pci-prefetch-base-addr",
+ "Set Prefetch Base address for PCI.");
+
+ object_class_property_add(oc, "pci-prefetch-size", "uint64_t",
+ xen_arm_get_pcie_prefetch_size,
+ xen_arm_set_pcie_prefetch_size,
+ NULL, NULL);
+ object_class_property_set_description(oc, "pci-prefetch-size",
+ "Set Prefetch size for PCI.");
}
static const TypeInfo xen_arm_machine_type = {
diff --git a/include/hw/xen/xen_native.h b/include/hw/xen/xen_native.h
index 6f09c48823..1e81189a27 100644
--- a/include/hw/xen/xen_native.h
+++ b/include/hw/xen/xen_native.h
@@ -539,6 +539,9 @@ static inline int xendevicemodel_set_irq_level(xendevicemodel_handle *dmod,
#define GUEST_VIRTIO_MMIO_SPI_LAST 43
#endif
+#define GUEST_VIRTIO_PCI_SPI_FIRST 44
+#define GUEST_VIRTIO_PCI_SPI_LAST 48
+
#if defined(__i386__) || defined(__x86_64__)
#define GUEST_RAM_BANKS 2
#define GUEST_RAM0_BASE 0x40000000ULL /* 3GB of low RAM @ 1GB */
--
2.30.2
|