From: Joerg Roedel <jroedel@suse.de>
Date: Thu, 28 May 2015 16:41:38 +0000 (+0200)
Subject: iommu/amd: Use default domain if available for DMA-API
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=063071dff53858027e95d3cfcedb1780952302ad;p=linux-beck.git

iommu/amd: Use default domain if available for DMA-API

Signed-off-by: Joerg Roedel <jroedel@suse.de>
---

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 22d38e3cdc7a..ae7d636d3099 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2495,12 +2495,19 @@ void amd_iommu_init_notifier(void)
 static struct protection_domain *get_domain(struct device *dev)
 {
 	struct protection_domain *domain;
+	struct iommu_domain *io_domain;
 	struct dma_ops_domain *dma_dom;
 	u16 devid = get_device_id(dev);
 
 	if (!check_device(dev))
 		return ERR_PTR(-EINVAL);
 
+	io_domain = iommu_get_domain_for_dev(dev);
+	if (io_domain) {
+		domain = to_pdomain(io_domain);
+		return domain;
+	}
+
 	domain = domain_for_device(dev);
 	if (domain != NULL && !dma_ops_domain(domain))
 		return ERR_PTR(-EBUSY);