@@ -236,6 +236,20 @@ int xendevicemodel_inject_msi(
xendevicemodel_handle *dmod, domid_t domid, uint64_t msi_addr,
uint32_t msi_data);
+/**
+ * This function injects an MSI into a guest.
+ *
+ * @parm dmod a handle to an open devicemodel interface.
+ * @parm domid the domain id to be serviced
+ * @parm msi_addr the MSI address
+ * @parm source_id the PCI SBDF of the source device
+ * @parm msi_data the MSI data
+ * @return 0 on success, -1 on failure.
+*/
+int xendevicemodel_inject_msi2(
+ xendevicemodel_handle *dmod, domid_t domid, uint64_t addr, uint32_t source_id,
+ uint32_t data);
+
/**
* This function enables tracking of changes in the VRAM area.
*
@@ -448,6 +448,26 @@ int xendevicemodel_set_irq_level(
return xendevicemodel_op(dmod, domid, 1, &op, sizeof(op));
}
+int xendevicemodel_inject_msi2(
+ xendevicemodel_handle *dmod, domid_t domid, uint64_t addr, uint32_t source_id,
+ uint32_t data)
+{
+ uint16_t segment = source_id >> 16;
+ uint16_t bdf = source_id & 0xffff;
+ struct xen_dm_op op = {
+ .op = XEN_DMOP_inject_msi2,
+ .u.inject_msi2 = {
+ .addr = addr,
+ .data = data,
+ .segment = segment,
+ .source_id = bdf,
+ .flags = XEN_DMOP_MSI_SOURCE_ID_VALID,
+ },
+ };
+
+ return xendevicemodel_op(dmod, domid, 1, &op, sizeof(op));
+}
+
int xendevicemodel_set_pci_link_route(
xendevicemodel_handle *dmod, domid_t domid, uint8_t link, uint8_t irq)
{
@@ -44,3 +44,8 @@ VERS_1.4 {
xendevicemodel_set_irq_level;
xendevicemodel_nr_vcpus;
} VERS_1.3;
+
+VERS_1.5 {
+ global:
+ xendevicemodel_inject_msi2;
+} VERS_1.4;
@@ -27,6 +27,7 @@ int dm_op(const struct dmop_args *op_args)
[XEN_DMOP_set_ioreq_server_state] = sizeof(struct xen_dm_op_set_ioreq_server_state),
[XEN_DMOP_destroy_ioreq_server] = sizeof(struct xen_dm_op_destroy_ioreq_server),
[XEN_DMOP_set_irq_level] = sizeof(struct xen_dm_op_set_irq_level),
+ [XEN_DMOP_inject_msi2] = sizeof(struct xen_dm_op_inject_msi2),
[XEN_DMOP_nr_vcpus] = sizeof(struct xen_dm_op_nr_vcpus),
};
@@ -112,6 +113,22 @@ int dm_op(const struct dmop_args *op_args)
break;
}
+ case XEN_DMOP_inject_msi2:
+ {
+ const struct xen_dm_op_inject_msi2 *data = &op.u.inject_msi2;
+ uint32_t pci_sbdf = data->segment << 16 | data->source_id;
+
+ if ( !(data->flags & XEN_DMOP_MSI_SOURCE_ID_VALID) || data->pad ||
+ data->flags & ~XEN_DMOP_MSI_SOURCE_ID_VALID )
+ {
+ rc = -EINVAL;
+ break;
+ }
+
+ rc = vgic_its_trigger_msi(d, data->addr, pci_sbdf, data->data);
+ break;
+
+ }
case XEN_DMOP_nr_vcpus:
{
struct xen_dm_op_nr_vcpus *data = &op.u.nr_vcpus;
@@ -344,6 +344,7 @@ int dm_op(const struct dmop_args *op_args)
[XEN_DMOP_set_mem_type] = sizeof(struct xen_dm_op_set_mem_type),
[XEN_DMOP_inject_event] = sizeof(struct xen_dm_op_inject_event),
[XEN_DMOP_inject_msi] = sizeof(struct xen_dm_op_inject_msi),
+ [XEN_DMOP_inject_msi2] = sizeof(struct xen_dm_op_inject_msi2),
[XEN_DMOP_map_mem_type_to_ioreq_server] = sizeof(struct xen_dm_op_map_mem_type_to_ioreq_server),
[XEN_DMOP_remote_shutdown] = sizeof(struct xen_dm_op_remote_shutdown),
[XEN_DMOP_relocate_memory] = sizeof(struct xen_dm_op_relocate_memory),
@@ -539,6 +540,23 @@ int dm_op(const struct dmop_args *op_args)
break;
}
+ case XEN_DMOP_inject_msi2:
+ {
+ const struct xen_dm_op_inject_msi2 *data = &op.u.inject_msi2;
+
+ if ( data->pad || data->flags & ~XEN_DMOP_MSI_SOURCE_ID_VALID )
+ {
+ rc = -EINVAL;
+ break;
+ }
+
+ if ( data->flags & XEN_DMOP_MSI_SOURCE_ID_VALID )
+ gprintk(XENLOG_WARNING "XEN_DMOP_inject_msi2: source_id is ignored\n");
+
+ rc = hvm_inject_msi(d, data->addr, data->data);
+ break;
+ }
+
case XEN_DMOP_remote_shutdown:
{
const struct xen_dm_op_remote_shutdown *data =
@@ -444,6 +444,23 @@ struct xen_dm_op_nr_vcpus {
};
typedef struct xen_dm_op_nr_vcpus xen_dm_op_nr_vcpus_t;
+#define XEN_DMOP_inject_msi2 21
+
+struct xen_dm_op_inject_msi2 {
+ /* IN - MSI data */
+ uint32_t data;
+ /* IN - next two fields form an ID of the device triggering the MSI */
+ uint16_t segment; /* The segment number */
+ uint16_t source_id; /* The source ID that is local to segment (PCI BDF) */
+ /* IN - types of source ID */
+ uint32_t flags;
+#define XEN_DMOP_MSI_SOURCE_ID_VALID (1u << 0)
+ uint32_t pad;
+ /* IN - MSI address */
+ uint64_aligned_t addr;
+};
+typedef struct xen_dm_op_inject_msi2 xen_dm_op_inject_msi2_t;
+
struct xen_dm_op {
uint32_t op;
uint32_t pad;
@@ -463,6 +480,7 @@ struct xen_dm_op {
xen_dm_op_set_mem_type_t set_mem_type;
xen_dm_op_inject_event_t inject_event;
xen_dm_op_inject_msi_t inject_msi;
+ xen_dm_op_inject_msi2_t inject_msi2;
xen_dm_op_map_mem_type_to_ioreq_server_t map_mem_type_to_ioreq_server;
xen_dm_op_remote_shutdown_t remote_shutdown;
xen_dm_op_relocate_memory_t relocate_memory;