Allow cold-plugging of an SMMUv3 device on the virt machine when no
global (legacy) SMMUv3 is present or when a virtio-iommu is specified.
This user-created SMMUv3 device is tied to a specific PCI bus provided
by the user, so ensure the IOMMU ops are configured accordingly.
Due to current limitations in QEMU’s device tree support, specifically
its inability to properly present pxb-pcie based root complexes and
their devices, the device tree support for the new SMMUv3 device is
limited to cases where it is attached to the default pcie.0 root complex.
Reviewed-by: Jonathan Cameron
Reviewed-by: Eric Auger
Tested-by: Nathan Chen
Tested-by: Eric Auger
Signed-off-by: Shameer Kolothum
---
hw/arm/smmu-common.c | 8 +-
hw/arm/smmuv3.c | 2 ++
hw/arm/virt.c| 51
hw/core/sysbus-fdt.c | 3 +++
include/hw/arm/smmu-common.h | 1 +
5 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c
index b15e7fd0e4..2ee4691299 100644
--- a/hw/arm/smmu-common.c
+++ b/hw/arm/smmu-common.c
@@ -959,7 +959,12 @@ static void smmu_base_realize(DeviceState *dev, Error
**errp)
goto out_err;
}
}
-pci_setup_iommu(pci_bus, &smmu_ops, s);
+
+if (s->smmu_per_bus) {
+pci_setup_iommu_per_bus(pci_bus, &smmu_ops, s);
+} else {
+pci_setup_iommu(pci_bus, &smmu_ops, s);
+}
return;
}
out_err:
@@ -984,6 +989,7 @@ static void smmu_base_reset_exit(Object *obj, ResetType
type)
static const Property smmu_dev_properties[] = {
DEFINE_PROP_UINT8("bus_num", SMMUState, bus_num, 0),
+DEFINE_PROP_BOOL("smmu_per_bus", SMMUState, smmu_per_bus, false),
DEFINE_PROP_LINK("primary-bus", SMMUState, primary_bus,
TYPE_PCI_BUS, PCIBus *),
};
diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
index ab67972353..bcf8af8dc7 100644
--- a/hw/arm/smmuv3.c
+++ b/hw/arm/smmuv3.c
@@ -1996,6 +1996,8 @@ static void smmuv3_class_init(ObjectClass *klass, const
void *data)
device_class_set_parent_realize(dc, smmu_realize,
&c->parent_realize);
device_class_set_props(dc, smmuv3_properties);
+dc->hotpluggable = false;
+dc->user_creatable = true;
}
static int smmuv3_notify_flag_changed(IOMMUMemoryRegion *iommu,
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 05a14881cf..8340ad33ba 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -56,6 +56,7 @@
#include "qemu/cutils.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
+#include "hw/pci/pci_bus.h"
#include "hw/pci-host/gpex.h"
#include "hw/virtio/virtio-pci.h"
#include "hw/core/sysbus-fdt.h"
@@ -1440,6 +1441,29 @@ static void create_smmuv3_dt_bindings(const
VirtMachineState *vms, hwaddr base,
g_free(node);
}
+static void create_smmuv3_dev_dtb(VirtMachineState *vms,
+ DeviceState *dev, PCIBus *bus)
+{
+PlatformBusDevice *pbus = PLATFORM_BUS_DEVICE(vms->platform_bus_dev);
+SysBusDevice *sbdev = SYS_BUS_DEVICE(dev);
+int irq = platform_bus_get_irqn(pbus, sbdev, 0);
+hwaddr base = platform_bus_get_mmio_addr(pbus, sbdev, 0);
+MachineState *ms = MACHINE(vms);
+
+if (!(vms->bootinfo.firmware_loaded && virt_is_acpi_enabled(vms)) &&
+strcmp("pcie.0", bus->qbus.name)) {
+warn_report("SMMUv3 device only supported with pcie.0 for DT");
+return;
+}
+base += vms->memmap[VIRT_PLATFORM_BUS].base;
+irq += vms->irqmap[VIRT_PLATFORM_BUS];
+
+vms->iommu_phandle = qemu_fdt_alloc_phandle(ms->fdt);
+create_smmuv3_dt_bindings(vms, base, SMMU_IO_LEN, irq);
+qemu_fdt_setprop_cells(ms->fdt, vms->pciehb_nodename, "iommu-map",
+ 0x0, vms->iommu_phandle, 0x0, 0x1);
+}
+
static void create_smmu(const VirtMachineState *vms,
PCIBus *bus)
{
@@ -2935,6 +2959,16 @@ static void
virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,
qlist_append_str(reserved_regions, resv_prop_str);
qdev_prop_set_array(dev, "reserved-regions", reserved_regions);
g_free(resv_prop_str);
+} else if (object_dynamic_cast(OBJECT(dev), TYPE_ARM_SMMUV3)) {
+if (vms->legacy_smmuv3_present || vms->iommu == VIRT_IOMMU_VIRTIO) {
+error_setg(errp, "virt machine already has %s set. "
+ "Doesn't support incompatible iommus",
+ (vms->legacy_smmuv3_present) ?
+ "iommu=smmuv3" : "virtio-iommu");
+} else if (vms->iommu == VIRT_IOMMU_NONE) {
+/* The new SMMUv3 device is specific to the PCI bus */
+object_property_set_bool(OBJECT(dev), "smmu_per_bus", true, NULL);
+}
}
}
@@ -2958,6 +2992,22 @@ static void virt_machine_device_plug_cb(HotplugHandler
*hotplug_dev,
virtio_md_pci_plug(VIRTIO_MD_PCI(dev), MACHINE(ho
