[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [RFC v5 14/22] virtio-iommu: Add an msi_bypass property
From: |
Eric Auger |
Subject: |
[Qemu-arm] [RFC v5 14/22] virtio-iommu: Add an msi_bypass property |
Date: |
Fri, 19 Jan 2018 14:49:07 +0000 |
In case the msi_bypass property is set, it means we need
to register the IOAPIC MSI window as a reserved region:
0xFEE00000 - 0xFEEFFFFF.
Signed-off-by: Eric Auger <address@hidden>
---
---
hw/virtio/virtio-iommu.c | 52 ++++++++++++++++++++++++++++++++++++++++
include/hw/virtio/virtio-iommu.h | 1 +
2 files changed, 53 insertions(+)
diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index 0e712b3..306a633 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -41,6 +41,9 @@
#define VIOMMU_DEFAULT_QUEUE_SIZE 256
#define VIOMMU_PROBE_SIZE 512
+#define IOAPIC_RANGE_START (0xfee00000)
+#define IOAPIC_RANGE_SIZE (0x100000)
+
#define SUPPORTED_PROBE_PROPERTIES (\
VIRTIO_IOMMU_PROBE_T_NONE | \
VIRTIO_IOMMU_PROBE_T_RESV_MEM)
@@ -103,6 +106,25 @@ static void
virtio_iommu_detach_endpoint_from_domain(viommu_endpoint *ep)
ep->domain = NULL;
}
+static void virtio_iommu_register_resv_region(viommu_endpoint *ep,
+ uint8_t subtype,
+ uint64_t addr, uint64_t size)
+{
+ viommu_interval *interval;
+ struct virtio_iommu_probe_resv_mem *reg;
+
+ interval = g_malloc0(sizeof(*interval));
+ interval->low = addr;
+ interval->high = addr + size - 1;
+
+ reg = g_malloc0(sizeof(*reg));
+ reg->subtype = subtype;
+ reg->addr = cpu_to_le64(addr);
+ reg->size = cpu_to_le64(size);
+
+ g_tree_insert(ep->reserved_regions, interval, reg);
+}
+
static viommu_endpoint *virtio_iommu_get_endpoint(VirtIOIOMMU *s,
uint32_t ep_id)
{
@@ -120,6 +142,12 @@ static viommu_endpoint
*virtio_iommu_get_endpoint(VirtIOIOMMU *s,
ep->reserved_regions = g_tree_new_full((GCompareDataFunc)interval_cmp,
NULL, (GDestroyNotify)g_free,
(GDestroyNotify)g_free);
+ if (s->msi_bypass) {
+ virtio_iommu_register_resv_region(ep, VIRTIO_IOMMU_RESV_MEM_T_MSI,
+ IOAPIC_RANGE_START,
+ IOAPIC_RANGE_SIZE);
+ }
+
return ep;
}
@@ -847,8 +875,32 @@ static void virtio_iommu_set_status(VirtIODevice *vdev,
uint8_t status)
trace_virtio_iommu_device_status(status);
}
+static bool virtio_iommu_get_msi_bypass(Object *obj, Error **errp)
+{
+ VirtIOIOMMU *s = VIRTIO_IOMMU(obj);
+
+ return s->msi_bypass;
+}
+
+static void virtio_iommu_set_msi_bypass(Object *obj, bool value, Error **errp)
+{
+ VirtIOIOMMU *s = VIRTIO_IOMMU(obj);
+
+ s->msi_bypass = value;
+}
+
static void virtio_iommu_instance_init(Object *obj)
{
+ VirtIOIOMMU *s = VIRTIO_IOMMU(obj);
+
+ object_property_add_bool(obj, "msi_bypass", virtio_iommu_get_msi_bypass,
+ virtio_iommu_set_msi_bypass, NULL);
+ object_property_set_description(obj, "msi_bypass",
+ "Indicates whether msis are bypassed by "
+ "the IOMMU. Default is YES",
+ NULL);
+
+ s->msi_bypass = true;
}
static const VMStateDescription vmstate_virtio_iommu = {
diff --git a/include/hw/virtio/virtio-iommu.h b/include/hw/virtio/virtio-iommu.h
index 0b6b3f2..458b2a0 100644
--- a/include/hw/virtio/virtio-iommu.h
+++ b/include/hw/virtio/virtio-iommu.h
@@ -57,6 +57,7 @@ typedef struct VirtIOIOMMU {
GTree *domains;
QemuMutex mutex;
GTree *endpoints;
+ bool msi_bypass;
} VirtIOIOMMU;
#endif
--
1.9.1
- [Qemu-arm] [RFC v5 04/22] update-linux-headers: Import virtio_iommu.h, (continued)
- [Qemu-arm] [RFC v5 04/22] update-linux-headers: Import virtio_iommu.h, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 05/22] linux-headers: Partial update for virtio-iommu, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 06/22] virtio-iommu: Add skeleton, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 07/22] virtio-iommu: Decode the command payload, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 08/22] virtio-iommu: Add the iommu regions, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 09/22] virtio-iommu: Register attached endpoints, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 10/22] virtio-iommu: Implement attach/detach command, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 11/22] virtio-iommu: Implement map/unmap, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 12/22] virtio-iommu: Implement translate, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 13/22] virtio-iommu: Implement probe request, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 14/22] virtio-iommu: Add an msi_bypass property,
Eric Auger <=
- [Qemu-arm] [RFC v5 15/22] virtio-iommu: Implement fault reporting, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 16/22] virtio_iommu: Handle reserved regions in translation process, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 17/22] hw/arm/virt: Add virtio-iommu to the virt board, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 18/22] hw/arm/virt-acpi-build: Add virtio-iommu node in IORT table, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 19/22] memory.h: Add set_page_size_mask IOMMUMemoryRegion callback, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 20/22] hw/vfio/common: Set the IOMMUMemoryRegion supported page sizes, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 21/22] virtio-iommu: Implement set_page_size_mask, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 22/22] hw/vfio/common: Do not print error when viommu translates into an mmio region, Eric Auger, 2018/01/19