[tip:irq/urgent] irqchip/ls-scfg-msi: Map MSIs in the iommu
From: tip-bot for Laurentiu Tudor
Date: Wed Jun 06 2018 - 06:10:56 EST
Commit-ID: 0cdd431c337e99177e68597f3de34bedd3a20a74
Gitweb: https://git.kernel.org/tip/0cdd431c337e99177e68597f3de34bedd3a20a74
Author: Laurentiu Tudor <laurentiu.tudor@xxxxxxx>
AuthorDate: Tue, 5 Jun 2018 15:27:27 +0300
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Wed, 6 Jun 2018 12:05:19 +0200
irqchip/ls-scfg-msi: Map MSIs in the iommu
Add the required iommu_dma_map_msi_msg() when composing the MSI message,
otherwise the interrupts will not work.
Signed-off-by: Laurentiu Tudor <laurentiu.tudor@xxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: jason@xxxxxxxxxxxxxx
Cc: marc.zyngier@xxxxxxx
Cc: zhiqiang.hou@xxxxxxx
Cc: minghuan.lian@xxxxxxx
Link: https://lkml.kernel.org/r/20180605122727.12831-1-laurentiu.tudor@xxxxxxx
---
drivers/irqchip/irq-ls-scfg-msi.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/irqchip/irq-ls-scfg-msi.c b/drivers/irqchip/irq-ls-scfg-msi.c
index 57e3d900f19e..1ec3bfe56693 100644
--- a/drivers/irqchip/irq-ls-scfg-msi.c
+++ b/drivers/irqchip/irq-ls-scfg-msi.c
@@ -21,6 +21,7 @@
#include <linux/of_pci.h>
#include <linux/of_platform.h>
#include <linux/spinlock.h>
+#include <linux/dma-iommu.h>
#define MSI_IRQS_PER_MSIR 32
#define MSI_MSIR_OFFSET 4
@@ -94,6 +95,8 @@ static void ls_scfg_msi_compose_msg(struct irq_data *data, struct msi_msg *msg)
if (msi_affinity_flag)
msg->data |= cpumask_first(data->common->affinity);
+
+ iommu_dma_map_msi_msg(data->irq, msg);
}
static int ls_scfg_msi_set_affinity(struct irq_data *irq_data,