@@ -20,6 +20,14 @@
#include <linux/msi-iommu.h>
#include <linux/spinlock.h>
#include <linux/iova.h>
+#include <linux/msi.h>
+
+#ifdef CONFIG_PHYS_ADDR_T_64BIT
+#define msg_to_phys_addr(msg) \
+ (((phys_addr_t)((msg)->address_hi) << 32) | (msg)->address_lo)
+#else
+#define msg_to_phys_addr(msg) ((msg)->address_lo)
+#endif
struct doorbell_mapping {
struct kref kref;
@@ -260,3 +268,50 @@ struct iommu_domain *iommu_msi_domain(struct device *dev)
}
EXPORT_SYMBOL_GPL(iommu_msi_domain);
+static dma_addr_t iommu_msi_find_iova(struct iommu_domain *domain,
+ phys_addr_t addr, size_t size)
+{
+ struct doorbell_mapping_info *dmi = domain->msi_cookie;
+ struct iova_domain *iovad = domain->iova_cookie;
+ struct doorbell_mapping *mapping;
+ dma_addr_t iova = DMA_ERROR_CODE;
+ phys_addr_t aligned_base, offset;
+ size_t binding_size;
+
+ if (!iovad || !dmi)
+ return iova;
+
+ offset = iova_offset(iovad, addr);
+ aligned_base = addr - offset;
+ binding_size = iova_align(iovad, size + offset);
+
+ spin_lock(&dmi->lock);
+
+ mapping = search_msi_doorbell_mapping(dmi, addr, size);
+ if (mapping)
+ iova = mapping->iova + offset + aligned_base - mapping->addr;
+
+ spin_unlock(&dmi->lock);
+ return iova;
+}
+
+int iommu_msi_msg_pa_to_va(struct device *dev, struct msi_msg *msg)
+{
+ struct iommu_domain *d = iommu_msi_domain(dev);
+ dma_addr_t iova;
+
+ if (!d)
+ return 0;
+
+ iova = iommu_msi_find_iova(d, msg_to_phys_addr(msg),
+ sizeof(phys_addr_t));
+
+ if (iova == DMA_ERROR_CODE)
+ return -EINVAL;
+
+ msg->address_lo = lower_32_bits(iova);
+ msg->address_hi = upper_32_bits(iova);
+ return 0;
+}
+EXPORT_SYMBOL_GPL(iommu_msi_msg_pa_to_va);
+
@@ -19,6 +19,7 @@
#include <linux/kernel.h>
struct iommu_domain;
+struct msi_msg;
#ifdef CONFIG_IOMMU_MSI
@@ -90,6 +91,25 @@ void iommu_msi_put_doorbell_iova(struct iommu_domain *domain, phys_addr_t addr);
*/
struct iommu_domain *iommu_msi_domain(struct device *dev);
+/**
+ * iommu_msi_msg_pa_to_va: in case a device's MSI transaction is translated
+ * by an IOMMU, the msg address must be an IOVA instead of a physical address.
+ * This function overwrites the original MSI message containing the doorbell's
+ * physical address with the doorbell's pre-allocated IOVA, if any.
+ *
+ * The doorbell physical address must be bound previously to an IOVA using
+ * iommu_msi_get_doorbell_iova
+ *
+ * @dev: device emitting the MSI
+ * @msg: original MSI message containing the PA to be overwritten with the IOVA
+ *
+ * return 0 if the MSI does not need to be mapped or when the PA/IOVA
+ * were successfully swapped; return -EINVAL if the addresses need
+ * to be swapped but not IOMMU binding is found
+ */
+int iommu_msi_msg_pa_to_va(struct device *dev, struct msi_msg *msg);
+
+
#else
static inline int
@@ -114,5 +134,11 @@ static inline struct iommu_domain *iommu_msi_domain(struct device *dev)
return NULL;
}
+static inline int iommu_msi_msg_pa_to_va(struct device *dev,
+ struct msi_msg *msg)
+{
+ return 0;
+}
+
#endif /* CONFIG_IOMMU_MSI */
#endif /* __MSI_IOMMU_H */
Introduce iommu_msi_msg_pa_to_va whose role consists in detecting whether the device's MSIs must to be mapped into an IOMMU. It case it must, the function overrides the MSI msg originally composed and replaces the doorbell's PA by a pre-allocated and pre-mapped reserved IOVA. In case the corresponding PA region is not found, the function returns an error. This function is likely to be called in some code that cannot sleep. This is the reason why the allocation/mapping is done separately. Signed-off-by: Eric Auger <eric.auger@linaro.org> --- v7 -> v8: - renamed from iommu_msi_mapping_translate_msg to iommu_msi_msg_pa_to_va and now takes a struct device * as parameter v7: creation --- drivers/iommu/msi-iommu.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++ include/linux/msi-iommu.h | 26 ++++++++++++++++++++++ 2 files changed, 81 insertions(+) -- 1.9.1