[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 07/12] hw/arm/virt: Reject instantiation of multiple IOMMUs
From: |
Jean-Philippe Brucker |
Subject: |
[PATCH v5 07/12] hw/arm/virt: Reject instantiation of multiple IOMMUs |
Date: |
Wed, 20 Oct 2021 18:27:41 +0100 |
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 3da7a86e37..25db8d4262 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -2441,6 +2441,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.33.0
- Re: [PATCH v5 02/12] hw/i386/pc: Remove x86_iommu_get_type(), (continued)
- [PATCH v5 04/12] hw/i386/pc: Allow instantiating a virtio-iommu device, Jean-Philippe Brucker, 2021/10/20
- [PATCH v5 03/12] hw/i386/pc: Move IOMMU singleton into PCMachineState, Jean-Philippe Brucker, 2021/10/20
- [PATCH v5 06/12] hw/arm/virt: Remove device tree restriction for virtio-iommu, Jean-Philippe Brucker, 2021/10/20
- [PATCH v5 07/12] hw/arm/virt: Reject instantiation of multiple IOMMUs,
Jean-Philippe Brucker <=
- [PATCH v5 05/12] hw/arm/virt-acpi-build: Add VIOT table for virtio-iommu, Jean-Philippe Brucker, 2021/10/20
- [PATCH v5 10/12] tests/acpi: add test cases for VIOT, Jean-Philippe Brucker, 2021/10/20
- [PATCH v5 09/12] tests/acpi: allow updates of VIOT expected data files, Jean-Philippe Brucker, 2021/10/20