From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com,
qemu-devel@nongnu.org, qemu-arm@nongnu.org,
peter.maydell@linaro.org, jean-philippe@linaro.org,
dgilbert@redhat.com, quintela@redhat.com, mst@redhat.com,
peterx@redhat.com
Cc: kevin.tian@intel.com, bharatb.linux@gmail.com, tnowicki@marvell.com
Subject: [PATCH v14 08/11] virtio-iommu-pci: Introduce the x-dt-binding option
Date: Fri, 7 Feb 2020 10:32:00 +0100 [thread overview]
Message-ID: <20200207093203.3788-9-eric.auger@redhat.com> (raw)
In-Reply-To: <20200207093203.3788-1-eric.auger@redhat.com>
At the moment, the kernel only supports device tree
integration of the virtio-iommu. DT bindings between the
PCI root complex and the IOMMU must be created by the machine
in conformance to:
Documentation/devicetree/bindings/virtio/iommu.txt.
To make sure the end-user is aware of this, force him to use the
temporary device option "x-dt-binding" and also double check the
machine has a hotplug handler for the virtio-iommu-pci device.
This hotplug handler is in charge of creating those DT bindings.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Suggested-by: Michael S. Tsirkin <mst@redhat.com>
---
May be squashed with previous patch
---
hw/virtio/virtio-iommu-pci.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/hw/virtio/virtio-iommu-pci.c b/hw/virtio/virtio-iommu-pci.c
index d539fcce75..3d06e14000 100644
--- a/hw/virtio/virtio-iommu-pci.c
+++ b/hw/virtio/virtio-iommu-pci.c
@@ -14,6 +14,7 @@
#include "virtio-pci.h"
#include "hw/virtio/virtio-iommu.h"
#include "hw/qdev-properties.h"
+#include "qapi/error.h"
typedef struct VirtIOIOMMUPCI VirtIOIOMMUPCI;
@@ -27,10 +28,12 @@ typedef struct VirtIOIOMMUPCI VirtIOIOMMUPCI;
struct VirtIOIOMMUPCI {
VirtIOPCIProxy parent_obj;
VirtIOIOMMU vdev;
+ bool dt_binding;
};
static Property virtio_iommu_pci_properties[] = {
DEFINE_PROP_UINT32("class", VirtIOPCIProxy, class_code, 0),
+ DEFINE_PROP_BOOL("x-dt-binding", VirtIOIOMMUPCI, dt_binding, false),
DEFINE_PROP_END_OF_LIST(),
};
@@ -39,6 +42,21 @@ static void virtio_iommu_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
VirtIOIOMMUPCI *dev = VIRTIO_IOMMU_PCI(vpci_dev);
DeviceState *vdev = DEVICE(&dev->vdev);
+ if (!dev->dt_binding) {
+ error_setg(errp,
+ "Instantiation currently only is possible if the machine "
+ "creates device tree iommu-map bindings, ie. ACPI is not "
+ "yet supported");
+ error_append_hint(errp, "use -virtio-iommu-pci,x-dt-binding\n");
+ return;
+ }
+
+ if (!qdev_get_machine_hotplug_handler(DEVICE(vpci_dev))) {
+ error_setg(errp,
+ "The machine does not implement a virtio-iommu-pci hotplug "
+ " handler that creates the device tree iommu-map bindings");
+ return;
+ }
qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));
object_property_set_link(OBJECT(dev),
OBJECT(pci_get_bus(&vpci_dev->pci_dev)),
--
2.20.1
next prev parent reply other threads:[~2020-02-07 9:42 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-07 9:31 [PATCH v14 00/11] VIRTIO-IOMMU device Eric Auger
2020-02-07 9:31 ` [PATCH v14 01/11] virtio-iommu: Add skeleton Eric Auger
2020-02-07 9:31 ` [PATCH v14 02/11] virtio-iommu: Decode the command payload Eric Auger
2020-02-07 9:31 ` [PATCH v14 03/11] virtio-iommu: Implement attach/detach command Eric Auger
2020-02-07 20:26 ` Peter Xu
2020-02-08 11:50 ` Auger Eric
2020-02-07 9:31 ` [PATCH v14 04/11] virtio-iommu: Implement map/unmap Eric Auger
2020-02-07 9:31 ` [PATCH v14 05/11] virtio-iommu: Implement translate Eric Auger
2020-02-07 9:31 ` [PATCH v14 06/11] virtio-iommu: Implement fault reporting Eric Auger
2020-02-07 9:31 ` [PATCH v14 07/11] virtio-iommu-pci: Add virtio iommu pci support Eric Auger
2020-02-07 9:32 ` Eric Auger [this message]
2020-02-07 10:05 ` [PATCH v14 08/11] virtio-iommu-pci: Introduce the x-dt-binding option Jean-Philippe Brucker
2020-02-07 10:19 ` Auger Eric
2020-02-07 10:24 ` Michael S. Tsirkin
2020-02-07 10:33 ` Auger Eric
2020-02-07 23:04 ` Peter Xu
2020-02-09 20:58 ` Michael S. Tsirkin
2020-02-10 16:48 ` Peter Xu
2020-02-07 10:23 ` Michael S. Tsirkin
2020-02-07 10:51 ` Auger Eric
2020-02-07 11:15 ` Jean-Philippe Brucker
2020-02-07 13:36 ` Auger Eric
2020-02-07 12:00 ` Michael S. Tsirkin
2020-02-07 13:38 ` Auger Eric
2020-02-07 9:32 ` [PATCH v14 09/11] hw/arm/virt: Add the virtio-iommu device tree mappings Eric Auger
2020-02-07 9:32 ` [PATCH v14 10/11] virtio-iommu: Support migration Eric Auger
2020-02-07 9:32 ` [PATCH v14 11/11] tests: Add virtio-iommu test Eric Auger
2020-02-07 10:11 ` [PATCH v14 00/11] VIRTIO-IOMMU device no-reply
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=20200207093203.3788-9-eric.auger@redhat.com \
--to=eric.auger@redhat.com \
--cc=bharatb.linux@gmail.com \
--cc=dgilbert@redhat.com \
--cc=eric.auger.pro@gmail.com \
--cc=jean-philippe@linaro.org \
--cc=kevin.tian@intel.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=tnowicki@marvell.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).