1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/irqchip/irq-gic-v2m.c b/drivers/irqchip/irq-gic-v2m.c
index f5fe0100f9ff..4359f0583377 100644
--- a/drivers/irqchip/irq-gic-v2m.c
+++ b/drivers/irqchip/irq-gic-v2m.c
@@ -110,7 +110,7 @@ static void gicv2m_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
         if (v2m->flags & GICV2M_NEEDS_SPI_OFFSET)
                 msg->data -= v2m->spi_offset;
 
-        iommu_dma_map_msi_msg(data->irq, msg);
+        iommu_dma_compose_msi_msg(irq_data_get_msi_desc(data), msg);
 }
 
 static struct irq_chip gicv2m_irq_chip = {
@@ -167,6 +167,7 @@ static void gicv2m_unalloc_msi(struct v2m_data *v2m, unsigned int hwirq,
 static int gicv2m_irq_domain_alloc(struct irq_domain *domain, unsigned int virq,
                                    unsigned int nr_irqs, void *args)
 {
+        msi_alloc_info_t *info = args;
         struct v2m_data *v2m = NULL, *tmp;
         int hwirq, offset, i, err = 0;
 
@@ -186,6 +187,11 @@ static int gicv2m_irq_domain_alloc(struct irq_domain *domain, unsigned int virq,
 
         hwirq = v2m->spi_start + offset;
 
+        err = iommu_dma_prepare_msi(info->desc,
+                                    v2m->res.start + V2M_MSI_SETSPI_NS);
+        if (err)
+                return err;
+
         for (i = 0; i < nr_irqs; i++) {
                 err = gicv2m_irq_gic_domain_alloc(domain, virq + i, hwirq + i);
                 if (err)