[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 3/8] hw/arm/virt: Reject instantiation of multiple IOMMUs
From: |
Jean-Philippe Brucker |
Subject: |
[PATCH v7 3/8] hw/arm/virt: Reject instantiation of multiple IOMMUs |
Date: |
Fri, 10 Dec 2021 17:04:11 +0000 |
We do not support instantiating multiple IOMMUs. Before adding a
virtio-iommu, check that no other IOMMU is present. This will detect
both "iommu=smmuv3" machine parameter and another virtio-iommu instance.
Fixes: 70e89132c9 ("hw/arm/virt: Add the virtio-iommu device tree mappings")
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
---
hw/arm/virt.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 53941e4aac..608a0a78f0 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -2494,6 +2494,11 @@ static void
virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,
hwaddr db_start = 0, db_end = 0;
char *resv_prop_str;
+ if (vms->iommu != VIRT_IOMMU_NONE) {
+ error_setg(errp, "virt machine does not support multiple IOMMUs");
+ return;
+ }
+
switch (vms->msi_controller) {
case VIRT_MSI_CTRL_NONE:
return;
--
2.34.1
- [PATCH v7 0/8] virtio-iommu: Add ACPI support (Arm part + tests), Jean-Philippe Brucker, 2021/12/10
- [PATCH v7 4/8] hw/arm/virt: Use object_property_set instead of qdev_prop_set, Jean-Philippe Brucker, 2021/12/10
- [PATCH v7 5/8] tests/acpi: allow updates of VIOT expected data files, Jean-Philippe Brucker, 2021/12/10
- [PATCH v7 3/8] hw/arm/virt: Reject instantiation of multiple IOMMUs,
Jean-Philippe Brucker <=
- [PATCH v7 1/8] hw/arm/virt-acpi-build: Add VIOT table for virtio-iommu, Jean-Philippe Brucker, 2021/12/10
- [PATCH v7 7/8] tests/acpi: add expected blobs for VIOT test on q35 machine, Jean-Philippe Brucker, 2021/12/10
- [PATCH v7 2/8] hw/arm/virt: Remove device tree restriction for virtio-iommu, Jean-Philippe Brucker, 2021/12/10
- [PATCH v7 6/8] tests/acpi: add test case for VIOT, Jean-Philippe Brucker, 2021/12/10
- [PATCH v7 8/8] tests/acpi: add expected blob for VIOT test on virt machine, Jean-Philippe Brucker, 2021/12/10
- Re: [PATCH v7 0/8] virtio-iommu: Add ACPI support (Arm part + tests), Ani Sinha, 2021/12/11