From: Eric Auger <eric.auger@linaro.org>
To: eric.auger@st.com, christoffer.dall@linaro.org,
qemu-devel@nongnu.org, kim.phillips@freescale.com,
a.rigo@virtualopensystems.com
Cc: peter.maydell@linaro.org, eric.auger@linaro.org,
patches@linaro.org, will.deacon@arm.com, agraf@suse.de,
stuart.yoder@freescale.com, Bharat.Bhushan@freescale.com,
alex.williamson@redhat.com, joel.schopp@amd.com,
a.motakis@virtualopensystems.com, kvmarm@lists.cs.columbia.edu
Subject: [Qemu-devel] [PATCH v5 10/10] hw/arm/dyn_sysbus_devtree: enable simple VFIO dynamic instantiation
Date: Sat, 9 Aug 2014 15:25:49 +0100 [thread overview]
Message-ID: <1407594349-9291-11-git-send-email-eric.auger@linaro.org> (raw)
In-Reply-To: <1407594349-9291-1-git-send-email-eric.auger@linaro.org>
Generates the device node of VFIO devices, if any are invoked in
-device option. In case VFIO devices require more complex node
generation, they can be handled before.
Signed-off-by: Eric Auger <eric.auger@linaro.org>
---
hw/arm/dyn_sysbus_devtree.c | 138 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 138 insertions(+)
diff --git a/hw/arm/dyn_sysbus_devtree.c b/hw/arm/dyn_sysbus_devtree.c
index 56af62f..ac34f07 100644
--- a/hw/arm/dyn_sysbus_devtree.c
+++ b/hw/arm/dyn_sysbus_devtree.c
@@ -1,6 +1,139 @@
#include "hw/arm/dyn_sysbus_devtree.h"
#include "qemu/error-report.h"
#include "sysemu/device_tree.h"
+#include "hw/vfio/vfio-platform.h"
+
+static void vfio_fdt_add_device_node(SysBusDevice *sbdev, void *opaque);
+
+static char *format_compat(char * compat)
+{
+ char *str_ptr, *corrected_compat;
+ /*
+ * process compatibility property string passed by end-user
+ * replaces / by , and ; by NUL character
+ */
+ corrected_compat = g_strdup(compat);
+ /*
+ * the total length of the string has to include also the last
+ * NUL char.
+ */
+
+ str_ptr = corrected_compat;
+ while ((str_ptr = strchr(str_ptr, '/')) != NULL) {
+ *str_ptr = ',';
+ }
+
+ /* substitute ";" with the NUL char */
+ str_ptr = corrected_compat;
+ while ((str_ptr = strchr(str_ptr, ';')) != NULL) {
+ *str_ptr = '\0';
+ }
+
+ return corrected_compat;
+}
+
+static void wrap_vfio_fdt_add_node(SysBusDevice *sbdev, void *opaque)
+{
+ PlatformDevtreeData *data = opaque;
+ VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(sbdev);
+ VFIODevice *vbasedev = &vdev->vbasedev;
+ gchar irq_number_prop[8];
+ Object *obj = OBJECT(sbdev);
+ char *corrected_compat;
+ uint64_t irq_number;
+ int compat_str_len = strlen(vdev->compat)+1;
+ int i;
+
+ corrected_compat = format_compat(vdev->compat);
+ snprintf(vdev->compat, compat_str_len, "%s", corrected_compat);
+ g_free(corrected_compat);
+
+ vfio_fdt_add_device_node(sbdev, opaque);
+
+ for (i = 0; i < vbasedev->num_irqs; i++) {
+ snprintf(irq_number_prop, sizeof(irq_number_prop), "irq[%d]", i);
+ irq_number = object_property_get_int(obj, irq_number_prop, NULL)
+ + data->irq_start;
+ /*
+ * for setting irqfd up we must provide the virtual IRQ number
+ * which is the sum of irq_start and actual platform bus irq
+ * index. At realize point we do not have this info.
+ */
+ if (vdev->irqfd_allowed) {
+ vfio_setup_irqfd(sbdev, i, irq_number);
+ }
+ }
+}
+
+static void vfio_fdt_add_device_node(SysBusDevice *sbdev, void *opaque)
+{
+ PlatformDevtreeData *data = opaque;
+ void *fdt = data->fdt;
+ const char *parent_node = data->node;
+ int compat_str_len;
+ char *nodename;
+ int i, ret;
+ uint32_t *irq_attr;
+ uint64_t *reg_attr;
+ uint64_t mmio_base;
+ uint64_t irq_number;
+ gchar mmio_base_prop[8];
+ gchar irq_number_prop[8];
+ VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(sbdev);
+ VFIODevice *vbasedev = &vdev->vbasedev;
+ Object *obj = OBJECT(sbdev);
+
+ mmio_base = object_property_get_int(obj, "mmio[0]", NULL);
+
+ nodename = g_strdup_printf("%s/%s@%" PRIx64, parent_node,
+ vbasedev->name,
+ mmio_base);
+
+ qemu_fdt_add_subnode(fdt, nodename);
+
+ compat_str_len = strlen(vdev->compat) + 1;
+ qemu_fdt_setprop(fdt, nodename, "compatible",
+ vdev->compat, compat_str_len);
+
+ reg_attr = g_new(uint64_t, vbasedev->num_regions*4);
+
+ for (i = 0; i < vbasedev->num_regions; i++) {
+ snprintf(mmio_base_prop, sizeof(mmio_base_prop), "mmio[%d]", i);
+ mmio_base = object_property_get_int(obj, mmio_base_prop, NULL);
+ reg_attr[2*i] = 1;
+ reg_attr[2*i+1] = mmio_base;
+ reg_attr[2*i+2] = 1;
+ reg_attr[2*i+3] = memory_region_size(&vdev->regions[i]->mem);
+ }
+
+ ret = qemu_fdt_setprop_sized_cells_from_array(fdt, nodename, "reg",
+ vbasedev->num_regions*2, reg_attr);
+ if (ret < 0) {
+ error_report("could not set reg property of node %s", nodename);
+ }
+
+ irq_attr = g_new(uint32_t, vbasedev->num_irqs*3);
+
+ for (i = 0; i < vbasedev->num_irqs; i++) {
+ snprintf(irq_number_prop, sizeof(irq_number_prop), "irq[%d]", i);
+ irq_number = object_property_get_int(obj, irq_number_prop, NULL)
+ + data->irq_start;
+ irq_attr[3*i] = cpu_to_be32(0);
+ irq_attr[3*i+1] = cpu_to_be32(irq_number);
+ irq_attr[3*i+2] = cpu_to_be32(0x4);
+ }
+
+ ret = qemu_fdt_setprop(fdt, nodename, "interrupts",
+ irq_attr, vbasedev->num_irqs*3*sizeof(uint32_t));
+ if (ret < 0) {
+ error_report("could not set interrupts property of node %s",
+ nodename);
+ }
+
+ g_free(nodename);
+ g_free(irq_attr);
+ g_free(reg_attr);
+}
int sysbus_device_create_devtree(Object *obj, void *opaque)
{
@@ -17,6 +150,11 @@ int sysbus_device_create_devtree(Object *obj, void *opaque)
return object_child_foreach(obj, sysbus_device_create_devtree, data);
}
+ if (object_dynamic_cast(obj, TYPE_VFIO_PLATFORM)) {
+ wrap_vfio_fdt_add_node(sbdev, data);
+ matched = true;
+ }
+
if (!matched) {
error_report("Device %s is not supported by this machine yet.",
qdev_fw_name(DEVICE(dev)));
--
1.8.3.2
next prev parent reply other threads:[~2014-08-09 14:26 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-09 14:25 [Qemu-devel] [PATCH v5 00/10] KVM platform device passthrough Eric Auger
2014-08-09 14:25 ` [Qemu-devel] [PATCH v5 01/10] vfio: move hw/misc/vfio.c to hw/vfio/pci.c Move vfio.h into include/hw/vfio Eric Auger
2014-08-09 14:25 ` [Qemu-devel] [PATCH v5 02/10] hw/vfio/pci: Rename VFIODevice into VFIOPCIDevice Eric Auger
2014-08-09 14:25 ` [Qemu-devel] [PATCH v5 03/10] hw/vfio/pci: introduce VFIODevice Eric Auger
2014-08-12 2:34 ` David Gibson
2014-08-09 14:25 ` [Qemu-devel] [PATCH v5 04/10] hw/vfio/pci: Introduce VFIORegion Eric Auger
2014-08-09 14:25 ` [Qemu-devel] [PATCH v5 05/10] hw/vfio/pci: split vfio_get_device Eric Auger
2014-08-12 2:41 ` David Gibson
2014-08-12 6:54 ` Eric Auger
2014-08-13 3:32 ` David Gibson
2014-08-29 10:00 ` Eric Auger
2014-08-09 14:25 ` [Qemu-devel] [PATCH v5 06/10] hw/vfio: create common module Eric Auger
2014-08-11 19:20 ` Alex Williamson
2014-08-12 5:57 ` Eric Auger
2014-08-11 19:25 ` Alex Williamson
2014-08-12 6:09 ` Eric Auger
2014-08-13 19:59 ` Alex Williamson
2014-09-01 16:31 ` Eric Auger
2014-09-01 17:41 ` Alexander Graf
2014-09-02 7:13 ` Eric Auger
2014-09-02 21:13 ` Alex Williamson
2014-08-20 19:12 ` Joel Schopp
2014-08-20 19:41 ` Alex Williamson
2014-08-20 20:08 ` Joel Schopp
2014-08-09 14:25 ` [Qemu-devel] [PATCH v5 07/10] hw/vfio/platform: add vfio-platform support Eric Auger
2014-08-11 9:36 ` Alexander Graf
2014-08-12 7:59 ` Bharat.Bhushan
2014-08-12 16:34 ` Eric Auger
2014-08-11 20:13 ` Alex Williamson
2014-08-12 5:51 ` Eric Auger
2014-08-09 14:25 ` [Qemu-devel] [PATCH v5 08/10] hw/intc/arm_gic_kvm: advertise irqfd Eric Auger
2014-08-11 9:37 ` Alexander Graf
2014-08-11 12:04 ` Eric Auger
2014-08-11 12:05 ` Alexander Graf
2014-08-11 12:27 ` Eric Auger
2014-08-11 12:29 ` Alexander Graf
2014-08-09 14:25 ` [Qemu-devel] [PATCH v5 09/10] hw/vfio/platform: Add irqfd support Eric Auger
2014-08-09 14:25 ` Eric Auger [this message]
2014-08-11 9:40 ` [Qemu-devel] [PATCH v5 10/10] hw/arm/dyn_sysbus_devtree: enable simple VFIO dynamic instantiation Alexander Graf
2014-08-11 11:55 ` Eric Auger
2014-08-18 21:54 ` Joel Schopp
2014-08-18 22:11 ` Peter Maydell
2014-08-18 22:26 ` Joel Schopp
2014-08-19 7:32 ` Eric Auger
2014-08-19 10:59 ` Alexander Graf
2014-08-19 14:15 ` Joel Schopp
2014-08-19 14:29 ` Alexander Graf
2014-08-19 7:24 ` Eric Auger
2014-08-19 8:17 ` Peter Maydell
2014-08-19 6:59 ` Eric Auger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1407594349-9291-11-git-send-email-eric.auger@linaro.org \
--to=eric.auger@linaro.org \
--cc=Bharat.Bhushan@freescale.com \
--cc=a.motakis@virtualopensystems.com \
--cc=a.rigo@virtualopensystems.com \
--cc=agraf@suse.de \
--cc=alex.williamson@redhat.com \
--cc=christoffer.dall@linaro.org \
--cc=eric.auger@st.com \
--cc=joel.schopp@amd.com \
--cc=kim.phillips@freescale.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=patches@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stuart.yoder@freescale.com \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).