linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: eric.auger@linaro.org (Eric Auger)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v7 8/8] genirq/msi: use the MSI doorbell's IOVA when requested
Date: Tue, 19 Apr 2016 17:13:10 +0000	[thread overview]
Message-ID: <1461085990-2547-9-git-send-email-eric.auger@linaro.org> (raw)
In-Reply-To: <1461085990-2547-1-git-send-email-eric.auger@linaro.org>

On MSI message composition we now use the MSI doorbell's IOVA in
place of the doorbell's PA in case the device is upstream to an
IOMMU that requires MSI addresses to be mapped. The doorbell's
allocation and mapping happened on an early stage (pci_enable_msi).

Signed-off-by: Eric Auger <eric.auger@linaro.org>

---
v6 -> v7:
- allocation/mapping is done at an earlier stage. We now just perform
  the iova lookup. So it is safe now to be called in a code that cannot
  sleep. iommu_msi_set_doorbell_iova is moved in the dma-reserved-iommu
  API: I think it cleans things up with respect to various #ifdef CONFIGS.

v5:
- use macros to increase the readability
- add comments
- fix a typo that caused a compilation error if CONFIG_IOMMU_API
  is not set
---
 kernel/irq/msi.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c
index e45907e..0ebb2d8 100644
--- a/kernel/irq/msi.c
+++ b/kernel/irq/msi.c
@@ -19,6 +19,7 @@
 
 /* Temparory solution for building, will be removed later */
 #include <linux/pci.h>
+#include <linux/dma-reserved-iommu.h>
 
 struct msi_desc *alloc_msi_entry(struct device *dev)
 {
@@ -64,8 +65,12 @@ static int msi_compose(struct irq_data *irq_data,
 
 	if (erase)
 		memset(msg, 0, sizeof(*msg));
-	else
+	else {
 		ret = irq_chip_compose_msi_msg(irq_data, msg);
+		if (ret)
+			return ret;
+		iommu_msi_mapping_translate_msg(irq_data, msg);
+	}
 
 	return ret;
 }
-- 
1.9.1

  parent reply	other threads:[~2016-04-19 17:13 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-19 17:13 [PATCH v7 0/8] KVM PCIe/MSI passthrough on ARM/ARM64: kernel part 2/3: msi changes Eric Auger
2016-04-19 17:13 ` [PATCH v7 1/8] genirq/msi: Add a new MSI_FLAG_IRQ_REMAPPING flag Eric Auger
2016-04-22 11:02   ` Robin Murphy
2016-04-22 12:25     ` Eric Auger
2016-04-22 15:39       ` Thomas Gleixner
2016-04-19 17:13 ` [PATCH v7 2/8] irqchip/gic-v3-its: ITS advertises MSI_FLAG_IRQ_REMAPPING Eric Auger
2016-04-19 17:13 ` [PATCH v7 3/8] genirq/msi: export msi_get_domain_info Eric Auger
2016-04-19 17:13 ` [PATCH v7 4/8] genirq/msi: msi_compose wrapper Eric Auger
2016-04-19 17:13 ` [PATCH v7 5/8] genirq/irq: introduce msi_doorbell's structs and related callback Eric Auger
2016-04-20  9:16   ` Marc Zyngier
2016-04-20  9:36     ` Eric Auger
2016-04-19 17:13 ` [PATCH v7 6/8] irqchip/gicv2m: implement msi_doorbell_info callback Eric Auger
2016-04-20  9:27   ` Marc Zyngier
2016-04-20 12:33     ` Eric Auger
2016-04-20 17:56       ` Marc Zyngier
2016-04-20 18:16         ` Eric Auger
2016-04-19 17:13 ` [PATCH v7 7/8] genirq/msi: map/unmap the MSI doorbells on msi_domain_alloc/free_irqs Eric Auger
2016-04-19 18:04   ` kbuild test robot
2016-04-20  7:47     ` Eric Auger
2016-04-26  1:24       ` [lkp] " Ye Xiaolong
2016-04-26 16:43         ` Eric Auger
2016-04-19 17:13 ` Eric Auger [this message]
2016-04-20  9:44   ` [PATCH v7 8/8] genirq/msi: use the MSI doorbell's IOVA when requested Marc Zyngier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1461085990-2547-9-git-send-email-eric.auger@linaro.org \
    --to=eric.auger@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).