hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/irqchip/irq-gic-v3-mbi.c
....@@ -84,6 +84,7 @@
8484 static int mbi_irq_domain_alloc(struct irq_domain *domain, unsigned int virq,
8585 unsigned int nr_irqs, void *args)
8686 {
87
+ msi_alloc_info_t *info = args;
8788 struct mbi_range *mbi = NULL;
8889 int hwirq, offset, i, err = 0;
8990
....@@ -103,6 +104,11 @@
103104 return -ENOSPC;
104105
105106 hwirq = mbi->spi_start + offset;
107
+
108
+ err = iommu_dma_prepare_msi(info->desc,
109
+ mbi_phys_base + GICD_SETSPI_NSR);
110
+ if (err)
111
+ return err;
106112
107113 for (i = 0; i < nr_irqs; i++) {
108114 err = mbi_irq_gic_domain_alloc(domain, virq + i, hwirq + i);
....@@ -142,7 +148,7 @@
142148 msg[0].address_lo = lower_32_bits(mbi_phys_base + GICD_SETSPI_NSR);
143149 msg[0].data = data->parent_data->hwirq;
144150
145
- iommu_dma_map_msi_msg(data->irq, msg);
151
+ iommu_dma_compose_msi_msg(irq_data_get_msi_desc(data), msg);
146152 }
147153
148154 #ifdef CONFIG_PCI_MSI
....@@ -202,7 +208,7 @@
202208 msg[1].address_lo = lower_32_bits(mbi_phys_base + GICD_CLRSPI_NSR);
203209 msg[1].data = data->parent_data->hwirq;
204210
205
- iommu_dma_map_msi_msg(data->irq, &msg[1]);
211
+ iommu_dma_compose_msi_msg(irq_data_get_msi_desc(data), &msg[1]);
206212 }
207213
208214 /* Platform-MSI specific irqchip */