[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 6/6] hw/arm/sysbus-fdt: add smmu masters in device tre
From: |
Baptiste Reynal |
Subject: |
[Qemu-devel] [RFC 6/6] hw/arm/sysbus-fdt: add smmu masters in device tree |
Date: |
Fri, 12 Jun 2015 16:20:10 +0200 |
This patch adds a function to bind a device as an SMMU master in the
device tree. Currently, only one device is supported.
A device can be set as SMMU master by using the "x-iommu" argument on
the command line:
-device pl330,x-iommu=true
Signed-off-by: Baptiste Reynal <address@hidden>
---
hw/arm/sysbus-fdt.c | 35 +++++++++++++++++++++++++++++++++++
hw/vfio/platform.c | 1 +
include/hw/vfio/vfio-platform.h | 1 +
3 files changed, 37 insertions(+)
diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c
index 67f4425..356f644 100644
--- a/hw/arm/sysbus-fdt.c
+++ b/hw/arm/sysbus-fdt.c
@@ -101,6 +101,38 @@ static const NodeCreationPair add_fdt_node_functions[] = {
{"", NULL}, /* last element */
};
+static int add_smmu_master(SysBusDevice *sbdev, void *opaque)
+{
+ if (object_dynamic_cast(OBJECT(sbdev), TYPE_VFIO_PLATFORM) &&
+ VFIO_PLATFORM_DEVICE(sbdev)->iommu_master) {
+ int master[2];
+ char *smmu_nodename, *master_nodename;
+ uint64_t mmio_base;
+ PlatformBusFDTData *data = opaque;
+ PlatformBusDevice *pbus = data->pbus;
+ void *fdt = data->fdt;
+ VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(sbdev);
+ VFIODevice *vbasedev = &vdev->vbasedev;
+ const char *parent_node = data->pbus_node_name;
+
+ smmu_nodename = g_strdup_printf("/address@hidden" PRIx64, vsmmu->base);
+ mmio_base = platform_bus_get_mmio_addr(pbus, sbdev, 0);
+
+ master_nodename = g_strdup_printf("%s/address@hidden" PRIx64,
parent_node,
+ vbasedev->name,
+ mmio_base);
+
+ master[0] = cpu_to_be32(qemu_fdt_get_phandle(fdt, master_nodename));
+ master[1] = cpu_to_be32(vbasedev->group->groupid);
+
+ qemu_fdt_setprop(fdt, smmu_nodename, "mmu-masters",
+ master, 2*sizeof(int));
+
+ }
+
+ return 0;
+}
+
/**
* add_fdt_node - add the device tree node of a dynamic sysbus device
*
@@ -193,6 +225,9 @@ static void
add_all_platform_bus_fdt_nodes(ARMPlatformBusFDTParams *fdt_params)
/* Loop through all dynamic sysbus devices and create their node */
foreach_dynamic_sysbus_device(add_fdt_node, &data);
+ if (vsmmu) {
+ foreach_dynamic_sysbus_device(add_smmu_master, &data);
+ }
g_free(node);
}
diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
index 6192458..d4ea297 100644
--- a/hw/vfio/platform.c
+++ b/hw/vfio/platform.c
@@ -585,6 +585,7 @@ static Property vfio_platform_dev_properties[] = {
DEFINE_PROP_BOOL("x-mmap", VFIOPlatformDevice, vbasedev.allow_mmap, true),
DEFINE_PROP_UINT32("mmap-timeout-ms", VFIOPlatformDevice,
mmap_timeout, 1100),
+ DEFINE_PROP_BOOL("x-iommu", VFIOPlatformDevice, iommu_master, false),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/include/hw/vfio/vfio-platform.h b/include/hw/vfio/vfio-platform.h
index 26b2ad6..8f5d980 100644
--- a/include/hw/vfio/vfio-platform.h
+++ b/include/hw/vfio/vfio-platform.h
@@ -57,6 +57,7 @@ typedef struct VFIOPlatformDevice {
uint32_t mmap_timeout; /* delay to re-enable mmaps after interrupt */
QEMUTimer *mmap_timer; /* allows fast-path resume after IRQ hit */
QemuMutex intp_mutex; /* protect the intp_list IRQ state */
+ bool iommu_master; /* is the device a master to the vSMMU ? */
} VFIOPlatformDevice;
typedef struct VFIOPlatformDeviceClass {
--
2.4.3
- [Qemu-devel] [RFC 0/6] vSMMU initialization, Baptiste Reynal, 2015/06/12
- [Qemu-devel] [RFC 1/6] headers sync, Baptiste Reynal, 2015/06/12
- [Qemu-devel] [RFC 2/6] hw/core/platform-bus: initialization notifier, Baptiste Reynal, 2015/06/12
- [Qemu-devel] [RFC 3/6] hw/core/platform-bus: add base_address field, Baptiste Reynal, 2015/06/12
- [Qemu-devel] [RFC 4/6] hw/vfio: vsmmu device, Baptiste Reynal, 2015/06/12
- [Qemu-devel] [RFC 5/6] hw/arm/sysbus-fdt: enable vsmmu dynamic instantiation, Baptiste Reynal, 2015/06/12
- [Qemu-devel] [RFC 6/6] hw/arm/sysbus-fdt: add smmu masters in device tree,
Baptiste Reynal <=
- Re: [Qemu-devel] [RFC 0/6] vSMMU initialization, Will Deacon, 2015/06/12