2020-02-14 16:27:43 +03:00
|
|
|
/*
|
|
|
|
* Virtio IOMMU PCI Bindings
|
|
|
|
*
|
|
|
|
* Copyright (c) 2019 Red Hat, Inc.
|
|
|
|
* Written by Eric Auger
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License version 2 or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "qemu/osdep.h"
|
|
|
|
|
|
|
|
#include "virtio-pci.h"
|
|
|
|
#include "hw/virtio/virtio-iommu.h"
|
|
|
|
#include "hw/qdev-properties.h"
|
|
|
|
#include "qapi/error.h"
|
|
|
|
#include "hw/boards.h"
|
|
|
|
|
|
|
|
typedef struct VirtIOIOMMUPCI VirtIOIOMMUPCI;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* virtio-iommu-pci: This extends VirtioPCIProxy.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
#define VIRTIO_IOMMU_PCI(obj) \
|
|
|
|
OBJECT_CHECK(VirtIOIOMMUPCI, (obj), TYPE_VIRTIO_IOMMU_PCI)
|
|
|
|
|
|
|
|
struct VirtIOIOMMUPCI {
|
|
|
|
VirtIOPCIProxy parent_obj;
|
|
|
|
VirtIOIOMMU vdev;
|
|
|
|
};
|
|
|
|
|
|
|
|
static Property virtio_iommu_pci_properties[] = {
|
|
|
|
DEFINE_PROP_UINT32("class", VirtIOPCIProxy, class_code, 0),
|
virtio-iommu-pci: Add array of Interval properties
The machine may need to pass reserved regions to the
virtio-iommu-pci device (such as the MSI window on x86
or the MSI doorbells on ARM).
So let's add an array of Interval properties.
Note: if some reserved regions are already set by the
machine code - which should be the case in general -,
the length of the property array is already set and
prevents the end-user from modifying them. For example,
attempting to use:
-device virtio-iommu-pci,\
len-reserved-regions=1,reserved-regions[0]=0xfee00000:0xfeefffff:1
would result in the following error message:
qemu-system-aarch64: -device virtio-iommu-pci,addr=0xa,
len-reserved-regions=1,reserved-regions[0]=0xfee00000:0xfeefffff:1:
array size property len-reserved-regions may not be set more than once
Otherwise, for example, adding two reserved regions is achieved
using the following options:
-device virtio-iommu-pci,addr=0xa,len-reserved-regions=2,\
reserved-regions[0]=0xfee00000:0xfeefffff:1,\
reserved-regions[1]=0x1000000:100ffff:1
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Reviewed-by: Peter Xu <peterx@redhat.com>
Message-id: 20200629070404.10969-5-eric.auger@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
2020-07-03 18:59:42 +03:00
|
|
|
DEFINE_PROP_ARRAY("reserved-regions", VirtIOIOMMUPCI,
|
|
|
|
vdev.nb_reserved_regions, vdev.reserved_regions,
|
|
|
|
qdev_prop_reserved_region, ReservedRegion),
|
2020-02-14 16:27:43 +03:00
|
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
|
|
};
|
|
|
|
|
|
|
|
static void virtio_iommu_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
|
|
|
|
{
|
|
|
|
VirtIOIOMMUPCI *dev = VIRTIO_IOMMU_PCI(vpci_dev);
|
|
|
|
DeviceState *vdev = DEVICE(&dev->vdev);
|
virtio-iommu-pci: Add array of Interval properties
The machine may need to pass reserved regions to the
virtio-iommu-pci device (such as the MSI window on x86
or the MSI doorbells on ARM).
So let's add an array of Interval properties.
Note: if some reserved regions are already set by the
machine code - which should be the case in general -,
the length of the property array is already set and
prevents the end-user from modifying them. For example,
attempting to use:
-device virtio-iommu-pci,\
len-reserved-regions=1,reserved-regions[0]=0xfee00000:0xfeefffff:1
would result in the following error message:
qemu-system-aarch64: -device virtio-iommu-pci,addr=0xa,
len-reserved-regions=1,reserved-regions[0]=0xfee00000:0xfeefffff:1:
array size property len-reserved-regions may not be set more than once
Otherwise, for example, adding two reserved regions is achieved
using the following options:
-device virtio-iommu-pci,addr=0xa,len-reserved-regions=2,\
reserved-regions[0]=0xfee00000:0xfeefffff:1,\
reserved-regions[1]=0x1000000:100ffff:1
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Reviewed-by: Peter Xu <peterx@redhat.com>
Message-id: 20200629070404.10969-5-eric.auger@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
2020-07-03 18:59:42 +03:00
|
|
|
VirtIOIOMMU *s = VIRTIO_IOMMU(vdev);
|
2020-02-14 16:27:43 +03:00
|
|
|
|
|
|
|
if (!qdev_get_machine_hotplug_handler(DEVICE(vpci_dev))) {
|
|
|
|
MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine());
|
|
|
|
|
|
|
|
error_setg(errp,
|
|
|
|
"%s machine fails to create iommu-map device tree bindings",
|
|
|
|
mc->name);
|
|
|
|
error_append_hint(errp,
|
2020-06-25 13:08:11 +03:00
|
|
|
"Check your machine implements a hotplug handler "
|
2020-02-14 16:27:43 +03:00
|
|
|
"for the virtio-iommu-pci device\n");
|
|
|
|
error_append_hint(errp, "Check the guest is booted without FW or with "
|
|
|
|
"-no-acpi\n");
|
|
|
|
return;
|
|
|
|
}
|
virtio-iommu-pci: Add array of Interval properties
The machine may need to pass reserved regions to the
virtio-iommu-pci device (such as the MSI window on x86
or the MSI doorbells on ARM).
So let's add an array of Interval properties.
Note: if some reserved regions are already set by the
machine code - which should be the case in general -,
the length of the property array is already set and
prevents the end-user from modifying them. For example,
attempting to use:
-device virtio-iommu-pci,\
len-reserved-regions=1,reserved-regions[0]=0xfee00000:0xfeefffff:1
would result in the following error message:
qemu-system-aarch64: -device virtio-iommu-pci,addr=0xa,
len-reserved-regions=1,reserved-regions[0]=0xfee00000:0xfeefffff:1:
array size property len-reserved-regions may not be set more than once
Otherwise, for example, adding two reserved regions is achieved
using the following options:
-device virtio-iommu-pci,addr=0xa,len-reserved-regions=2,\
reserved-regions[0]=0xfee00000:0xfeefffff:1,\
reserved-regions[1]=0x1000000:100ffff:1
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Reviewed-by: Peter Xu <peterx@redhat.com>
Message-id: 20200629070404.10969-5-eric.auger@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
2020-07-03 18:59:42 +03:00
|
|
|
for (int i = 0; i < s->nb_reserved_regions; i++) {
|
|
|
|
if (s->reserved_regions[i].type != VIRTIO_IOMMU_RESV_MEM_T_RESERVED &&
|
|
|
|
s->reserved_regions[i].type != VIRTIO_IOMMU_RESV_MEM_T_MSI) {
|
|
|
|
error_setg(errp, "reserved region %d has an invalid type", i);
|
|
|
|
error_append_hint(errp, "Valid values are 0 and 1\n");
|
|
|
|
}
|
|
|
|
}
|
2020-02-14 16:27:43 +03:00
|
|
|
object_property_set_link(OBJECT(dev),
|
|
|
|
OBJECT(pci_get_bus(&vpci_dev->pci_dev)),
|
hw: Fix error API violation around object_property_set_link()
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call.
virtio_gpu_pci_base_realize(), virtio_vga_base_realize(),
sparc32_ledma_device_realize(), sparc32_dma_realize(),
sparc32_dma_realize() xilinx_axidma_realize(), mips_cps_realize(),
macio_realize_ide(), xilinx_enet_realize(), and
virtio_iommu_pci_realize() are wrong that way: they reuse the argument
they pass to object_property_set_link() for another call.
Harmless, because object_property_set_link() can't actually fail for
them: it fails when the property doesn't exist, is not settable, or
its .check() method fails. Fix by passing &error_abort instead.
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Cc: Alistair Francis <alistair@alistair23.me>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Cc: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
Cc: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20200630090351.1247703-16-armbru@redhat.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
2020-06-30 12:03:40 +03:00
|
|
|
"primary-bus", &error_abort);
|
qdev: Convert uses of qdev_set_parent_bus() with Coccinelle
In addition to the qdev_create() patterns converted so far, we have a
qdev_set_parent_bus() pattern. Mostly when we embed a device in a
parent device rather than allocating it on the heap.
This pattern also puts devices in the dangerous "no QOM parent, but
plugged into bus" state I explained in recent commit "qdev: New
qdev_new(), qdev_realize(), etc."
Apply same solution: convert to qdev_realize(). Coccinelle script:
@@
expression dev, bus, errp;
symbol true;
@@
- qdev_set_parent_bus(DEVICE(dev), bus);
...
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize(DEVICE(dev), bus, errp);
@ depends on !(file in "qdev-monitor.c") && !(file in "hw/core/qdev.c")@
expression dev, bus, errp;
symbol true;
@@
- qdev_set_parent_bus(dev, bus);
...
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize(dev, bus, errp);
@@
expression dev, bus;
symbol true;
@@
- qdev_set_parent_bus(DEVICE(dev), bus);
...
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize(DEVICE(dev), bus, &error_fatal);
Unconverted uses of qdev_set_parent_bus() remain. They'll be
converted later in this series.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-12-armbru@redhat.com>
[Also convert new hw/virtio/vhost-user-vsock-pci.c]
2020-06-10 08:32:00 +03:00
|
|
|
qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
|
2020-02-14 16:27:43 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void virtio_iommu_pci_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass);
|
|
|
|
PCIDeviceClass *pcidev_k = PCI_DEVICE_CLASS(klass);
|
|
|
|
k->realize = virtio_iommu_pci_realize;
|
|
|
|
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
|
|
|
|
device_class_set_props(dc, virtio_iommu_pci_properties);
|
|
|
|
pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;
|
|
|
|
pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_IOMMU;
|
|
|
|
pcidev_k->revision = VIRTIO_PCI_ABI_VERSION;
|
|
|
|
pcidev_k->class_id = PCI_CLASS_OTHERS;
|
|
|
|
dc->hotpluggable = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void virtio_iommu_pci_instance_init(Object *obj)
|
|
|
|
{
|
|
|
|
VirtIOIOMMUPCI *dev = VIRTIO_IOMMU_PCI(obj);
|
|
|
|
|
|
|
|
virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
|
|
|
|
TYPE_VIRTIO_IOMMU);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const VirtioPCIDeviceTypeInfo virtio_iommu_pci_info = {
|
|
|
|
.base_name = TYPE_VIRTIO_IOMMU_PCI,
|
|
|
|
.generic_name = "virtio-iommu-pci",
|
|
|
|
.transitional_name = "virtio-iommu-pci-transitional",
|
|
|
|
.non_transitional_name = "virtio-iommu-pci-non-transitional",
|
|
|
|
.instance_size = sizeof(VirtIOIOMMUPCI),
|
|
|
|
.instance_init = virtio_iommu_pci_instance_init,
|
|
|
|
.class_init = virtio_iommu_pci_class_init,
|
|
|
|
};
|
|
|
|
|
|
|
|
static void virtio_iommu_pci_register(void)
|
|
|
|
{
|
|
|
|
virtio_pci_types_register(&virtio_iommu_pci_info);
|
|
|
|
}
|
|
|
|
|
|
|
|
type_init(virtio_iommu_pci_register)
|
|
|
|
|
|
|
|
|